This is an automated email from the ASF dual-hosted git repository.
xuba pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git
The following commit(s) were added to refs/heads/master by this push:
new fd44c44ce [AMORO-3851][FOLLOWUP] Fix and simplify spark versions
management (#3874)
fd44c44ce is described below
commit fd44c44ce5b4f435ba01159eed3e173ef703f379
Author: Fei Wang <[email protected]>
AuthorDate: Sun Nov 2 21:44:00 2025 -0800
[AMORO-3851][FOLLOWUP] Fix and simplify spark versions management (#3874)
* Fix iceberg-spark artifactId in amoro-mixed-spark-3-common
* fix ut conflicts
---
.../amoro-mixed-spark/amoro-mixed-spark-3-common/pom.xml | 2 +-
amoro-format-paimon/pom.xml | 8 +++++++-
amoro-optimizer/amoro-optimizer-spark/pom.xml | 13 ++++---------
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git
a/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/pom.xml
b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/pom.xml
index b8b0616a2..51ca0b82d 100644
--- a/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/pom.xml
+++ b/amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/pom.xml
@@ -140,7 +140,7 @@
<dependency>
<groupId>org.apache.iceberg</groupId>
- <artifactId>iceberg-spark-3.3_${scala.binary.version}</artifactId>
+
<artifactId>iceberg-spark-${spark.major.version}_${scala.binary.version}</artifactId>
<version>${iceberg.version}</version>
<scope>provided</scope>
<exclusions>
diff --git a/amoro-format-paimon/pom.xml b/amoro-format-paimon/pom.xml
index 038870a7c..e414e7b99 100644
--- a/amoro-format-paimon/pom.xml
+++ b/amoro-format-paimon/pom.xml
@@ -68,8 +68,14 @@
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_${scala.binary.version}</artifactId>
- <version>3.3.4</version>
+ <version>${spark.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/amoro-optimizer/amoro-optimizer-spark/pom.xml
b/amoro-optimizer/amoro-optimizer-spark/pom.xml
index 48ab083a2..b998f80e6 100644
--- a/amoro-optimizer/amoro-optimizer-spark/pom.xml
+++ b/amoro-optimizer/amoro-optimizer-spark/pom.xml
@@ -32,11 +32,6 @@
<name>Amoro Project AMS Spark Optimizer</name>
<url>https://amoro.apache.org</url>
- <properties>
- <spark-optimizer.spark-version>3.3.3</spark-optimizer.spark-version>
- <spark-optimizer.scala-version>2.12</spark-optimizer.scala-version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.amoro</groupId>
@@ -47,8 +42,8 @@
<!-- spark dependencies begin -->
<dependency>
<groupId>org.apache.spark</groupId>
-
<artifactId>spark-core_${spark-optimizer.scala-version}</artifactId>
- <version>${spark-optimizer.spark-version}</version>
+ <artifactId>spark-core_${scala.binary.version}</artifactId>
+ <version>${spark.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -60,8 +55,8 @@
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-sql_${spark-optimizer.scala-version}</artifactId>
- <version>${spark-optimizer.spark-version}</version>
+ <artifactId>spark-sql_${scala.binary.version}</artifactId>
+ <version>${spark.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
