Skip to content

Commit ac45719

Browse files
hansvahansva
authored
Merge pull request #5103 from hansva/main
2 parents fc8211c + 573acd3 commit ac45719

File tree

14 files changed

+149
-22
lines changed

14 files changed

+149
-22
lines changed

‎engine/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<commons-validator.version>1.9.0</commons-validator.version>
3333
<jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
3434
<jersey2.version>2.43</jersey2.version>
35-
<snappy-java.version>1.1.10.5</snappy-java.version>
35+
<snappy-java.version>1.1.10.7</snappy-java.version>
3636
</properties>
3737

3838
<dependencyManagement>

‎lib/pom.xml‎

Lines changed: 78 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<apache-flink.version>1.16.3</apache-flink.version>
3636
<apache-spark.version>3.4.3</apache-spark.version>
3737
<asm.version>9.7</asm.version>
38-
<avro.version>1.11.4</avro.version>
38+
<avro.version>1.12.0</avro.version>
3939
<aws-java-sdk.version>1.12.347</aws-java-sdk.version>
4040
<bahir.version>2.1.1</bahir.version>
4141
<blueprints-core.version>2.6.0</blueprints-core.version>
@@ -55,7 +55,7 @@
5555
<commons-math3.version>3.6.1</commons-math3.version>
5656
<commons-net.version>3.9.0</commons-net.version>
5757
<commons-pool.version>1.5.7</commons-pool.version>
58-
<commons-vfs2.version>2.9.0</commons-vfs2.version>
58+
<commons-vfs2.version>2.10.0</commons-vfs2.version>
5959
<curator.version>5.4.0</curator.version>
6060
<databricks.version>4.0.0</databricks.version>
6161
<encoder.version>1.2</encoder.version>
@@ -72,13 +72,10 @@
7272
<google-cloud-storage.version>2.15.0</google-cloud-storage.version>
7373
<google-http-client.version>1.42.3</google-http-client.version>
7474
<google-oauth-client.version>1.34.1</google-oauth-client.version>
75-
<!--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
76-
Replace exclusions beam-vendor-guava-xxx-jre-->
77-
<grpc.version>1.60.1</grpc.version>
7875
<gson.version>2.10</gson.version>
7976
<!--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
8077
Replace exclusions beam-vendor-guava-xxx-jre-->
81-
<guava.version>33.1.0-jre</guava.version>
78+
<guava.version>33.3.1-jre</guava.version>
8279
<hive.version>2.3.9</hive.version>
8380
<httpccore.version>4.4.15</httpccore.version>
8481
<httpclient.version>4.5.13</httpclient.version>
@@ -99,11 +96,13 @@
9996
<json4s.version>3.7.0-M11</json4s.version>
10097
<juniversalchardet.version>2.4.0</juniversalchardet.version>
10198
<kafka-clients.version>3.7.1</kafka-clients.version>
99+
<kotlin.version>1.9.25</kotlin.version>
102100
<kryo.version>5.3.0</kryo.version>
103101
<log4j.version>2.23.1</log4j.version>
104102
<lz4.version>1.8.0</lz4.version>
105103
<metrics.version>4.2.12</metrics.version>
106104
<minlog.version>1.3.1</minlog.version>
105+
<netty.version>4.1.119.Final</netty.version>
107106
<ognl.version>3.3.4</ognl.version>
108107
<okhttp.version>4.12.0</okhttp.version>
109108
<okio.version>3.9.0</okio.version>
@@ -113,6 +112,7 @@
113112
<picocli-version>4.6.3</picocli-version>
114113
<poi.version>5.3.0</poi.version>
115114
<protobuf-java.version>3.25.5</protobuf-java.version>
115+
<reactor-netty.version>1.2.4</reactor-netty.version>
116116
<rhino.version>1.7.14</rhino.version>
117117
<saxon.version>8.7</saxon.version>
118118
<scala.version>2.12.17</scala.version>
@@ -339,6 +339,68 @@
339339
<artifactId>picocli</artifactId>
340340
<version>${picocli-version}</version>
341341
</dependency>
342+
<dependency>
343+
<groupId>io.netty</groupId>
344+
<artifactId>netty-all</artifactId>
345+
<version>${netty.version}</version>
346+
</dependency>
347+
<dependency>
348+
<groupId>io.netty</groupId>
349+
<artifactId>netty-buffer</artifactId>
350+
<version>${netty.version}</version>
351+
</dependency>
352+
<dependency>
353+
<groupId>io.netty</groupId>
354+
<artifactId>netty-codec</artifactId>
355+
<version>${netty.version}</version>
356+
</dependency>
357+
<dependency>
358+
<groupId>io.netty</groupId>
359+
<artifactId>netty-codec-http</artifactId>
360+
<version>${netty.version}</version>
361+
</dependency>
362+
<dependency>
363+
<groupId>io.netty</groupId>
364+
<artifactId>netty-codec-http2</artifactId>
365+
<version>${netty.version}</version>
366+
</dependency>
367+
<dependency>
368+
<groupId>io.netty</groupId>
369+
<artifactId>netty-common</artifactId>
370+
<version>${netty.version}</version>
371+
</dependency>
372+
<dependency>
373+
<groupId>io.netty</groupId>
374+
<artifactId>netty-handler</artifactId>
375+
<version>${netty.version}</version>
376+
</dependency>
377+
<dependency>
378+
<groupId>io.netty</groupId>
379+
<artifactId>netty-handler-proxy</artifactId>
380+
<version>${netty.version}</version>
381+
</dependency>
382+
<dependency>
383+
<groupId>io.netty</groupId>
384+
<artifactId>netty-transport-native-epoll</artifactId>
385+
<version>${netty.version}</version>
386+
<classifier>linux-x86_64</classifier>
387+
</dependency>
388+
<dependency>
389+
<groupId>io.netty</groupId>
390+
<artifactId>netty-transport-native-kqueue</artifactId>
391+
<version>${netty.version}</version>
392+
<classifier>osx-x86_64</classifier>
393+
</dependency>
394+
<dependency>
395+
<groupId>io.netty</groupId>
396+
<artifactId>netty-transport-native-unix-common</artifactId>
397+
<version>${netty.version}</version>
398+
</dependency>
399+
<dependency>
400+
<groupId>io.projectreactor.netty</groupId>
401+
<artifactId>reactor-netty-http</artifactId>
402+
<version>${reactor-netty.version}</version>
403+
</dependency>
342404
<dependency>
343405
<groupId>net.bytebuddy</groupId>
344406
<artifactId>byte-buddy</artifactId>
@@ -541,6 +603,16 @@
541603
<artifactId>javassist</artifactId>
542604
<version>${javassist.version}</version>
543605
</dependency>
606+
<dependency>
607+
<groupId>org.jetbrains.kotlin</groupId>
608+
<artifactId>kotlin-stdlib</artifactId>
609+
<version>${kotlin.version}</version>
610+
</dependency>
611+
<dependency>
612+
<groupId>org.jetbrains.kotlin</groupId>
613+
<artifactId>kotlin-stdlib-jdk8</artifactId>
614+
<version>${kotlin.version}</version>
615+
</dependency>
544616
<dependency>
545617
<groupId>org.mozilla</groupId>
546618
<artifactId>rhino</artifactId>

‎plugins/engines/beam/pom.xml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@
270270
</dependency>
271271
<dependency>
272272
<groupId>org.apache.beam</groupId>
273-
<artifactId>beam-runners-flink-1.16</artifactId>
273+
<artifactId>beam-runners-flink-1.19</artifactId>
274274
<exclusions>
275275
<exclusion>
276276
<groupId>args4j</groupId>
@@ -1137,6 +1137,10 @@
11371137
<groupId>org.slf4j</groupId>
11381138
<artifactId>*</artifactId>
11391139
</exclusion>
1140+
<exclusion>
1141+
<groupId>org.xerial.snappy</groupId>
1142+
<artifactId>snappy-java</artifactId>
1143+
</exclusion>
11401144
</exclusions>
11411145
</dependency>
11421146
<dependency>
@@ -1286,6 +1290,12 @@
12861290
<groupId>org.apache.beam</groupId>
12871291
<artifactId>beam-sdks-java-core</artifactId>
12881292
<scope>provided</scope>
1293+
<exclusions>
1294+
<exclusion>
1295+
<groupId>org.xerial.snappy</groupId>
1296+
<artifactId>snappy-java</artifactId>
1297+
</exclusion>
1298+
</exclusions>
12891299
</dependency>
12901300
<dependency>
12911301
<groupId>org.apache.hop</groupId>
@@ -1410,6 +1420,10 @@
14101420
<groupId>org.apache.logging.log4j</groupId>
14111421
<artifactId>log4j-slf4j2-impl</artifactId>
14121422
</exclusion>
1423+
<exclusion>
1424+
<groupId>org.xerial.snappy</groupId>
1425+
<artifactId>snappy-java</artifactId>
1426+
</exclusion>
14131427
</exclusions>
14141428
</dependency>
14151429
<dependency>

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,15 @@
7575
<exclude>org.codehaus.mojo:animal-sniffer-annotations:jar</exclude>
7676
<exclude>com.google.api:api-common:jar</exclude>
7777
<exclude>com.google.auto.value:auto-value-annotations:jar</exclude>
78-
<exclude>com.google.guava:failureaccess:jar</exclude>
78+
<exclude>com.google.guava::jar</exclude>
79+
<exclude>org.jetbrains.kotlin::jar</exclude>
80+
<exclude>io.netty::jar</exclude>
81+
<exclude>org.codehaus.mojo:animal-sniffer-annotations:jar</exclude>
82+
<exclude>io.projectreactor.netty::jar</exclude>
83+
<exclude>io.grpc:grpc-netty-shaded:jar</exclude>
84+
<exclude>io.grpc:grpc-xds:jar</exclude>
85+
<exclude>org.apache.kafka::jar</exclude>
86+
<exclude>org.xerial.snappy:snappy-java:jar</exclude>
7987
</excludes>
8088
<outputDirectory>lib/beam</outputDirectory>
8189
</dependencySet>
@@ -101,7 +109,11 @@
101109
<include>org.codehaus.mojo:animal-sniffer-annotations:jar</include>
102110
<include>com.google.api:api-common:jar</include>
103111
<include>com.google.auto.value:auto-value-annotations:jar</include>
104-
<include>com.google.guava:failureaccess:jar</include>
112+
<include>org.jetbrains.kotlin::jar</include>
113+
<include>io.netty::jar</include>
114+
<include>io.projectreactor.netty::jar</include>
115+
<include>io.grpc:grpc-netty-shaded:jar</include>
116+
<include>org.apache.kafka::jar</include>
105117
</includes>
106118
<outputDirectory>lib/core</outputDirectory>
107119
</dependencySet>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,19 @@
5050
<excludes>
5151
<exclude>org.apache.hop:hop-tech-azure:jar</exclude>
5252
<exclude>org.jetbrains:annotations:jar</exclude>
53+
<exclude>org.jetbrains.kotlin::jar</exclude>
54+
<exclude>io.netty::jar</exclude>
55+
<exclude>io.projectreactor.netty::jar</exclude>
5356
</excludes>
5457
<outputDirectory>plugins/tech/azure/lib</outputDirectory>
5558
</dependencySet>
5659
<dependencySet>
5760
<scope>runtime</scope>
5861
<includes>
5962
<include>org.jetbrains:annotations:jar</include>
63+
<include>org.jetbrains.kotlin::jar</include>
64+
<include>io.netty::jar</include>
65+
<include>io.projectreactor.netty::jar</include>
6066
</includes>
6167
<outputDirectory>lib/core</outputDirectory>
6268
</dependencySet>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<exclude>org.ow2.asm:asm-util:jar</exclude>
5151
<exclude>org.lz4:lz4-java:jar</exclude>
5252
<exclude>org.yaml:snakeyaml:jar</exclude>
53+
<exclude>io.netty::jar</exclude>
5354
</excludes>
5455
<outputDirectory>plugins/tech/cassandra/lib</outputDirectory>
5556
</dependencySet>
@@ -65,6 +66,7 @@
6566
<include>org.ow2.asm:asm-util:jar</include>
6667
<include>org.lz4:lz4-java:jar</include>
6768
<include>org.yaml:snakeyaml:jar</include>
69+
<include>io.netty::jar</include>
6870
</includes>
6971
<outputDirectory>lib/core</outputDirectory>
7072
</dependencySet>

‎plugins/tech/google/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>com.google.cloud</groupId>
5151
<artifactId>libraries-bom</artifactId>
52-
<version>26.51.0</version>
52+
<version>26.58.0</version>
5353
<type>pom</type>
5454
<scope>import</scope>
5555
</dependency>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
<!-- </includes>-->
8282
<excludes>
8383
<exclude>org.apache.hop:hop-tech-google:jar</exclude>
84+
<exclude>io.grpc:grpc-netty-shaded:jar</exclude>
8485
</excludes>
8586
<outputDirectory>lib/core</outputDirectory>
8687
</dependencySet>

‎plugins/tech/neo4j/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<name>Hop Plugins Technology Neo4j</name>
3030

3131
<properties>
32-
<neo4j.driver.version>4.4.19</neo4j.driver.version>
32+
<neo4j.driver.version>4.4.20</neo4j.driver.version>
3333
</properties>
3434

3535
<dependencies>

‎plugins/tech/parquet/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@
9999
<groupId>org.slf4j</groupId>
100100
<artifactId>*</artifactId>
101101
</exclusion>
102+
<exclusion>
103+
<groupId>org.xerial.snappy</groupId>
104+
<artifactId>snappy-java</artifactId>
105+
</exclusion>
102106
</exclusions>
103107
</dependency>
104108
<dependency>

0 commit comments

Comments
 (0)