From fa25ba8e1ca99cb7ab2cb4e4f690da15730ddad5 Mon Sep 17 00:00:00 2001 From: SteNicholas Date: Tue, 2 Apr 2024 16:46:03 +0800 Subject: [PATCH] [CELEBORN-1366] Bump guava from 32.1.3-jre to 33.1.0-jre ### What changes were proposed in this pull request? Bump guava from 32.1.3-jre to 33.1.0-jre. ### Why are the changes needed? Guava v33.1.0 has been released, which release note refers to [v33.1.0](https://github.com/google/guava/releases/tag/v33.1.0). v33.1.0 brings some bug fixes and optimizations as follows: * cache: Fixed a bug that could cause https://github.com/google/guava/pull/6851#issuecomment-1931276822 for `CacheLoader`/`CacheBuilder`. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? No. Closes #2439 from SteNicholas/CELEBORN-1366. Authored-by: SteNicholas Signed-off-by: mingji --- dev/deps/dependencies-client-flink-1.14 | 4 ++-- dev/deps/dependencies-client-flink-1.15 | 4 ++-- dev/deps/dependencies-client-flink-1.17 | 4 ++-- dev/deps/dependencies-client-flink-1.18 | 4 ++-- dev/deps/dependencies-client-flink-1.19 | 4 ++-- dev/deps/dependencies-client-mr | 4 ++-- dev/deps/dependencies-client-spark-2.4 | 4 ++-- dev/deps/dependencies-client-spark-3.0 | 4 ++-- dev/deps/dependencies-client-spark-3.1 | 4 ++-- dev/deps/dependencies-client-spark-3.2 | 4 ++-- dev/deps/dependencies-client-spark-3.3 | 4 ++-- dev/deps/dependencies-client-spark-3.4 | 4 ++-- dev/deps/dependencies-client-spark-3.5 | 4 ++-- dev/deps/dependencies-server | 4 ++-- pom.xml | 2 +- project/CelebornBuild.scala | 2 +- 16 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dev/deps/dependencies-client-flink-1.14 b/dev/deps/dependencies-client-flink-1.14 index d57febdfb..f0f24cf3f 100644 --- a/dev/deps/dependencies-client-flink-1.14 +++ b/dev/deps/dependencies-client-flink-1.14 @@ -20,8 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.13.0//commons-io-2.13.0.jar commons-lang3/3.12.0//commons-lang3-3.12.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar -failureaccess/1.0.1//failureaccess-1.0.1.jar -guava/32.1.3-jre//guava-32.1.3-jre.jar +failureaccess/1.0.2//failureaccess-1.0.2.jar +guava/33.1.0-jre//guava-33.1.0-jre.jar hadoop-client-api/3.3.6//hadoop-client-api-3.3.6.jar hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar jackson-annotations/2.15.3//jackson-annotations-2.15.3.jar diff --git a/dev/deps/dependencies-client-flink-1.15 b/dev/deps/dependencies-client-flink-1.15 index d57febdfb..f0f24cf3f 100644 --- a/dev/deps/dependencies-client-flink-1.15 +++ b/dev/deps/dependencies-client-flink-1.15 @@ -20,8 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.13.0//commons-io-2.13.0.jar commons-lang3/3.12.0//commons-lang3-3.12.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar -failureaccess/1.0.1//failureaccess-1.0.1.jar -guava/32.1.3-jre//guava-32.1.3-jre.jar +failureaccess/1.0.2//failureaccess-1.0.2.jar +guava/33.1.0-jre//guava-33.1.0-jre.jar hadoop-client-api/3.3.6//hadoop-client-api-3.3.6.jar hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar jackson-annotations/2.15.3//jackson-annotations-2.15.3.jar diff --git a/dev/deps/dependencies-client-flink-1.17 b/dev/deps/dependencies-client-flink-1.17 index d57febdfb..f0f24cf3f 100644 --- a/dev/deps/dependencies-client-flink-1.17 +++ b/dev/deps/dependencies-client-flink-1.17 @@ -20,8 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.13.0//commons-io-2.13.0.jar commons-lang3/3.12.0//commons-lang3-3.12.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar -failureaccess/1.0.1//failureaccess-1.0.1.jar -guava/32.1.3-jre//guava-32.1.3-jre.jar +failureaccess/1.0.2//failureaccess-1.0.2.jar +guava/33.1.0-jre//guava-33.1.0-jre.jar hadoop-client-api/3.3.6//hadoop-client-api-3.3.6.jar hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar jackson-annotations/2.15.3//jackson-annotations-2.15.3.jar diff --git a/dev/deps/dependencies-client-flink-1.18 b/dev/deps/dependencies-client-flink-1.18 index d57febdfb..f0f24cf3f 100644 --- a/dev/deps/dependencies-client-flink-1.18 +++ b/dev/deps/dependencies-client-flink-1.18 @@ -20,8 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.13.0//commons-io-2.13.0.jar commons-lang3/3.12.0//commons-lang3-3.12.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar -failureaccess/1.0.1//failureaccess-1.0.1.jar -guava/32.1.3-jre//guava-32.1.3-jre.jar +failureaccess/1.0.2//failureaccess-1.0.2.jar +guava/33.1.0-jre//guava-33.1.0-jre.jar hadoop-client-api/3.3.6//hadoop-client-api-3.3.6.jar hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar jackson-annotations/2.15.3//jackson-annotations-2.15.3.jar diff --git a/dev/deps/dependencies-client-flink-1.19 b/dev/deps/dependencies-client-flink-1.19 index d57febdfb..f0f24cf3f 100644 --- a/dev/deps/dependencies-client-flink-1.19 +++ b/dev/deps/dependencies-client-flink-1.19 @@ -20,8 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.13.0//commons-io-2.13.0.jar commons-lang3/3.12.0//commons-lang3-3.12.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar -failureaccess/1.0.1//failureaccess-1.0.1.jar -guava/32.1.3-jre//guava-32.1.3-jre.jar +failureaccess/1.0.2//failureaccess-1.0.2.jar +guava/33.1.0-jre//guava-33.1.0-jre.jar hadoop-client-api/3.3.6//hadoop-client-api-3.3.6.jar hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar jackson-annotations/2.15.3//jackson-annotations-2.15.3.jar diff --git a/dev/deps/dependencies-client-mr b/dev/deps/dependencies-client-mr index 4f7b59ff9..498905f67 100644 --- a/dev/deps/dependencies-client-mr +++ b/dev/deps/dependencies-client-mr @@ -41,10 +41,10 @@ curator-framework/5.2.0//curator-framework-5.2.0.jar curator-recipes/5.2.0//curator-recipes-5.2.0.jar dnsjava/2.1.7//dnsjava-2.1.7.jar ehcache/3.3.1//ehcache-3.3.1.jar -failureaccess/1.0.1//failureaccess-1.0.1.jar +failureaccess/1.0.2//failureaccess-1.0.2.jar geronimo-jcache_1.0_spec/1.0-alpha-1//geronimo-jcache_1.0_spec-1.0-alpha-1.jar gson/2.9.0//gson-2.9.0.jar -guava/32.1.3-jre//guava-32.1.3-jre.jar +guava/33.1.0-jre//guava-33.1.0-jre.jar guice-servlet/4.0//guice-servlet-4.0.jar guice/4.0//guice-4.0.jar hadoop-annotations/3.3.6//hadoop-annotations-3.3.6.jar diff --git a/dev/deps/dependencies-client-spark-2.4 b/dev/deps/dependencies-client-spark-2.4 index 1d565ff7e..9b044b54e 100644 --- a/dev/deps/dependencies-client-spark-2.4 +++ b/dev/deps/dependencies-client-spark-2.4 @@ -20,8 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.13.0//commons-io-2.13.0.jar commons-lang3/3.12.0//commons-lang3-3.12.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar -failureaccess/1.0.1//failureaccess-1.0.1.jar -guava/32.1.3-jre//guava-32.1.3-jre.jar +failureaccess/1.0.2//failureaccess-1.0.2.jar +guava/33.1.0-jre//guava-33.1.0-jre.jar hadoop-client-api/3.3.6//hadoop-client-api-3.3.6.jar hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar jackson-annotations/2.15.3//jackson-annotations-2.15.3.jar diff --git a/dev/deps/dependencies-client-spark-3.0 b/dev/deps/dependencies-client-spark-3.0 index 0f1555822..b69c67e12 100644 --- a/dev/deps/dependencies-client-spark-3.0 +++ b/dev/deps/dependencies-client-spark-3.0 @@ -20,8 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.13.0//commons-io-2.13.0.jar commons-lang3/3.12.0//commons-lang3-3.12.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar -failureaccess/1.0.1//failureaccess-1.0.1.jar -guava/32.1.3-jre//guava-32.1.3-jre.jar +failureaccess/1.0.2//failureaccess-1.0.2.jar +guava/33.1.0-jre//guava-33.1.0-jre.jar hadoop-client-api/3.3.6//hadoop-client-api-3.3.6.jar hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar jackson-annotations/2.15.3//jackson-annotations-2.15.3.jar diff --git a/dev/deps/dependencies-client-spark-3.1 b/dev/deps/dependencies-client-spark-3.1 index e58c2b751..992d3365d 100644 --- a/dev/deps/dependencies-client-spark-3.1 +++ b/dev/deps/dependencies-client-spark-3.1 @@ -20,8 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.13.0//commons-io-2.13.0.jar commons-lang3/3.12.0//commons-lang3-3.12.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar -failureaccess/1.0.1//failureaccess-1.0.1.jar -guava/32.1.3-jre//guava-32.1.3-jre.jar +failureaccess/1.0.2//failureaccess-1.0.2.jar +guava/33.1.0-jre//guava-33.1.0-jre.jar hadoop-client-api/3.3.6//hadoop-client-api-3.3.6.jar hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar jackson-annotations/2.15.3//jackson-annotations-2.15.3.jar diff --git a/dev/deps/dependencies-client-spark-3.2 b/dev/deps/dependencies-client-spark-3.2 index a4e18920b..0ec524f54 100644 --- a/dev/deps/dependencies-client-spark-3.2 +++ b/dev/deps/dependencies-client-spark-3.2 @@ -20,8 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.13.0//commons-io-2.13.0.jar commons-lang3/3.12.0//commons-lang3-3.12.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar -failureaccess/1.0.1//failureaccess-1.0.1.jar -guava/32.1.3-jre//guava-32.1.3-jre.jar +failureaccess/1.0.2//failureaccess-1.0.2.jar +guava/33.1.0-jre//guava-33.1.0-jre.jar hadoop-client-api/3.3.6//hadoop-client-api-3.3.6.jar hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar jackson-annotations/2.15.3//jackson-annotations-2.15.3.jar diff --git a/dev/deps/dependencies-client-spark-3.3 b/dev/deps/dependencies-client-spark-3.3 index 1c6256450..cb6f91f50 100644 --- a/dev/deps/dependencies-client-spark-3.3 +++ b/dev/deps/dependencies-client-spark-3.3 @@ -20,8 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.13.0//commons-io-2.13.0.jar commons-lang3/3.12.0//commons-lang3-3.12.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar -failureaccess/1.0.1//failureaccess-1.0.1.jar -guava/32.1.3-jre//guava-32.1.3-jre.jar +failureaccess/1.0.2//failureaccess-1.0.2.jar +guava/33.1.0-jre//guava-33.1.0-jre.jar hadoop-client-api/3.3.6//hadoop-client-api-3.3.6.jar hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar jackson-annotations/2.15.3//jackson-annotations-2.15.3.jar diff --git a/dev/deps/dependencies-client-spark-3.4 b/dev/deps/dependencies-client-spark-3.4 index fd38d5bb5..bff920f8a 100644 --- a/dev/deps/dependencies-client-spark-3.4 +++ b/dev/deps/dependencies-client-spark-3.4 @@ -20,8 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.13.0//commons-io-2.13.0.jar commons-lang3/3.12.0//commons-lang3-3.12.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar -failureaccess/1.0.1//failureaccess-1.0.1.jar -guava/32.1.3-jre//guava-32.1.3-jre.jar +failureaccess/1.0.2//failureaccess-1.0.2.jar +guava/33.1.0-jre//guava-33.1.0-jre.jar hadoop-client-api/3.3.6//hadoop-client-api-3.3.6.jar hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar jackson-annotations/2.15.3//jackson-annotations-2.15.3.jar diff --git a/dev/deps/dependencies-client-spark-3.5 b/dev/deps/dependencies-client-spark-3.5 index 27292934b..023225658 100644 --- a/dev/deps/dependencies-client-spark-3.5 +++ b/dev/deps/dependencies-client-spark-3.5 @@ -20,8 +20,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.13.0//commons-io-2.13.0.jar commons-lang3/3.12.0//commons-lang3-3.12.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar -failureaccess/1.0.1//failureaccess-1.0.1.jar -guava/32.1.3-jre//guava-32.1.3-jre.jar +failureaccess/1.0.2//failureaccess-1.0.2.jar +guava/33.1.0-jre//guava-33.1.0-jre.jar hadoop-client-api/3.3.6//hadoop-client-api-3.3.6.jar hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar jackson-annotations/2.15.3//jackson-annotations-2.15.3.jar diff --git a/dev/deps/dependencies-server b/dev/deps/dependencies-server index ca5a32e7e..a09ea318c 100644 --- a/dev/deps/dependencies-server +++ b/dev/deps/dependencies-server @@ -25,8 +25,8 @@ commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.13.0//commons-io-2.13.0.jar commons-lang3/3.12.0//commons-lang3-3.12.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar -failureaccess/1.0.1//failureaccess-1.0.1.jar -guava/32.1.3-jre//guava-32.1.3-jre.jar +failureaccess/1.0.2//failureaccess-1.0.2.jar +guava/33.1.0-jre//guava-33.1.0-jre.jar hadoop-client-api/3.3.6//hadoop-client-api-3.3.6.jar hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar hk2-api/2.6.1//hk2-api-2.6.1.jar diff --git a/pom.xml b/pom.xml index 00a718a4c..83e940f43 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ 9+181-r4173-1 1.3.9 1.44.0 - 32.1.3-jre + 33.1.0-jre 4.13.2 1.8 2.17.2 diff --git a/project/CelebornBuild.scala b/project/CelebornBuild.scala index 906ca112b..c9d11acef 100644 --- a/project/CelebornBuild.scala +++ b/project/CelebornBuild.scala @@ -43,7 +43,7 @@ object Dependencies { val commonsLoggingVersion = "1.1.3" val commonsLang3Version = "3.12.0" val findbugsVersion = "1.3.9" - val guavaVersion = "32.1.3-jre" + val guavaVersion = "33.1.0-jre" val hadoopVersion = "3.3.6" val junitInterfaceVersion = "0.13.3" // don't forget update `junitInterfaceVersion` when we upgrade junit