This is an automated email from the ASF dual-hosted git repository.
jinsongzhou 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 d73496e7d [AMORO-3851][FOLLOWUP] Using scala.binary.version for Spark
dependency artifactId (#3861)
d73496e7d is described below
commit d73496e7deff7b4fea96585f21a21af4363bb971
Author: Fei Wang <[email protected]>
AuthorDate: Sun Nov 2 19:53:37 2025 -0800
[AMORO-3851][FOLLOWUP] Using scala.binary.version for Spark dependency
artifactId (#3861)
Using scala.binary.version for dependency artifactId
---
amoro-ams/pom.xml | 6 +++---
.../amoro-mixed-spark/amoro-mixed-spark-3-common/pom.xml | 9 +++------
.../amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/pom.xml | 11 +++++------
.../amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/pom.xml | 11 +++++------
amoro-format-paimon/pom.xml | 2 +-
pom.xml | 1 +
6 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/amoro-ams/pom.xml b/amoro-ams/pom.xml
index 58546041b..51aaac70f 100644
--- a/amoro-ams/pom.xml
+++ b/amoro-ams/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-core_2.12</artifactId>
+ <artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<exclusions>
<exclusion>
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-sql_2.12</artifactId>
+ <artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<exclusions>
<exclusion>
@@ -156,7 +156,7 @@
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-hive_2.12</artifactId>
+ <artifactId>spark-hive_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<exclusions>
<exclusion>
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 d9ad9cc68..b8b0616a2 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
@@ -32,9 +32,6 @@
<name>Amoro Project Mixed Format Spark 3 Common</name>
<url>https://amoro.apache.org</url>
- <properties>
- <scala.version>2.12.15</scala.version>
- </properties>
<dependencies>
<dependency>
@@ -51,7 +48,7 @@
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-sql_2.12</artifactId>
+ <artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
<exclusions>
@@ -106,7 +103,7 @@
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-core_2.12</artifactId>
+ <artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
<exclusions>
@@ -143,7 +140,7 @@
<dependency>
<groupId>org.apache.iceberg</groupId>
- <artifactId>iceberg-spark-3.3_2.12</artifactId>
+ <artifactId>iceberg-spark-3.3_${scala.binary.version}</artifactId>
<version>${iceberg.version}</version>
<scope>provided</scope>
<exclusions>
diff --git
a/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/pom.xml
b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/pom.xml
index 8a508f89b..41a96e48f 100644
--- a/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/pom.xml
+++ b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/pom.xml
@@ -35,7 +35,6 @@
<properties>
<hive.version>2.3.9</hive.version>
- <scala.version>2.12.15</scala.version>
<scala.collection.compat>2.11.0</scala.collection.compat>
</properties>
@@ -48,7 +47,7 @@
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-sql_2.12</artifactId>
+ <artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
<exclusions>
@@ -109,7 +108,7 @@
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-core_2.12</artifactId>
+ <artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
<exclusions>
@@ -146,7 +145,7 @@
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-hive_2.12</artifactId>
+ <artifactId>spark-hive_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
<exclusions>
@@ -238,7 +237,7 @@
<dependency>
<groupId>org.apache.iceberg</groupId>
- <artifactId>iceberg-spark-3.3_2.12</artifactId>
+ <artifactId>iceberg-spark-3.3_${scala.binary.version}</artifactId>
<version>${iceberg.version}</version>
<exclusions>
<exclusion>
@@ -254,7 +253,7 @@
<dependency>
<groupId>org.apache.iceberg</groupId>
- <artifactId>iceberg-spark-extensions-3.3_2.12</artifactId>
+
<artifactId>iceberg-spark-extensions-3.3_${scala.binary.version}</artifactId>
<version>${iceberg.version}</version>
<exclusions>
<exclusion>
diff --git
a/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/pom.xml
b/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/pom.xml
index c482a9c47..fc052da5e 100644
--- a/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/pom.xml
+++ b/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/pom.xml
@@ -35,7 +35,6 @@
<properties>
<hive.version>2.3.9</hive.version>
- <scala.version>2.12.15</scala.version>
<scala.collection.compat>2.11.0</scala.collection.compat>
</properties>
@@ -48,7 +47,7 @@
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-sql_2.12</artifactId>
+ <artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
<exclusions>
@@ -109,7 +108,7 @@
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-core_2.12</artifactId>
+ <artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
<exclusions>
@@ -150,7 +149,7 @@
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-hive_2.12</artifactId>
+ <artifactId>spark-hive_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
<exclusions>
@@ -242,7 +241,7 @@
<dependency>
<groupId>org.apache.iceberg</groupId>
- <artifactId>iceberg-spark-3.5_2.12</artifactId>
+ <artifactId>iceberg-spark-3.5_${scala.binary.version}</artifactId>
<version>${iceberg.version}</version>
<exclusions>
<exclusion>
@@ -258,7 +257,7 @@
<dependency>
<groupId>org.apache.iceberg</groupId>
- <artifactId>iceberg-spark-extensions-3.5_2.12</artifactId>
+
<artifactId>iceberg-spark-extensions-3.5_${scala.binary.version}</artifactId>
<version>${iceberg.version}</version>
<exclusions>
<exclusion>
diff --git a/amoro-format-paimon/pom.xml b/amoro-format-paimon/pom.xml
index e2388d623..038870a7c 100644
--- a/amoro-format-paimon/pom.xml
+++ b/amoro-format-paimon/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-sql_2.12</artifactId>
+ <artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>3.3.4</version>
<scope>provided</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index 36bc38357..e4e3e3d02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,6 +108,7 @@
<hive.version>3.1.3</hive.version>
<hadoop.version>3.4.0</hadoop.version>
<kerby.version>2.0.3</kerby.version>
+ <scala.version>2.12.15</scala.version>
<scala.binary.version>2.12</scala.binary.version>
<args4j.version>2.33</args4j.version>
<slf4j.version>1.7.30</slf4j.version>
