diff --git a/.github/workflows/sbt.yml b/.github/workflows/sbt.yml index 4daff4409bd..ce3dd49d41a 100644 --- a/.github/workflows/sbt.yml +++ b/.github/workflows/sbt.yml @@ -165,7 +165,7 @@ jobs: # Spark 3.4 - spark: '3.4' scala-binary: '2.12' - scala: '2.12.17' + scala: '2.12.18' - spark: '3.4' scala-binary: '2.13' scala: '2.13.8' diff --git a/dev/deps/dependencies-client-flink-1.16 b/dev/deps/dependencies-client-flink-1.16 index d2604d91bfc..e86beae970e 100644 --- a/dev/deps/dependencies-client-flink-1.16 +++ b/dev/deps/dependencies-client-flink-1.16 @@ -18,7 +18,7 @@ RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar failureaccess/1.0.2//failureaccess-1.0.2.jar guava/33.1.0-jre//guava-33.1.0-jre.jar diff --git a/dev/deps/dependencies-client-flink-1.17 b/dev/deps/dependencies-client-flink-1.17 index d2604d91bfc..e86beae970e 100644 --- a/dev/deps/dependencies-client-flink-1.17 +++ b/dev/deps/dependencies-client-flink-1.17 @@ -18,7 +18,7 @@ RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar failureaccess/1.0.2//failureaccess-1.0.2.jar guava/33.1.0-jre//guava-33.1.0-jre.jar diff --git a/dev/deps/dependencies-client-flink-1.18 b/dev/deps/dependencies-client-flink-1.18 index d2604d91bfc..e86beae970e 100644 --- a/dev/deps/dependencies-client-flink-1.18 +++ b/dev/deps/dependencies-client-flink-1.18 @@ -18,7 +18,7 @@ RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar failureaccess/1.0.2//failureaccess-1.0.2.jar guava/33.1.0-jre//guava-33.1.0-jre.jar diff --git a/dev/deps/dependencies-client-flink-1.19 b/dev/deps/dependencies-client-flink-1.19 index d2604d91bfc..e86beae970e 100644 --- a/dev/deps/dependencies-client-flink-1.19 +++ b/dev/deps/dependencies-client-flink-1.19 @@ -18,7 +18,7 @@ RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar failureaccess/1.0.2//failureaccess-1.0.2.jar guava/33.1.0-jre//guava-33.1.0-jre.jar diff --git a/dev/deps/dependencies-client-flink-1.20 b/dev/deps/dependencies-client-flink-1.20 index d2604d91bfc..e86beae970e 100644 --- a/dev/deps/dependencies-client-flink-1.20 +++ b/dev/deps/dependencies-client-flink-1.20 @@ -18,7 +18,7 @@ RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar failureaccess/1.0.2//failureaccess-1.0.2.jar guava/33.1.0-jre//guava-33.1.0-jre.jar diff --git a/dev/deps/dependencies-client-flink-2.0 b/dev/deps/dependencies-client-flink-2.0 index b06979be85e..3b10c9fff06 100644 --- a/dev/deps/dependencies-client-flink-2.0 +++ b/dev/deps/dependencies-client-flink-2.0 @@ -18,7 +18,7 @@ RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar failureaccess/1.0.2//failureaccess-1.0.2.jar guava/33.1.0-jre//guava-33.1.0-jre.jar diff --git a/dev/deps/dependencies-client-flink-2.1 b/dev/deps/dependencies-client-flink-2.1 index b06979be85e..3b10c9fff06 100644 --- a/dev/deps/dependencies-client-flink-2.1 +++ b/dev/deps/dependencies-client-flink-2.1 @@ -18,7 +18,7 @@ RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar failureaccess/1.0.2//failureaccess-1.0.2.jar guava/33.1.0-jre//guava-33.1.0-jre.jar diff --git a/dev/deps/dependencies-client-flink-2.2 b/dev/deps/dependencies-client-flink-2.2 index b06979be85e..3b10c9fff06 100644 --- a/dev/deps/dependencies-client-flink-2.2 +++ b/dev/deps/dependencies-client-flink-2.2 @@ -18,7 +18,7 @@ RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar failureaccess/1.0.2//failureaccess-1.0.2.jar guava/33.1.0-jre//guava-33.1.0-jre.jar diff --git a/dev/deps/dependencies-client-mr b/dev/deps/dependencies-client-mr index 82919c08041..c03c4ffa5de 100644 --- a/dev/deps/dependencies-client-mr +++ b/dev/deps/dependencies-client-mr @@ -31,7 +31,7 @@ commons-configuration2/2.8.0//commons-configuration2-2.8.0.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-daemon/1.0.13//commons-daemon-1.0.13.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar commons-math3/3.1.1//commons-math3-3.1.1.jar commons-net/3.9.0//commons-net-3.9.0.jar diff --git a/dev/deps/dependencies-client-spark-2.4 b/dev/deps/dependencies-client-spark-2.4 index 8ca6fffa932..bca146654dc 100644 --- a/dev/deps/dependencies-client-spark-2.4 +++ b/dev/deps/dependencies-client-spark-2.4 @@ -18,7 +18,7 @@ RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar failureaccess/1.0.2//failureaccess-1.0.2.jar guava/33.1.0-jre//guava-33.1.0-jre.jar diff --git a/dev/deps/dependencies-client-spark-3.0 b/dev/deps/dependencies-client-spark-3.0 index 8b12d625d79..6d9fe3fc12e 100644 --- a/dev/deps/dependencies-client-spark-3.0 +++ b/dev/deps/dependencies-client-spark-3.0 @@ -18,7 +18,7 @@ RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar failureaccess/1.0.2//failureaccess-1.0.2.jar guava/33.1.0-jre//guava-33.1.0-jre.jar diff --git a/dev/deps/dependencies-client-spark-3.1 b/dev/deps/dependencies-client-spark-3.1 index 5beb35ca037..b031e650011 100644 --- a/dev/deps/dependencies-client-spark-3.1 +++ b/dev/deps/dependencies-client-spark-3.1 @@ -18,7 +18,7 @@ RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar failureaccess/1.0.2//failureaccess-1.0.2.jar guava/33.1.0-jre//guava-33.1.0-jre.jar diff --git a/dev/deps/dependencies-client-spark-3.2 b/dev/deps/dependencies-client-spark-3.2 index 3adc3ab3a30..61c65987261 100644 --- a/dev/deps/dependencies-client-spark-3.2 +++ b/dev/deps/dependencies-client-spark-3.2 @@ -18,7 +18,7 @@ RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar failureaccess/1.0.2//failureaccess-1.0.2.jar guava/33.1.0-jre//guava-33.1.0-jre.jar diff --git a/dev/deps/dependencies-client-spark-3.3 b/dev/deps/dependencies-client-spark-3.3 index 0bd8eaec4a6..e9a46949ca2 100644 --- a/dev/deps/dependencies-client-spark-3.3 +++ b/dev/deps/dependencies-client-spark-3.3 @@ -18,7 +18,7 @@ RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar failureaccess/1.0.2//failureaccess-1.0.2.jar guava/33.1.0-jre//guava-33.1.0-jre.jar diff --git a/dev/deps/dependencies-client-spark-3.4 b/dev/deps/dependencies-client-spark-3.4 index 02c0c7b1928..4766747eaa2 100644 --- a/dev/deps/dependencies-client-spark-3.4 +++ b/dev/deps/dependencies-client-spark-3.4 @@ -18,7 +18,7 @@ RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar failureaccess/1.0.2//failureaccess-1.0.2.jar guava/33.1.0-jre//guava-33.1.0-jre.jar diff --git a/dev/deps/dependencies-client-spark-3.5 b/dev/deps/dependencies-client-spark-3.5 index e8b51efecac..eb1124f76f4 100644 --- a/dev/deps/dependencies-client-spark-3.5 +++ b/dev/deps/dependencies-client-spark-3.5 @@ -18,7 +18,7 @@ RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar failureaccess/1.0.2//failureaccess-1.0.2.jar guava/33.1.0-jre//guava-33.1.0-jre.jar diff --git a/dev/deps/dependencies-client-spark-4.0 b/dev/deps/dependencies-client-spark-4.0 index f5f8ddbca37..4a1935a09e2 100644 --- a/dev/deps/dependencies-client-spark-4.0 +++ b/dev/deps/dependencies-client-spark-4.0 @@ -18,7 +18,7 @@ RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar failureaccess/1.0.2//failureaccess-1.0.2.jar guava/33.1.0-jre//guava-33.1.0-jre.jar diff --git a/dev/deps/dependencies-client-spark-4.1 b/dev/deps/dependencies-client-spark-4.1 index 8ad85bec05f..f458092d03a 100644 --- a/dev/deps/dependencies-client-spark-4.1 +++ b/dev/deps/dependencies-client-spark-4.1 @@ -18,7 +18,7 @@ RoaringBitmap/1.0.6//RoaringBitmap-1.0.6.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar failureaccess/1.0.2//failureaccess-1.0.2.jar guava/33.1.0-jre//guava-33.1.0-jre.jar diff --git a/dev/deps/dependencies-client-tez b/dev/deps/dependencies-client-tez index 9d73b59b5fd..3392f8df31f 100644 --- a/dev/deps/dependencies-client-tez +++ b/dev/deps/dependencies-client-tez @@ -33,7 +33,7 @@ commons-configuration2/2.8.0//commons-configuration2-2.8.0.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar commons-lang/2.6//commons-lang-2.6.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar commons-math3/3.1.1//commons-math3-3.1.1.jar commons-net/3.9.0//commons-net-3.9.0.jar diff --git a/dev/deps/dependencies-server b/dev/deps/dependencies-server index d404cb1c3ef..a4db3d793ea 100644 --- a/dev/deps/dependencies-server +++ b/dev/deps/dependencies-server @@ -23,7 +23,7 @@ classgraph/4.8.138//classgraph-4.8.138.jar commons-cli/1.5.0//commons-cli-1.5.0.jar commons-crypto/1.0.0//commons-crypto-1.0.0.jar commons-io/2.17.0//commons-io-2.17.0.jar -commons-lang3/3.17.0//commons-lang3-3.17.0.jar +commons-lang3/3.20.0//commons-lang3-3.20.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar disruptor/3.4.4//disruptor-3.4.4.jar failureaccess/1.0.2//failureaccess-1.0.2.jar diff --git a/pom.xml b/pom.xml index e78061c36dd..714f05f91ee 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ the link to metrics.dropwizard.io in docs/monitoring.md. --> 4.2.25 - 3.17.0 + 3.20.0 2.17.0 1.0.0 @@ -1635,7 +1635,7 @@ org.lz4 1.8.0 - 2.12.17 + 2.12.18 2.12 3.4.4 1.5.2-5 diff --git a/project/CelebornBuild.scala b/project/CelebornBuild.scala index 0840a81708b..546ceead764 100644 --- a/project/CelebornBuild.scala +++ b/project/CelebornBuild.scala @@ -47,7 +47,7 @@ object Dependencies { val commonsCryptoVersion = "1.0.0" val commonsIoVersion = "2.17.0" val commonsLoggingVersion = "1.1.3" - val commonsLang3Version = "3.17.0" + val commonsLang3Version = "3.20.0" val commonsCollectionsVersion = "3.2.2" val findbugsVersion = "1.3.9" val guavaVersion = "33.1.0-jre" @@ -955,7 +955,7 @@ object Spark34 extends SparkClientProjects { val sparkClientShadedProjectName = "celeborn-client-spark-3-shaded" val lz4JavaVersion = "1.8.0" - val sparkProjectScalaVersion = "2.12.17" + val sparkProjectScalaVersion = "2.12.18" val sparkVersion = "3.4.4" val zstdJniVersion = "1.5.2-5"