diff --git a/.github/workflows/sbt.yml b/.github/workflows/sbt.yml index 5ec630b2fb5..d6a10accfe6 100644 --- a/.github/workflows/sbt.yml +++ b/.github/workflows/sbt.yml @@ -43,8 +43,8 @@ jobs: - 11 - 17 scala: - - '2.12.15' - - '2.13.5' + - '2.12.18' + - '2.13.16' steps: - uses: actions/checkout@v4 - name: Setup JDK ${{ matrix.java }} 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-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 7796756d305..26dfc96a2ad 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 8d106f9ac44..7105c8adf75 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,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 @@ -1531,6 +1531,7 @@ 3.0.3 1.4.4-3 1.6.0 + 3.17.0 @@ -1552,6 +1553,7 @@ 3.1.3 1.4.8-1 1.6.0 + 3.17.0 @@ -1572,6 +1574,7 @@ 2.12 3.2.4 1.5.0-4 + 3.17.0 @@ -1592,6 +1595,7 @@ 2.12 3.3.4 1.5.2-1 + 3.17.0 @@ -1612,6 +1616,7 @@ 2.12 3.4.4 1.5.2-5 + 3.17.0 @@ -1632,6 +1637,7 @@ 2.12 3.5.8 1.5.5-4 + 3.17.0 diff --git a/project/CelebornBuild.scala b/project/CelebornBuild.scala index ec82fd1d67e..034025ef1c2 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 = sparkClientProjects.map(_.commonsLang3Version).getOrElse("3.20.0") val commonsCollectionsVersion = "3.2.2" val findbugsVersion = "1.3.9" val guavaVersion = "33.1.0-jre" @@ -892,6 +892,7 @@ object Spark30 extends SparkClientProjects { val sparkVersion = "3.0.3" val zstdJniVersion = "1.4.4-3" + override val commonsLang3Version: String = "3.17.0" } object Spark31 extends SparkClientProjects { @@ -906,6 +907,7 @@ object Spark31 extends SparkClientProjects { val sparkVersion = "3.1.3" val zstdJniVersion = "1.4.8-1" + override val commonsLang3Version: String = "3.17.0" } object Spark32 extends SparkClientProjects { @@ -920,6 +922,7 @@ object Spark32 extends SparkClientProjects { val sparkVersion = "3.2.4" val zstdJniVersion = "1.5.0-4" + override val commonsLang3Version: String = "3.17.0" } object Spark33 extends SparkClientProjects { @@ -937,6 +940,7 @@ object Spark33 extends SparkClientProjects { // val scalaBinaryVersion = "2.12" val sparkVersion = "3.3.4" val zstdJniVersion = "1.5.2-1" + override val commonsLang3Version: String = "3.17.0" } object Spark34 extends SparkClientProjects { @@ -951,6 +955,7 @@ object Spark34 extends SparkClientProjects { val sparkVersion = "3.4.4" val zstdJniVersion = "1.5.2-5" + override val commonsLang3Version: String = "3.17.0" } object Spark35 extends SparkClientProjects { @@ -965,6 +970,7 @@ object Spark35 extends SparkClientProjects { val sparkVersion = "3.5.8" val zstdJniVersion = "1.5.5-4" + override val commonsLang3Version: String = "3.17.0" override val sparkColumnarShuffleVersion: String = "3.5" } @@ -1015,6 +1021,7 @@ trait SparkClientProjects { val sparkProjectScalaVersion: String val sparkVersion: String val zstdJniVersion: String + val commonsLang3Version: String = "3.20.0" val includeColumnarShuffle: Boolean = true