diff --git a/amoro-ams/pom.xml b/amoro-ams/pom.xml index 1724b8a802..9b0f96f4a4 100644 --- a/amoro-ams/pom.xml +++ b/amoro-ams/pom.xml @@ -509,8 +509,7 @@ com.google.guava guava - ${guava.version} - test + ${guava-hive.version} diff --git a/dev/deps/dependencies-hadoop-2-spark-3.3 b/dev/deps/dependencies-hadoop-2-spark-3.3 index 4d5fcbeaa9..d0e0464ac2 100644 --- a/dev/deps/dependencies-hadoop-2-spark-3.3 +++ b/dev/deps/dependencies-hadoop-2-spark-3.3 @@ -105,7 +105,7 @@ flink-streaming-java/1.20.3//flink-streaming-java-1.20.3.jar geronimo-jcache_1.0_spec/1.0-alpha-1//geronimo-jcache_1.0_spec-1.0-alpha-1.jar glue/2.24.12//glue-2.24.12.jar gson/2.8.6//gson-2.8.6.jar -guava/11.0.2//guava-11.0.2.jar +guava/14.0.1//guava-14.0.1.jar hadoop-annotations/2.10.2//hadoop-annotations-2.10.2.jar hadoop-auth/2.10.2//hadoop-auth-2.10.2.jar hadoop-aws/2.10.2//hadoop-aws-2.10.2.jar diff --git a/dev/deps/dependencies-hadoop-3-spark-3.5 b/dev/deps/dependencies-hadoop-3-spark-3.5 index 52488542b2..2facef79f9 100644 --- a/dev/deps/dependencies-hadoop-3-spark-3.5 +++ b/dev/deps/dependencies-hadoop-3-spark-3.5 @@ -71,8 +71,9 @@ dynamodb/2.24.12//dynamodb-2.24.12.jar eclipse-collections-api/11.1.0//eclipse-collections-api-11.1.0.jar eclipse-collections/11.1.0//eclipse-collections-11.1.0.jar endpoints-spi/2.24.12//endpoints-spi-2.24.12.jar -error_prone_annotations/2.10.0//error_prone_annotations-2.10.0.jar +error_prone_annotations/2.18.0//error_prone_annotations-2.18.0.jar eventstream/1.0.1//eventstream-1.0.1.jar +failureaccess/1.0.1//failureaccess-1.0.1.jar flatbuffers-java/23.5.26//flatbuffers-java-23.5.26.jar flatbuffers/1.2.0-3f79e055//flatbuffers-1.2.0-3f79e055.jar flink-annotations/1.20.3//flink-annotations-1.20.3.jar @@ -98,6 +99,7 @@ flink-shaded-netty/4.1.91.Final-17.0//flink-shaded-netty-4.1.91.Final-17.0.jar flink-streaming-java/1.20.3//flink-streaming-java-1.20.3.jar glue/2.24.12//glue-2.24.12.jar gson/2.10.1//gson-2.10.1.jar +guava/32.1.1-jre//guava-32.1.1-jre.jar hadoop-aws/3.4.2//hadoop-aws-3.4.2.jar hadoop-client-api/3.4.2//hadoop-client-api-3.4.2.jar hadoop-client-runtime/3.4.2//hadoop-client-runtime-3.4.2.jar @@ -144,6 +146,7 @@ iceberg-spark-extensions-3.5_2.12/1.6.1//iceberg-spark-extensions-3.5_2.12-1.6.1 icu4j/69.1//icu4j-69.1.jar identity-spi/2.24.12//identity-spi-2.24.12.jar ivy/2.5.1//ivy-2.5.1.jar +j2objc-annotations/2.8//j2objc-annotations-2.8.jar jackson-annotations/2.14.2//jackson-annotations-2.14.2.jar jackson-core/2.14.2//jackson-core-2.14.2.jar jackson-databind/2.14.2//jackson-databind-2.14.2.jar @@ -253,6 +256,7 @@ kyuubi-hive-jdbc-shaded/1.10.2//kyuubi-hive-jdbc-shaded-1.10.2.jar leveldbjni-all/1.8//leveldbjni-all-1.8.jar libfb303/0.9.3//libfb303-0.9.3.jar libthrift/0.9.3//libthrift-0.9.3.jar +listenablefuture/9999.0-empty-to-avoid-conflict-with-guava//listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar log4j-1.2-api/2.20.0//log4j-1.2-api-2.20.0.jar log4j-api/2.20.0//log4j-api-2.20.0.jar log4j-core/2.20.0//log4j-core-2.20.0.jar diff --git a/pom.xml b/pom.xml index c5c72a856a..2161a1b568 100644 --- a/pom.xml +++ b/pom.xml @@ -159,6 +159,7 @@ 0.20.0 1.3.2 32.1.1-jre + 32.1.1-jre 0.14.1 6.1.0 4.7