diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index dff9e7e754a31..e5bdfe38fdd2c 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -25,7 +25,7 @@ on: java: required: false type: string - default: 17 + default: 21 branch: description: Branch to run the build against required: false diff --git a/LICENSE-binary b/LICENSE-binary index b421b4ff68afd..e3bb0aa697c9b 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -394,7 +394,7 @@ org.json4s:json4s-jackson_2.13 org.json4s:json4s-scalap_2.13 org.lz4:lz4-java org.objenesis:objenesis -org.roaringbitmap:RoaringBitmap +com.github.RoaringBitmap.RoaringBitmap:roaringbitmap org.rocksdb:rocksdbjni org.scala-lang:scala-compiler org.scala-lang:scala-library diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml index 2f2be88ac9dd1..56db3b030906d 100644 --- a/common/network-common/pom.xml +++ b/common/network-common/pom.xml @@ -136,8 +136,8 @@ tink - org.roaringbitmap - RoaringBitmap + com.github.RoaringBitmap.RoaringBitmap + roaringbitmap diff --git a/common/network-shuffle/pom.xml b/common/network-shuffle/pom.xml index adfc55d28c357..d5969c939e5d5 100644 --- a/common/network-shuffle/pom.xml +++ b/common/network-shuffle/pom.xml @@ -63,8 +63,8 @@ guava - org.roaringbitmap - RoaringBitmap + com.github.RoaringBitmap.RoaringBitmap + roaringbitmap diff --git a/core/pom.xml b/core/pom.xml index 79aa783cf2091..3908d6e8db6cf 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -244,8 +244,8 @@ zstd-jni - org.roaringbitmap - RoaringBitmap + com.github.RoaringBitmap.RoaringBitmap + roaringbitmap org.scala-lang.modules diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 index 7853be2c9d063..634c0047ee998 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -1,7 +1,6 @@ HikariCP/2.5.1//HikariCP-2.5.1.jar JLargeArrays/1.5//JLargeArrays-1.5.jar JTransforms/3.1//JTransforms-3.1.jar -RoaringBitmap/1.3.0//RoaringBitmap-1.3.0.jar ST4/4.0.4//ST4-4.0.4.jar aircompressor/2.0.2//aircompressor-2.0.2.jar algebra_2.13/2.8.0//algebra_2.13-2.8.0.jar @@ -249,6 +248,7 @@ parquet-jackson/1.15.2//parquet-jackson-1.15.2.jar pickle/1.5//pickle-1.5.jar py4j/0.10.9.9//py4j-0.10.9.9.jar remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar +roaringbitmap/1.5.2//roaringbitmap-1.5.2.jar rocksdbjni/9.8.4//rocksdbjni-9.8.4.jar scala-collection-compat_2.13/2.7.0//scala-collection-compat_2.13-2.7.0.jar scala-compiler/2.13.16//scala-compiler-2.13.16.jar diff --git a/pom.xml b/pom.xml index fc3b79eb5e44e..9e8ce24482f02 100644 --- a/pom.xml +++ b/pom.xml @@ -365,6 +365,17 @@ false + + jitpack.io + JitPack + https://jitpack.io + + true + + + false + + diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index a34ae9fe3c1b9..c7d0dde45ac54 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -277,6 +277,7 @@ object SparkBuild extends PomBuild { // Google Mirror of Maven Central, placed first so that it's used instead of flaky Maven Central. // See https://storage-download.googleapis.com/maven-central/index.html for more info. "gcs-maven-central-mirror" at "https://maven-central.storage-download.googleapis.com/maven2/", + "jitpack" at "https://jitpack.io", DefaultMavenRepository, Resolver.mavenLocal, Resolver.file("ivyLocal", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns)