This is an automated email from the ASF dual-hosted git repository.
xuba pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git
The following commit(s) were added to refs/heads/master by this push:
new f174d156d [AMORO-3931] Exclude curator and zookeeper deps (#3932)
f174d156d is described below
commit f174d156d3f23c6ae368ea3cd078b9d1c0dd31eb
Author: Fei Wang <[email protected]>
AuthorDate: Thu Nov 13 21:39:47 2025 -0800
[AMORO-3931] Exclude curator and zookeeper deps (#3932)
* save
deps
exclude jline
* nit
---
amoro-ams/pom.xml | 8 ++
amoro-format-mixed/amoro-mixed-hive/pom.xml | 14 ----
.../v3.3/amoro-mixed-spark-3.3/pom.xml | 22 ------
.../v3.5/amoro-mixed-spark-3.5/pom.xml | 22 ------
dev/deps/dependencies-hadoop-2-spark-3.3 | 9 ---
dev/deps/dependencies-hadoop-3-spark-3.5 | 8 --
pom.xml | 91 ++++++++++++++++++++++
7 files changed, 99 insertions(+), 75 deletions(-)
diff --git a/amoro-ams/pom.xml b/amoro-ams/pom.xml
index 419e46362..841bf2abc 100644
--- a/amoro-ams/pom.xml
+++ b/amoro-ams/pom.xml
@@ -141,6 +141,10 @@
<groupId>org.apache.arrow</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>*</artifactId>
@@ -169,6 +173,10 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
diff --git a/amoro-format-mixed/amoro-mixed-hive/pom.xml
b/amoro-format-mixed/amoro-mixed-hive/pom.xml
index 9cb345a01..40a9030cd 100644
--- a/amoro-format-mixed/amoro-mixed-hive/pom.xml
+++ b/amoro-format-mixed/amoro-mixed-hive/pom.xml
@@ -53,20 +53,6 @@
<version>${hive.version}</version>
<classifier>core</classifier>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.pentaho</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git
a/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/pom.xml
b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/pom.xml
index c721addc6..a7598a2c0 100644
--- a/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/pom.xml
+++ b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/pom.xml
@@ -394,28 +394,6 @@
<version>${hive.version}</version>
<classifier>core</classifier>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.pentaho</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.janino</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.orc</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
diff --git
a/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/pom.xml
b/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/pom.xml
index 005ead28d..c0c488b9f 100644
--- a/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/pom.xml
+++ b/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/pom.xml
@@ -398,28 +398,6 @@
<version>${hive.version}</version>
<classifier>core</classifier>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.pentaho</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.janino</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.orc</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
diff --git a/dev/deps/dependencies-hadoop-2-spark-3.3
b/dev/deps/dependencies-hadoop-2-spark-3.3
index 3dc0f5fc6..75bf5ce6e 100644
--- a/dev/deps/dependencies-hadoop-2-spark-3.3
+++ b/dev/deps/dependencies-hadoop-2-spark-3.3
@@ -27,7 +27,6 @@ arrow-memory-netty/15.0.2//arrow-memory-netty-15.0.2.jar
arrow-vector/15.0.2//arrow-vector-15.0.2.jar
asm/5.0.4//asm-5.0.4.jar
async-profiler/2.9//async-profiler-2.9.jar
-audience-annotations/0.5.0//audience-annotations-0.5.0.jar
auth/2.24.12//auth-2.24.12.jar
avro-ipc/1.11.0//avro-ipc-1.11.0.jar
avro-mapred/1.11.0//avro-mapred-1.11.0.jar
@@ -69,9 +68,6 @@ commons-pool2/2.12.0//commons-pool2-2.12.0.jar
commons-text/1.10.0//commons-text-1.10.0.jar
compress-lzf/1.1//compress-lzf-1.1.jar
crt-core/2.24.12//crt-core-2.24.12.jar
-curator-client/2.13.0//curator-client-2.13.0.jar
-curator-framework/2.13.0//curator-framework-2.13.0.jar
-curator-recipes/2.13.0//curator-recipes-2.13.0.jar
datanucleus-api-jdo/4.2.4//datanucleus-api-jdo-4.2.4.jar
datanucleus-core/4.1.17//datanucleus-core-4.1.17.jar
datanucleus-rdbms/4.1.19//datanucleus-rdbms-4.1.19.jar
@@ -213,8 +209,6 @@ jetty-util/6.1.26//jetty-util-6.1.26.jar
jetty-util/9.4.51.v20230217//jetty-util-9.4.51.v20230217.jar
jetty-webapp/9.4.51.v20230217//jetty-webapp-9.4.51.v20230217.jar
jetty-xml/9.4.51.v20230217//jetty-xml-9.4.51.v20230217.jar
-jline/0.9.94//jline-0.9.94.jar
-jline/3.22.0//jline-3.22.0.jar
joda-time/2.10.13//joda-time-2.10.13.jar
jsch/0.1.55//jsch-0.1.55.jar
json-smart/2.3//json-smart-2.3.jar
@@ -342,7 +336,6 @@
netty-transport-rxtx/4.1.128.Final//netty-transport-rxtx-4.1.128.Final.jar
netty-transport-sctp/4.1.128.Final//netty-transport-sctp-4.1.128.Final.jar
netty-transport-udt/4.1.128.Final//netty-transport-udt-4.1.128.Final.jar
netty-transport/4.1.128.Final//netty-transport-4.1.128.Final.jar
-netty/3.10.6.Final//netty-3.10.6.Final.jar
nimbus-jose-jwt/7.9//nimbus-jose-jwt-7.9.jar
objenesis/3.3//objenesis-3.3.jar
okhttp/2.7.5//okhttp-2.7.5.jar
@@ -404,7 +397,6 @@ spark-sketch_2.12/3.3.4//spark-sketch_2.12-3.3.4.jar
spark-sql_2.12/3.3.4//spark-sql_2.12-3.3.4.jar
spark-tags_2.12/3.3.4//spark-tags_2.12-3.3.4.jar
spark-unsafe_2.12/3.3.4//spark-unsafe_2.12-3.3.4.jar
-spotbugs-annotations/3.1.9//spotbugs-annotations-3.1.9.jar
stax-api/1.0-2//stax-api-1.0-2.jar
stax2-api/4.2.1//stax2-api-4.2.1.jar
stream/2.9.6//stream-2.9.6.jar
@@ -432,5 +424,4 @@ xmlenc/0.52//xmlenc-0.52.jar
xnio-api/3.8.8.Final//xnio-api-3.8.8.Final.jar
xz/1.9//xz-1.9.jar
zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar
-zookeeper/3.4.14//zookeeper-3.4.14.jar
zstd-jni/1.5.2-1//zstd-jni-1.5.2-1.jar
diff --git a/dev/deps/dependencies-hadoop-3-spark-3.5
b/dev/deps/dependencies-hadoop-3-spark-3.5
index 60697ea7d..5b212672d 100644
--- a/dev/deps/dependencies-hadoop-3-spark-3.5
+++ b/dev/deps/dependencies-hadoop-3-spark-3.5
@@ -22,7 +22,6 @@ arrow-memory-netty/15.0.2//arrow-memory-netty-15.0.2.jar
arrow-vector/15.0.2//arrow-vector-15.0.2.jar
asm/5.0.4//asm-5.0.4.jar
async-profiler/2.9//async-profiler-2.9.jar
-audience-annotations/0.12.0//audience-annotations-0.12.0.jar
auth/2.24.12//auth-2.24.12.jar
avro-ipc/1.11.4//avro-ipc-1.11.4.jar
avro-mapred/1.11.4//avro-mapred-1.11.4.jar
@@ -63,9 +62,6 @@ commons-pool2/2.12.0//commons-pool2-2.12.0.jar
commons-text/1.10.0//commons-text-1.10.0.jar
compress-lzf/1.1.2//compress-lzf-1.1.2.jar
crt-core/2.24.12//crt-core-2.24.12.jar
-curator-client/5.2.0//curator-client-5.2.0.jar
-curator-framework/5.2.0//curator-framework-5.2.0.jar
-curator-recipes/5.2.0//curator-recipes-5.2.0.jar
datanucleus-api-jdo/4.2.4//datanucleus-api-jdo-4.2.4.jar
datanucleus-core/4.1.17//datanucleus-core-4.1.17.jar
datanucleus-rdbms/4.1.19//datanucleus-rdbms-4.1.19.jar
@@ -209,8 +205,6 @@
jetty-util-ajax/9.4.51.v20230217//jetty-util-ajax-9.4.51.v20230217.jar
jetty-util/9.4.51.v20230217//jetty-util-9.4.51.v20230217.jar
jetty-webapp/9.4.51.v20230217//jetty-webapp-9.4.51.v20230217.jar
jetty-xml/9.4.51.v20230217//jetty-xml-9.4.51.v20230217.jar
-jline/2.12//jline-2.12.jar
-jline/3.9.0//jline-3.9.0.jar
joda-time/2.12.5//joda-time-2.12.5.jar
jpam/1.1//jpam-1.1.jar
jsch/0.1.55//jsch-0.1.55.jar
@@ -428,6 +422,4 @@ xbean-asm9-shaded/4.23//xbean-asm9-shaded-4.23.jar
xnio-api/3.8.8.Final//xnio-api-3.8.8.Final.jar
xz/1.9//xz-1.9.jar
zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar
-zookeeper-jute/3.8.3//zookeeper-jute-3.8.3.jar
-zookeeper/3.8.3//zookeeper-3.8.3.jar
zstd-jni/1.5.5-4//zstd-jni-1.5.5-4.jar
diff --git a/pom.xml b/pom.xml
index 3609fc00c..a44a9f64b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -341,6 +341,22 @@
<groupId>org.apache.kerby</groupId>
<artifactId>kerb-simplekdc</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -373,6 +389,14 @@
<groupId>javax.servlet</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet</artifactId>
@@ -393,6 +417,14 @@
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP-java7</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -406,6 +438,12 @@
<groupId>org.apache.kerby</groupId>
<artifactId>kerb-simplekdc</artifactId>
<version>${kerby.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -672,6 +710,47 @@
<version>${kryo.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-exec</artifactId>
+ <version>${hive.version}</version>
+ <classifier>core</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.pentaho</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.orc</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-metastore</artifactId>
@@ -713,6 +792,10 @@
<groupId>javax.servlet</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
@@ -761,6 +844,14 @@
<groupId>co.cask.tephra</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
