Skip to content

[AMORO-3875] Support to build on Spark Scala-2.13 #3878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 7, 2025
Merged

[AMORO-3875] Support to build on Spark Scala-2.13 #3878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5e17784
scala binary version
turboFei Nov 3, 2025
5029236
nit
turboFei Nov 4, 2025
447dc53
nit
turboFei Nov 4, 2025
457dfb2
save
turboFei Nov 6, 2025
e07385a
Merge branch 'master' into scala_213
turboFei Nov 6, 2025
4a3ab06
revert ci change
turboFei Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion amoro-ams/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@
<!-- runtime dependencies -->
<dependency>
<groupId>org.apache.amoro</groupId>
<artifactId>amoro-format-mixed-spark-${spark.major.version}</artifactId>
<artifactId>amoro-format-mixed-spark-${spark.major.version}_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-iceberg-bridge/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-hadoop-compatibility_${scala.binary.version}</artifactId>
<artifactId>flink-hadoop-compatibility_${flink.scala.binary.version}</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>
Expand Down Expand Up @@ -170,7 +170,7 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<artifactId>flink-table-planner_${flink.scala.binary.version}</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
<exclusions>
Expand Down Expand Up @@ -304,7 +304,7 @@
<!-- for values test connector -->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<artifactId>flink-table-planner_${flink.scala.binary.version}</artifactId>
<version>${flink.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
6 changes: 3 additions & 3 deletions amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-hadoop-compatibility_${scala.binary.version}</artifactId>
<artifactId>flink-hadoop-compatibility_${flink.scala.binary.version}</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>
Expand Down Expand Up @@ -197,7 +197,7 @@

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<artifactId>flink-table-planner_${flink.scala.binary.version}</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
<exclusions>
Expand Down Expand Up @@ -365,7 +365,7 @@
<!-- for values test connector -->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<artifactId>flink-table-planner_${flink.scala.binary.version}</artifactId>
<version>${flink.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
4 changes: 2 additions & 2 deletions amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.amoro</groupId>
<artifactId>amoro-mixed-spark</artifactId>
<artifactId>amoro-mixed-spark_${scala.binary.version}</artifactId>
<version>0.9-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>amoro-format-mixed-spark-3-common</artifactId>
<artifactId>amoro-format-mixed-spark-3-common_${scala.binary.version}</artifactId>
<packaging>jar</packaging>
<name>Amoro Project Mixed Format Spark 3 Common</name>
<url>https://amoro.apache.org</url>
Expand Down
2 changes: 1 addition & 1 deletion ...o-mixed-spark-3-common/src/test/java/org/apache/amoro/spark/test/utils/ScalaTestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
public class ScalaTestUtil {

public static <T> Seq<T> seq(List<T> values) {
return JavaConverters.asScalaBufferConverter(values).asScala().seq();
return JavaConverters.asScalaBuffer(values).toSeq();
}
}
2 changes: 1 addition & 1 deletion amoro-format-mixed/amoro-mixed-spark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<version>0.9-SNAPSHOT</version>
</parent>

<artifactId>amoro-mixed-spark</artifactId>
<artifactId>amoro-mixed-spark_${scala.binary.version}</artifactId>
<packaging>pom</packaging>
<name>Amoro Project Mixed Format Spark Parent</name>
<url>https://amoro.apache.org</url>
Expand Down
43 changes: 38 additions & 5 deletions amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.amoro</groupId>
<artifactId>amoro-mixed-spark</artifactId>
<artifactId>amoro-mixed-spark_${scala.binary.version}</artifactId>
<version>0.9-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>amoro-format-mixed-spark-3.3</artifactId>
<artifactId>amoro-format-mixed-spark-3.3_${scala.binary.version}</artifactId>
<packaging>jar</packaging>
<name>Amoro Project Mixed Format Spark 3.3</name>
<url>https://amoro.apache.org</url>
Expand Down Expand Up @@ -229,7 +229,7 @@

<dependency>
<groupId>org.apache.amoro</groupId>
<artifactId>amoro-format-mixed-spark-3-common</artifactId>
<artifactId>amoro-format-mixed-spark-3-common_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down Expand Up @@ -261,10 +261,24 @@
</exclusions>
</dependency>

<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
<version>${scala.version}</version>
<scope>provided</scope>
</dependency>

<!-- test dependencies -->
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-spark-3.3</artifactId>
<artifactId>paimon-spark-${spark.major.version}</artifactId>
<version>${paimon.version}</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -361,7 +375,7 @@
</dependency>
<dependency>
<groupId>org.apache.amoro</groupId>
<artifactId>amoro-format-mixed-spark-3-common</artifactId>
<artifactId>amoro-format-mixed-spark-3-common_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down Expand Up @@ -470,4 +484,23 @@
<sourceDirectory>src/main/java</sourceDirectory>
</build>

<profiles>
<profile>
<id>scala-2.13</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<!-- TODO: remove it after paimon-spark on scala-2.13 released -->
<exclude>**/TestUnifiedCatalog.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
210 changes: 0 additions & 210 deletions ...oro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/SparkInternalRowCastWrapper.java
View file
Open in desktop

This file was deleted.

Loading
Loading