Skip to content

Commit 4c15667

Browse files
authored
Merge pull request #2563 from ClickHouse/fix_all_deps
[repo] Fix all dependencies + shade
2 parents df4f3a7 + a98ae2e commit 4c15667

File tree

2 files changed

+84
-11
lines changed

2 files changed

+84
-11
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ jobs:
8484
clickhouse-data/target/clickhouse*.jar
8585
clickhouse-http-client/target/clickhouse*.jar
8686
clickhouse-jdbc/target/clickhouse*.jar
87+
clickhouse-jdbc/target/bundle/clickhouse*.jar
8788
clickhouse-r2dbc/target/clickhouse*.jar
8889
client-v2/target/client-v2*.jar
8990
jdbc-v2/target/jdbc-v2*.jar

clickhouse-jdbc/pom.xml

Lines changed: 83 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,6 @@
363363
<groupId>org.apache.maven.plugins</groupId>
364364
<artifactId>maven-assembly-plugin</artifactId>
365365
<configuration>
366-
<finalName>${project.artifactId}-${project.version}-all-dependencies</finalName>
367-
<appendAssemblyId>false</appendAssemblyId>
368366
<descriptorRefs>
369367
<descriptorRef>jar-with-dependencies</descriptorRef>
370368
</descriptorRefs>
@@ -377,15 +375,6 @@
377375
</manifest>
378376
</archive>
379377
</configuration>
380-
<executions>
381-
<execution>
382-
<id>make-assembly</id>
383-
<phase>package</phase>
384-
<goals>
385-
<goal>single</goal>
386-
</goals>
387-
</execution>
388-
</executions>
389378
</plugin>
390379
<plugin>
391380
<groupId>org.apache.maven.plugins</groupId>
@@ -478,6 +467,89 @@
478467
</filters>
479468
</configuration>
480469
</execution>
470+
471+
<execution>
472+
<id>all-dependencies</id>
473+
<phase>package</phase>
474+
<goals>
475+
<goal>shade</goal>
476+
</goals>
477+
<configuration>
478+
<outputDirectory>${project.build.directory}/bundle/</outputDirectory>
479+
<shadedArtifactAttached>true</shadedArtifactAttached>
480+
<createDependencyReducedPom>true</createDependencyReducedPom>
481+
<!-- <createSourcesJar>true</createSourcesJar>-->
482+
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
483+
<shadedClassifierName>all-dependencies</shadedClassifierName>
484+
<artifactSet>
485+
<excludes>
486+
<!-- provided libraries -->
487+
<exclude>io.micrometer:*</exclude>
488+
</excludes>
489+
</artifactSet>
490+
<relocations>
491+
<relocation>
492+
<!-- lz4 compression -->
493+
<pattern>net.jpountz</pattern>
494+
<shadedPattern>${shade.base}.net.jpountz</shadedPattern>
495+
</relocation>
496+
<relocation>
497+
<pattern>org.roaringbitmap</pattern>
498+
<shadedPattern>${shade.base}.org.roaringbitmap</shadedPattern>
499+
</relocation>
500+
501+
<relocation>
502+
<!-- asm -->
503+
<pattern>org.objectweb</pattern>
504+
<shadedPattern>${shade.base}.org.objectweb</shadedPattern>
505+
</relocation>
506+
507+
508+
<relocation>
509+
<pattern>com.google</pattern>
510+
<shadedPattern>${shade.base}.com.google</shadedPattern>
511+
</relocation>
512+
513+
<relocation>
514+
<pattern>org.apache</pattern>
515+
<shadedPattern>${shade.base}.org.apache</shadedPattern>
516+
</relocation>
517+
518+
<relocation>
519+
<pattern>org.antlr</pattern>
520+
<shadedPattern>${shade.base}.org.antlr</shadedPattern>
521+
</relocation>
522+
</relocations>
523+
<transformers>
524+
<transformer
525+
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
526+
<transformer
527+
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
528+
<transformer
529+
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
530+
<transformer
531+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
532+
<manifestEntries>
533+
<Automatic-Module-Name>${project.groupId}.jdbc</Automatic-Module-Name>
534+
<Main-Class>${mainClass}</Main-Class>
535+
<Specification-Title>${spec.title}</Specification-Title>
536+
<Specification-Version>${spec.version}</Specification-Version>
537+
</manifestEntries>
538+
</transformer>
539+
</transformers>
540+
<filters>
541+
<filter>
542+
<artifact>*:*</artifact>
543+
<excludes>
544+
<exclude>google/**</exclude>
545+
<exclude>org/checkerframework/**</exclude>
546+
<exclude>org/codehaus/**</exclude>
547+
<exclude>**/module-info.class</exclude>
548+
</excludes>
549+
</filter>
550+
</filters>
551+
</configuration>
552+
</execution>
481553
</executions>
482554
</plugin>
483555
<plugin>

0 commit comments

Comments
 (0)