This is an automated email from the ASF dual-hosted git repository.
fokko pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/main by this push:
new 7539dc504c Build: Rename versions.spark.hive3* to versions.spark3*
(#12489)
7539dc504c is described below
commit 7539dc504cd61dc6e04e9b12f2f467f1b9e6aee5
Author: Cheng Pan <[email protected]>
AuthorDate: Mon Mar 10 18:01:29 2025 +0800
Build: Rename versions.spark.hive3* to versions.spark3* (#12489)
---
build.gradle | 2 +-
gradle/libs.versions.toml | 4 ++--
spark/v3.4/build.gradle | 6 +++---
spark/v3.5/build.gradle | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/build.gradle b/build.gradle
index 8f67947cbe..f747c68cbf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -614,7 +614,7 @@ project(':iceberg-delta-lake') {
}
integrationImplementation project(path: ':iceberg-hive-metastore')
integrationImplementation project(path: ':iceberg-hive-metastore',
configuration: 'testArtifacts')
-
integrationImplementation("org.apache.spark:spark-hive_${scalaVersion}:${libs.versions.spark.hive35.get()}")
{
+
integrationImplementation("org.apache.spark:spark-hive_${scalaVersion}:${libs.versions.spark35.get()}")
{
exclude group: 'org.apache.avro', module: 'avro'
exclude group: 'org.apache.arrow'
exclude group: 'org.apache.parquet'
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e649cf32cf..faaf712886 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -78,8 +78,8 @@ roaringbitmap = "1.3.0"
scala-collection-compat = "2.13.0"
slf4j = "2.0.17"
snowflake-jdbc = "3.23.0"
-spark-hive34 = "3.4.4"
-spark-hive35 = "3.5.5"
+spark34 = "3.4.4"
+spark35 = "3.5.5"
sqlite-jdbc = "3.49.1.0"
testcontainers = "1.20.5"
tez08 = { strictly = "0.8.4"} # see rich version usage explanation above
diff --git a/spark/v3.4/build.gradle b/spark/v3.4/build.gradle
index e9f310ef7b..8fd500ac64 100644
--- a/spark/v3.4/build.gradle
+++ b/spark/v3.4/build.gradle
@@ -65,7 +65,7 @@
project(":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}") {
compileOnly libs.errorprone.annotations
compileOnly libs.avro.avro
-
compileOnly("org.apache.spark:spark-hive_${scalaVersion}:${libs.versions.spark.hive34.get()}")
{
+
compileOnly("org.apache.spark:spark-hive_${scalaVersion}:${libs.versions.spark34.get()}")
{
exclude group: 'org.apache.avro', module: 'avro'
exclude group: 'org.apache.arrow'
exclude group: 'org.apache.parquet'
@@ -156,7 +156,7 @@
project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVer
compileOnly project(':iceberg-core')
compileOnly project(':iceberg-common')
compileOnly
project(":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}")
-
compileOnly("org.apache.spark:spark-hive_${scalaVersion}:${libs.versions.spark.hive34.get()}")
{
+
compileOnly("org.apache.spark:spark-hive_${scalaVersion}:${libs.versions.spark34.get()}")
{
exclude group: 'org.apache.avro', module: 'avro'
exclude group: 'org.apache.arrow'
exclude group: 'org.apache.parquet'
@@ -252,7 +252,7 @@
project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersio
}
integrationImplementation
"org.scala-lang.modules:scala-collection-compat_${scalaVersion}:${libs.versions.scala.collection.compat.get()}"
- integrationImplementation
"org.apache.spark:spark-hive_${scalaVersion}:${libs.versions.spark.hive34.get()}"
+ integrationImplementation
"org.apache.spark:spark-hive_${scalaVersion}:${libs.versions.spark34.get()}"
integrationImplementation libs.junit.vintage.engine
integrationImplementation libs.slf4j.simple
integrationImplementation libs.assertj.core
diff --git a/spark/v3.5/build.gradle b/spark/v3.5/build.gradle
index 52d9ce0348..6da6cfc925 100644
--- a/spark/v3.5/build.gradle
+++ b/spark/v3.5/build.gradle
@@ -65,7 +65,7 @@
project(":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}") {
compileOnly libs.errorprone.annotations
compileOnly libs.avro.avro
-
compileOnly("org.apache.spark:spark-hive_${scalaVersion}:${libs.versions.spark.hive35.get()}")
{
+
compileOnly("org.apache.spark:spark-hive_${scalaVersion}:${libs.versions.spark35.get()}")
{
exclude group: 'org.apache.avro', module: 'avro'
exclude group: 'org.apache.arrow'
exclude group: 'org.apache.parquet'
@@ -155,7 +155,7 @@
project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVer
compileOnly project(':iceberg-core')
compileOnly project(':iceberg-common')
compileOnly
project(":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}")
-
compileOnly("org.apache.spark:spark-hive_${scalaVersion}:${libs.versions.spark.hive35.get()}")
{
+
compileOnly("org.apache.spark:spark-hive_${scalaVersion}:${libs.versions.spark35.get()}")
{
exclude group: 'org.apache.avro', module: 'avro'
exclude group: 'org.apache.arrow'
exclude group: 'org.apache.parquet'
@@ -254,7 +254,7 @@
project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersio
}
integrationImplementation
"org.scala-lang.modules:scala-collection-compat_${scalaVersion}:${libs.versions.scala.collection.compat.get()}"
- integrationImplementation
"org.apache.spark:spark-hive_${scalaVersion}:${libs.versions.spark.hive35.get()}"
+ integrationImplementation
"org.apache.spark:spark-hive_${scalaVersion}:${libs.versions.spark35.get()}"
integrationImplementation libs.junit.vintage.engine
integrationImplementation libs.junit.jupiter
integrationImplementation libs.slf4j.simple
