Skip to content

Commit a3eb255

Browse files
hansvahansva
committed
cleanup some duplicate jars
1 parent f512c10 commit a3eb255

File tree

5 files changed

+44
-9
lines changed

5 files changed

+44
-9
lines changed

‎lib/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@
7777
<google-api-common.version>2.13.0</google-api-common.version>
7878
<google-api-services-bigquery.version>v2-rev20240229-2.0.0</google-api-services-bigquery.version>
7979
<google-api-services-storage.version>v1-rev20240311-2.0.0</google-api-services-storage.version>
80-
<google-auth-library-credentials.version>1.30.0</google-auth-library-credentials.version>
81-
<google-auth-library-oauth2-http.version>1.30.0</google-auth-library-oauth2-http.version>
80+
<google-auth-library-credentials.version>1.40.0</google-auth-library-credentials.version>
81+
<google-auth-library-oauth2-http.version>1.40.0</google-auth-library-oauth2-http.version>
8282
<google-cloud-storage.version>2.15.0</google-cloud-storage.version>
8383
<google-http-client.version>1.42.3</google-http-client.version>
8484
<google-oauth-client.version>1.34.1</google-oauth-client.version>
85-
<gson.version>2.11.0</gson.version>
85+
<gson.version>2.12.1</gson.version>
8686
<!--check Beam BOM to find matching version https://repo1.maven.org/maven2/org/apache/beam/beam-runners-google-cloud-dataflow-java/xxx/beam-runners-google-cloud-dataflow-java-xxx.pom
8787
Replace exclusions beam-vendor-guava-xxx-jre-->
8888
<guava.version>33.3.1-jre</guava.version>

‎plugins/engines/beam/pom.xml‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@
321321
</exclusion>
322322
<exclusion>
323323
<groupId>org.apache.beam</groupId>
324-
<artifactId>beam-vendor-grpc-1_60_1</artifactId>
324+
<artifactId>beam-vendor-grpc-1_69_0</artifactId>
325325
</exclusion>
326326
<exclusion>
327327
<groupId>org.apache.beam</groupId>
@@ -415,7 +415,7 @@
415415
</exclusion>
416416
<exclusion>
417417
<groupId>org.apache.beam</groupId>
418-
<artifactId>beam-vendor-grpc-1_60_1</artifactId>
418+
<artifactId>beam-vendor-grpc-1_69_0</artifactId>
419419
</exclusion>
420420
<exclusion>
421421
<groupId>org.apache.beam</groupId>
@@ -521,7 +521,7 @@
521521
</exclusion>
522522
<exclusion>
523523
<groupId>org.apache.beam</groupId>
524-
<artifactId>beam-vendor-grpc-1_60_1</artifactId>
524+
<artifactId>beam-vendor-grpc-1_69_0</artifactId>
525525
</exclusion>
526526
<exclusion>
527527
<groupId>org.apache.beam</groupId>
@@ -583,7 +583,7 @@
583583
</exclusion>
584584
<exclusion>
585585
<groupId>org.apache.beam</groupId>
586-
<artifactId>beam-vendor-grpc-1_60_1</artifactId>
586+
<artifactId>beam-vendor-grpc-1_69_0</artifactId>
587587
</exclusion>
588588
<exclusion>
589589
<groupId>org.apache.beam</groupId>
@@ -657,10 +657,18 @@
657657
<groupId>joda-time</groupId>
658658
<artifactId>joda-time</artifactId>
659659
</exclusion>
660+
<exclusion>
661+
<groupId>net.bytebuddy</groupId>
662+
<artifactId>byte-buddy</artifactId>
663+
</exclusion>
660664
<exclusion>
661665
<groupId>org.apache.beam</groupId>
662666
<artifactId>beam-sdks-java-core</artifactId>
663667
</exclusion>
668+
<exclusion>
669+
<groupId>org.apache.beam</groupId>
670+
<artifactId>beam-vendor-grpc-1_69_0</artifactId>
671+
</exclusion>
664672
<exclusion>
665673
<groupId>org.apache.beam</groupId>
666674
<artifactId>beam-vendor-guava-33.1.0-jre-jre</artifactId>
@@ -677,6 +685,10 @@
677685
<groupId>org.checkerframework</groupId>
678686
<artifactId>checker-qual</artifactId>
679687
</exclusion>
688+
<exclusion>
689+
<groupId>org.conscrypt</groupId>
690+
<artifactId>conscrypt-openjdk-uber</artifactId>
691+
</exclusion>
680692
<exclusion>
681693
<groupId>org.slf4j</groupId>
682694
<artifactId>*</artifactId>
@@ -879,7 +891,7 @@
879891
</exclusion>
880892
<exclusion>
881893
<groupId>org.apache.beam</groupId>
882-
<artifactId>beam-vendor-grpc-1_60_1</artifactId>
894+
<artifactId>beam-vendor-grpc-1_69_0</artifactId>
883895
</exclusion>
884896
<exclusion>
885897
<groupId>org.apache.beam</groupId>
@@ -1023,7 +1035,7 @@
10231035
</exclusion>
10241036
<exclusion>
10251037
<groupId>org.apache.beam</groupId>
1026-
<artifactId>beam-vendor-grpc-1_60_1</artifactId>
1038+
<artifactId>beam-vendor-grpc-1_69_0</artifactId>
10271039
</exclusion>
10281040
<exclusion>
10291041
<groupId>org.apache.beam</groupId>
@@ -1388,6 +1400,14 @@
13881400
<artifactId>beam-sdks-java-core</artifactId>
13891401
<scope>provided</scope>
13901402
<exclusions>
1403+
<exclusion>
1404+
<groupId>org.apache.beam</groupId>
1405+
<artifactId>beam-vendor-grpc-1_69_0</artifactId>
1406+
</exclusion>
1407+
<exclusion>
1408+
<groupId>org.conscrypt</groupId>
1409+
<artifactId>conscrypt-openjdk-uber</artifactId>
1410+
</exclusion>
13911411
<exclusion>
13921412
<groupId>org.xerial.snappy</groupId>
13931413
<artifactId>snappy-java</artifactId>

‎plugins/engines/beam/src/assembly/assembly.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
<exclude>io.confluent::jar</exclude>
154154
<exclude>com.google.code.gson:gson:jar</exclude>
155155
<exclude>org.apache.commons:commons-collections4:jar</exclude>
156+
<exclude>org.jspecify:jspecify:jar</exclude>
156157
</excludes>
157158
<outputDirectory>lib/beam</outputDirectory>
158159
</dependencySet>

‎plugins/tech/neo4j/pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,18 @@
3232
<neo4j.driver.version>5.15.0</neo4j.driver.version>
3333
</properties>
3434

35+
<dependencyManagement>
36+
<dependencies>
37+
<dependency>
38+
<groupId>org.apache.hop</groupId>
39+
<artifactId>hop-libs</artifactId>
40+
<version>${project.version}</version>
41+
<type>pom</type>
42+
<scope>import</scope>
43+
</dependency>
44+
</dependencies>
45+
</dependencyManagement>
46+
3547
<dependencies>
3648
<dependency>
3749
<groupId>org.neo4j.driver</groupId>

‎plugins/tech/neo4j/src/assembly/assembly.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,15 @@
5151
<excludes>
5252
<exclude>org.apache.hop:hop-tech-neo4j:jar</exclude>
5353
<exclude>org.reactivestreams:reactive-streams:jar</exclude>
54+
<exclude>io.netty::jar</exclude>
5455
</excludes>
5556
<outputDirectory>plugins/tech/neo4j/lib</outputDirectory>
5657
</dependencySet>
5758
<dependencySet>
5859
<scope>runtime</scope>
5960
<includes>
6061
<include>org.reactivestreams:reactive-streams:jar</include>
62+
<include>io.netty::jar</include>
6163
</includes>
6264
<outputDirectory>lib/core</outputDirectory>
6365
</dependencySet>

0 commit comments

Comments
 (0)