Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/sbt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion dev/deps/dependencies-client-flink-1.18
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/deps/dependencies-client-flink-1.19
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/deps/dependencies-client-flink-1.20
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/deps/dependencies-client-flink-2.0
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/deps/dependencies-client-flink-2.1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/deps/dependencies-client-flink-2.2
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/deps/dependencies-client-mr
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/deps/dependencies-client-spark-4.0
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/deps/dependencies-client-spark-4.1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/deps/dependencies-client-tez
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/deps/dependencies-server
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
the link to metrics.dropwizard.io in docs/monitoring.md.
-->
<codahale.metrics.version>4.2.25</codahale.metrics.version>
<commons-lang3.version>3.17.0</commons-lang3.version>
<commons-lang3.version>3.20.0</commons-lang3.version>
<commons-io.version>2.17.0</commons-io.version>
<commons-crypto.version>1.0.0</commons-crypto.version>
<!-- last version to support compilation in java 8. See https://errorprone.info/docs/installation#:~:text=you%20are%20using.-,JDK%208,-Error%20Prone%202.10.0 -->
Expand Down Expand Up @@ -1531,6 +1531,7 @@
<spark.version>3.0.3</spark.version>
<zstd-jni.version>1.4.4-3</zstd-jni.version>
<maven.plugin.silencer.version>1.6.0</maven.plugin.silencer.version>
<commons-lang3.version>3.17.0</commons-lang3.version>
</properties>
</profile>

Expand All @@ -1552,6 +1553,7 @@
<spark.version>3.1.3</spark.version>
<zstd-jni.version>1.4.8-1</zstd-jni.version>
<maven.plugin.silencer.version>1.6.0</maven.plugin.silencer.version>
<commons-lang3.version>3.17.0</commons-lang3.version>
</properties>
</profile>

Expand All @@ -1572,6 +1574,7 @@
<scala.binary.version>2.12</scala.binary.version>
<spark.version>3.2.4</spark.version>
<zstd-jni.version>1.5.0-4</zstd-jni.version>
<commons-lang3.version>3.17.0</commons-lang3.version>
</properties>
</profile>

Expand All @@ -1592,6 +1595,7 @@
<scala.binary.version>2.12</scala.binary.version>
<spark.version>3.3.4</spark.version>
<zstd-jni.version>1.5.2-1</zstd-jni.version>
<commons-lang3.version>3.17.0</commons-lang3.version>
</properties>
</profile>

Expand All @@ -1612,6 +1616,7 @@
<scala.binary.version>2.12</scala.binary.version>
<spark.version>3.4.4</spark.version>
<zstd-jni.version>1.5.2-5</zstd-jni.version>
<commons-lang3.version>3.17.0</commons-lang3.version>
</properties>
</profile>

Expand All @@ -1632,6 +1637,7 @@
<scala.binary.version>2.12</scala.binary.version>
<spark.version>3.5.8</spark.version>
<zstd-jni.version>1.5.5-4</zstd-jni.version>
<commons-lang3.version>3.17.0</commons-lang3.version>
</properties>
</profile>

Expand Down
9 changes: 8 additions & 1 deletion project/CelebornBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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"
}
Expand Down Expand Up @@ -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

Expand Down
Loading