This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/master by this push:
new 0b28294471 [DEP] Update dependencies and remove some duplicates
new 57f4c1457d Merge pull request #3161 from hansva/master
0b28294471 is described below
commit 0b282944718b2c35af2b714bc3f1a64e5dc6ee55
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Thu Aug 17 14:35:27 2023 +0200
[DEP] Update dependencies and remove some duplicates
---
assemblies/lib-beam/pom.xml | 4 +++
assemblies/lib/pom.xml | 26 ++++++++++++++++---
assemblies/plugins/engines/beam/pom.xml | 17 +++++++++----
.../plugins/engines/beam/src/assembly/assembly.xml | 10 --------
assemblies/plugins/tech/aws/pom.xml | 5 ----
assemblies/plugins/tech/azure/pom.xml | 12 +++++++++
.../plugins/tech/azure/src/assembly/assembly.xml | 2 --
.../tech/cassandra/src/assembly/assembly.xml | 29 ----------------------
assemblies/plugins/tech/neo4j/pom.xml | 2 +-
assemblies/plugins/transforms/fake/pom.xml | 10 --------
.../transforms/fake/src/assembly/assembly.xml | 1 -
assemblies/plugins/transforms/yamlinput/pom.xml | 8 ------
.../transforms/yamlinput/src/assembly/assembly.xml | 7 ------
plugins/engines/beam/pom.xml | 5 ----
plugins/tech/neo4j/pom.xml | 2 +-
plugins/transforms/fake/pom.xml | 10 --------
plugins/transforms/yamlinput/pom.xml | 4 ---
pom.xml | 5 ++--
18 files changed, 55 insertions(+), 104 deletions(-)
diff --git a/assemblies/lib-beam/pom.xml b/assemblies/lib-beam/pom.xml
index 4a0b871518..ad943727f9 100644
--- a/assemblies/lib-beam/pom.xml
+++ b/assemblies/lib-beam/pom.xml
@@ -625,6 +625,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/assemblies/lib/pom.xml b/assemblies/lib/pom.xml
index b7d2fe4e42..2b8fedd474 100644
--- a/assemblies/lib/pom.xml
+++ b/assemblies/lib/pom.xml
@@ -16,7 +16,8 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<artifactId>hop-assemblies-libs</artifactId>
@@ -34,9 +35,9 @@
<!-- third party -->
-<!-- <webservices-api.version>2.3.1</webservices-api.version>
- <webservices-rt.version>2.3.1</webservices-rt.version>
- -->
+ <!-- <webservices-api.version>2.3.1</webservices-api.version>
+ <webservices-rt.version>2.3.1</webservices-rt.version>
+ -->
<blueprints-core.version>2.6.0</blueprints-core.version>
<commons-configuration.version>1.10</commons-configuration.version>
<flexjson.version>2.1</flexjson.version>
@@ -192,6 +193,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml.version}</version>
+ </dependency>
<!-- XML Graphics commons -->
<dependency>
@@ -236,11 +242,23 @@
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>${okio.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- SWT dependencies -->
diff --git a/assemblies/plugins/engines/beam/pom.xml
b/assemblies/plugins/engines/beam/pom.xml
index 8be876da8c..65c90f3d59 100644
--- a/assemblies/plugins/engines/beam/pom.xml
+++ b/assemblies/plugins/engines/beam/pom.xml
@@ -84,11 +84,6 @@
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
</dependency>
- <dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- <version>${snappy-java.version}</version>
- </dependency>
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
@@ -178,6 +173,12 @@
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime</artifactId>
<version>${apache-flink.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
@@ -255,6 +256,12 @@
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>${okio.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.confluent</groupId>
diff --git a/assemblies/plugins/engines/beam/src/assembly/assembly.xml
b/assemblies/plugins/engines/beam/src/assembly/assembly.xml
index 58031d9f5d..2c4ad4902e 100644
--- a/assemblies/plugins/engines/beam/src/assembly/assembly.xml
+++ b/assemblies/plugins/engines/beam/src/assembly/assembly.xml
@@ -106,7 +106,6 @@
<include>com.google.cloud.bigdataoss:gcsio</include>
<include>com.google.cloud.bigdataoss:util</include>
<include>com.google.cloud.bigtable:bigtable-client-core</include>
-
<!--<include>com.google.cloud.bigtable:bigtable-hbase-1.x-shaded</include>-->
<include>com.google.cloud.bigtable:bigtable-metrics-api</include>
<include>com.google.cloud.datastore:datastore-v1-proto-client</include>
<include>com.google.cloud:google-cloud-bigquery</include>
@@ -132,7 +131,6 @@
<include>commons-cli:commons-cli</include>
<include>commons-httpclient:commons-httpclient</include>
<include>commons-collections:commons-collections</include>
- <include>com.squareup.okio:okio</include>
<include>com.twitter:chill_2.12</include>
<include>com.twitter:chill-java</include>
<include>io.confluent:common-utils</include>
@@ -141,9 +139,6 @@
<include>io.dropwizard.metrics:metrics-graphite</include>
<include>io.dropwizard.metrics:metrics-json</include>
<include>io.github.classgraph:classgraph</include>
- <!--<include>io.netty:netty-codec-socks</include>
- <include>io.netty:netty-handler-proxy</include>
- <include>io.netty:netty-tcnative-boringssl-static</include>-->
<include>io.opencensus:opencensus-contrib-grpc-util</include>
<include>javax.annotation:javax.annotation-api</include>
<include>javax.servlet:javax.servlet-api</include>
@@ -159,7 +154,6 @@
<include>org.apache.beam:beam-runners-google-cloud-dataflow-java</include>
<include>org.apache.beam:beam-runners-java-fn-execution</include>
<include>org.apache.beam:beam-runners-spark-3</include>
- <!--<include>org.apache.beam:beam-sdks-java-core</include>-->
<include>org.apache.beam:beam-sdks-java-expansion-service</include>
<include>org.apache.beam:beam-sdks-java-extensions-protobuf</include>
<include>org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core</include>
@@ -170,7 +164,6 @@
<include>org.apache.beam:beam-sdks-java-io-hadoop-file-system</include>
<include>org.apache.beam:beam-sdks-java-io-kafka</include>
<include>org.apache.beam:beam-sdks-java-io-synthetic</include>
- <!--<include>org.apache.hbase:hbase-shaded-client</include>-->
<include>org.apache.commons:commons-crypto</include>
<include>org.apache.commons:commons-text</include>
<include>org.apache.flink:flink-annotations</include>
@@ -195,7 +188,6 @@
<include>org.apache.hadoop:hadoop-client-api</include>
<include>org.apache.hadoop:hadoop-client-runtime</include>
<include>org.apache.hadoop:hadoop-hdfs-client</include>
- <include>org.apache.htrace:htrace-core4</include>
<include>org.apache.ivy:ivy</include>
<include>org.apache.kafka:kafka-clients</include>
<include>org.apache.logging.log4j:log4j-slf4j-impl</include>
@@ -223,7 +215,6 @@
<include>org.roaringbitmap:RoaringBitmap</include>
<include>org.roaringbitmap:shims</include>
<include>org.scala-lang:scala-compiler</include>
- <!--<include>org.scala-lang:scala-library</include>-->
<include>org.scala-lang:scala-reflect</include>
<include>org.scala-lang.modules:scala-collection-compat_2.12</include>
<include>org.scala-lang.modules:scala-parser-combinators_2.12</include>
@@ -234,7 +225,6 @@
<include>org.springframework:spring-expression</include>
<include>org.springframework:spring-jcl</include>
<include>org.threeten:threetenbp</include>
- <include>org.yaml:snakeyaml</include>
<include>oro:oro</include>
<!-- AWS S3 -->
diff --git a/assemblies/plugins/tech/aws/pom.xml
b/assemblies/plugins/tech/aws/pom.xml
index 16ab7b3c57..603e44183a 100644
--- a/assemblies/plugins/tech/aws/pom.xml
+++ b/assemblies/plugins/tech/aws/pom.xml
@@ -49,11 +49,6 @@
<artifactId>hop-plugins-tech-aws</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>2.0</version>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
diff --git a/assemblies/plugins/tech/azure/pom.xml
b/assemblies/plugins/tech/azure/pom.xml
index f03ae7ea83..b07e6e1936 100644
--- a/assemblies/plugins/tech/azure/pom.xml
+++ b/assemblies/plugins/tech/azure/pom.xml
@@ -68,11 +68,23 @@
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>${okio.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Azure VFS -->
diff --git a/assemblies/plugins/tech/azure/src/assembly/assembly.xml
b/assemblies/plugins/tech/azure/src/assembly/assembly.xml
index 9b0aee3da7..ca743fb8c6 100644
--- a/assemblies/plugins/tech/azure/src/assembly/assembly.xml
+++ b/assemblies/plugins/tech/azure/src/assembly/assembly.xml
@@ -60,8 +60,6 @@
<include>com.microsoft.azure:azure-client-runtime:jar</include>
<include>com.microsoft.rest:client-runtime:jar</include>
<include>com.squareup.retrofit2:retrofit:jar</include>
- <include>com.squareup.okhttp3:okhttp:jar</include>
- <include>com.squareup.okio:okio:jar</include>
<include>com.squareup.okhttp3:logging-interceptor:jar</include>
<include>com.squareup.okhttp3:okhttp-urlconnection:jar</include>
<include>com.squareup.retrofit2:converter-jackson:jar</include>
diff --git a/assemblies/plugins/tech/cassandra/src/assembly/assembly.xml
b/assemblies/plugins/tech/cassandra/src/assembly/assembly.xml
index 837c5c9b32..56727a93d4 100644
--- a/assemblies/plugins/tech/cassandra/src/assembly/assembly.xml
+++ b/assemblies/plugins/tech/cassandra/src/assembly/assembly.xml
@@ -65,33 +65,6 @@
<include>de.jflex:jflex:jar</include>
<include>io.airlift:airline:jar</include>
- <!--<include>io.netty:netty-codec-dns:jar</include>
- <include>io.netty:netty-codec-haproxy:jar</include>
- <include>io.netty:netty-codec-http:jar</include>
- <include>io.netty:netty-codec-memcache:jar</include>
- <include>io.netty:netty-codec-mqtt:jar</include>
- <include>io.netty:netty-codec-redis:jar</include>
- <include>io.netty:netty-codec-smtp:jar</include>
- <include>io.netty:netty-codec-socks:jar</include>
- <include>io.netty:netty-codec-stomp:jar</include>
- <include>io.netty:netty-codec-xml:jar</include>
- <include>io.netty:netty-handler-proxy:jar</include>
- <include>io.netty:netty-jni-util:jar</include>
- <include>io.netty:netty-resolver:jar</include>
- <include>io.netty:netty-resolver-dns:jar</include>
-
<include>io.netty:netty-resolver-dns-classes-macos:jar</include>
- <include>io.netty:netty-resolver-dns-native-macos:jar</include>
- <include>io.netty:netty-tcnative:jar</include>
- <include>io.netty:netty-tcnative-classes:jar</include>
- <include>io.netty:netty-transport-classes-epoll:jar</include>
- <include>io.netty:netty-transport-classes-kqueue:jar</include>
- <include>io.netty:netty-transport-native-epoll:jar</include>
- <include>io.netty:netty-transport-native-kqueue:jar</include>
-
<include>io.netty:netty-transport-native-unix-common:jar</include>
- <include>io.netty:netty-transport-rxtx:jar</include>
- <include>io.netty:netty-transport-sctp:jar</include>
- <include>io.netty:netty-transport-udt:jar</include>-->
-
<include>net.java.dev.jna:jna:jar</include>
<include>org.lz4:lz4-java:jar</include>
<include>org.antlr:ST4:jar</include>
@@ -108,8 +81,6 @@
<include>org.ow2.asm:asm-tree:jar</include>
<include>org.ow2.asm:asm-util:jar</include>
- <include>org.yaml:snakeyaml:jar</include>
-
<include>com.github.ben-manes.caffeine:caffeine:jar</include>
<include>com.github.jnr:jnr-posix:jar</include>
<include>com.github.jnr:jnr-ffi:jar</include>
diff --git a/assemblies/plugins/tech/neo4j/pom.xml
b/assemblies/plugins/tech/neo4j/pom.xml
index 79819c1a4f..bd9cc8325c 100644
--- a/assemblies/plugins/tech/neo4j/pom.xml
+++ b/assemblies/plugins/tech/neo4j/pom.xml
@@ -32,7 +32,7 @@
<description />
<properties>
- <neo4j.driver.version>4.4.11</neo4j.driver.version>
+ <neo4j.driver.version>4.4.12</neo4j.driver.version>
</properties>
<dependencies>
diff --git a/assemblies/plugins/transforms/fake/pom.xml
b/assemblies/plugins/transforms/fake/pom.xml
index a43e0ad468..b7547a51a5 100644
--- a/assemblies/plugins/transforms/fake/pom.xml
+++ b/assemblies/plugins/transforms/fake/pom.xml
@@ -35,11 +35,6 @@
<description />
<dependencies>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>2.0</version>
- </dependency>
<dependency>
<groupId>org.apache.hop</groupId>
@@ -50,11 +45,6 @@
<groupId>com.github.javafaker</groupId>
<artifactId>javafaker</artifactId>
<version>1.0.2</version>
- <exclusions>
- <exclusion>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- </exclusion></exclusions>
</dependency>
<dependency>
<groupId>dk.brics.automaton</groupId>
diff --git a/assemblies/plugins/transforms/fake/src/assembly/assembly.xml
b/assemblies/plugins/transforms/fake/src/assembly/assembly.xml
index 1ad1d58065..8e8e76e203 100644
--- a/assemblies/plugins/transforms/fake/src/assembly/assembly.xml
+++ b/assemblies/plugins/transforms/fake/src/assembly/assembly.xml
@@ -50,7 +50,6 @@
<outputDirectory>lib</outputDirectory>
<includes>
<include>com.github.javafaker:javafaker:jar</include>
- <include>org.yaml:snakeyaml:jar</include>
<include>com.github.mifmif:generex:jar</include>
<include>dk.brics.automaton:automaton:jar</include>
</includes>
diff --git a/assemblies/plugins/transforms/yamlinput/pom.xml
b/assemblies/plugins/transforms/yamlinput/pom.xml
index 58beff5a7b..ced073d187 100644
--- a/assemblies/plugins/transforms/yamlinput/pom.xml
+++ b/assemblies/plugins/transforms/yamlinput/pom.xml
@@ -34,16 +34,8 @@
<name>Hop Assemblies Plugins Transforms Yaml Input</name>
<description />
- <properties>
- <snakeyaml.version>2.0</snakeyaml.version>
- </properties>
<dependencies>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>${snakeyaml.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.hop</groupId>
<artifactId>hop-transform-yamlinput</artifactId>
diff --git a/assemblies/plugins/transforms/yamlinput/src/assembly/assembly.xml
b/assemblies/plugins/transforms/yamlinput/src/assembly/assembly.xml
index f7fad164ea..acd9fd6829 100644
--- a/assemblies/plugins/transforms/yamlinput/src/assembly/assembly.xml
+++ b/assemblies/plugins/transforms/yamlinput/src/assembly/assembly.xml
@@ -46,12 +46,5 @@
<include>org.apache.hop:hop-transform-yamlinput:jar</include>
</includes>
</dependencySet>
- <dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.yaml:snakeyaml:jar</include>
- </includes>
- </dependencySet>
</dependencySets>
</assembly>
\ No newline at end of file
diff --git a/plugins/engines/beam/pom.xml b/plugins/engines/beam/pom.xml
index cbd1a3c415..31403108a9 100644
--- a/plugins/engines/beam/pom.xml
+++ b/plugins/engines/beam/pom.xml
@@ -215,11 +215,6 @@
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>2.0</version>
- </dependency>
<!-- The Apache Beam dependencies -->
<dependency>
diff --git a/plugins/tech/neo4j/pom.xml b/plugins/tech/neo4j/pom.xml
index 98e8e33ffe..b39b7c4569 100755
--- a/plugins/tech/neo4j/pom.xml
+++ b/plugins/tech/neo4j/pom.xml
@@ -43,7 +43,7 @@
</licenses>
<properties>
- <neo4j.driver.version>4.4.11</neo4j.driver.version>
+ <neo4j.driver.version>4.4.12</neo4j.driver.version>
</properties>
<repositories>
diff --git a/plugins/transforms/fake/pom.xml b/plugins/transforms/fake/pom.xml
index eb7fba2e51..f5ea2ffcd0 100644
--- a/plugins/transforms/fake/pom.xml
+++ b/plugins/transforms/fake/pom.xml
@@ -32,20 +32,10 @@
<name>Hop Plugins Transforms Fake</name>
<dependencies>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>2.0</version>
- </dependency>
<dependency>
<groupId>com.github.javafaker</groupId>
<artifactId>javafaker</artifactId>
<version>1.0.2</version>
- <exclusions>
- <exclusion>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- </exclusion></exclusions>
</dependency>
<dependency>
<groupId>dk.brics.automaton</groupId>
diff --git a/plugins/transforms/yamlinput/pom.xml
b/plugins/transforms/yamlinput/pom.xml
index c46bf9b343..3aeaffca47 100644
--- a/plugins/transforms/yamlinput/pom.xml
+++ b/plugins/transforms/yamlinput/pom.xml
@@ -31,10 +31,6 @@
<name>Hop Plugins Transforms Yaml Input</name>
- <properties>
- <snakeyaml.version>2.0</snakeyaml.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.yaml</groupId>
diff --git a/pom.xml b/pom.xml
index 6cfa10b2f5..af6e6e5a50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
<grpc.version>1.50.2</grpc.version>
<gson.version>2.10</gson.version>
<guava.version>32.0.1-jre</guava.version>
- <hadoop.version>3.3.4</hadoop.version>
+ <hadoop.version>3.3.6</hadoop.version>
<httpclient.version>4.5.13</httpclient.version>
<httpccore.version>4.4.15</httpccore.version>
<jackcess.version>4.0.4</jackcess.version>
@@ -179,7 +179,8 @@
<scala.version>2.12.17</scala.version>
<slf4j.version>2.0.4</slf4j.version>
<sshlib.version>2.2.21</sshlib.version>
- <snappy-java.version>1.1.8.4</snappy-java.version>
+ <snappy-java.version>1.1.10.3</snappy-java.version>
+ <snakeyaml.version>2.0</snakeyaml.version>
<woodstox.version>6.4.0</woodstox.version>
<zookeeper.version>3.8.0</zookeeper.version>
<xerces.version>2.12.2</xerces.version>
