This is an automated email from the ASF dual-hosted git repository.
hongze pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new f0336c0cb0 [CORE] Bump iceberg version of spark 3.3 to 1.5.0 (#8418)
f0336c0cb0 is described below
commit f0336c0cb0acbde727f86e723d0d007880c3b513
Author: Jinhai （陈锦海） <[email protected]>
AuthorDate: Thu Jan 23 19:57:25 2025 +0800
[CORE] Bump iceberg version of spark 3.3 to 1.5.0 (#8418)
---
backends-clickhouse/pom.xml | 8 +++-----
backends-velox/pom.xml | 12 +++++-------
gluten-iceberg/pom.xml | 12 +++++-------
pom.xml | 9 +++++++--
4 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/backends-clickhouse/pom.xml b/backends-clickhouse/pom.xml
index 6ca945d8cc..52c88354a1 100644
--- a/backends-clickhouse/pom.xml
+++ b/backends-clickhouse/pom.xml
@@ -56,15 +56,13 @@
</dependency>
<dependency>
<groupId>org.apache.iceberg</groupId>
-
<artifactId>iceberg-spark-${sparkbundle.version}_${scala.binary.version}</artifactId>
+
<artifactId>iceberg-spark-runtime-${sparkbundle.version}_${scala.binary.version}</artifactId>
<version>${iceberg.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.iceberg</groupId>
-
<artifactId>iceberg-spark-runtime-${sparkbundle.version}_${scala.binary.version}</artifactId>
- <version>${iceberg.version}</version>
- <scope>test</scope>
+ <groupId>org.scala-lang.modules</groupId>
+
<artifactId>scala-collection-compat_${scala.binary.version}</artifactId>
</dependency>
</dependencies>
</profile>
diff --git a/backends-velox/pom.xml b/backends-velox/pom.xml
index 5c96fa6246..f458c1a083 100755
--- a/backends-velox/pom.xml
+++ b/backends-velox/pom.xml
@@ -94,17 +94,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.iceberg</groupId>
-
<artifactId>iceberg-spark-${sparkbundle.version}_${scala.binary.version}</artifactId>
- <version>${iceberg.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-spark-runtime-${sparkbundle.version}_${scala.binary.version}</artifactId>
<version>${iceberg.version}</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
</profile>
@@ -214,6 +208,10 @@
<version>${scala.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-collection-compat_${scala.binary.version}</artifactId>
+ </dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
diff --git a/gluten-iceberg/pom.xml b/gluten-iceberg/pom.xml
index b2bf5f9ebe..6ec9eae547 100644
--- a/gluten-iceberg/pom.xml
+++ b/gluten-iceberg/pom.xml
@@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>org.apache.iceberg</groupId>
-
<artifactId>iceberg-spark-${sparkbundle.version}_${scala.binary.version}</artifactId>
+
<artifactId>iceberg-spark-runtime-${sparkbundle.version}_${scala.binary.version}</artifactId>
<version>${iceberg.version}</version>
<scope>provided</scope>
</dependency>
@@ -46,6 +46,10 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang.modules</groupId>
+
<artifactId>scala-collection-compat_${scala.binary.version}</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_${scala.binary.version}</artifactId>
@@ -67,12 +71,6 @@
<version>${spark.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.iceberg</groupId>
-
<artifactId>iceberg-spark-runtime-${sparkbundle.version}_${scala.binary.version}</artifactId>
- <version>${iceberg.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
diff --git a/pom.xml b/pom.xml
index d103d25dc5..4000197a2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -308,8 +308,7 @@
<sparkbundle.version>3.3</sparkbundle.version>
<sparkshim.artifactId>spark-sql-columnar-shims-spark33</sparkshim.artifactId>
<spark.version>3.3.1</spark.version>
- <!-- keep using iceberg v1.3.1 for parquet compatibilty. -->
- <iceberg.version>1.3.1</iceberg.version>
+ <iceberg.version>1.5.0</iceberg.version>
<delta.package.name>delta-core</delta.package.name>
<delta.version>2.3.0</delta.version>
<delta.binary.version>23</delta.binary.version>
@@ -1273,6 +1272,12 @@
<version>${fasterxml.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang.modules</groupId>
+
<artifactId>scala-collection-compat_${scala.binary.version}</artifactId>
+ <version>2.11.0</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
