From cee5f1a19a39a9e65244ecf6e1c47a20c95cccbd Mon Sep 17 00:00:00 2001
From: Cheng Pan <chengpan@apache.org>
Date: Mon, 26 May 2025 12:23:22 +0800
Subject: [PATCH] [KYUUBI #6928] Bump Spark 4.0.0

### Why are the changes needed?

Test Spark 4.0.0 RC1
https://lists.apache.org/thread/3sx86qhnmot1p519lloyprxv9h7nt2xh

### How was this patch tested?

GHA.

### Was this patch authored or co-authored using generative AI tooling?

No

Closes #6928 from pan3793/spark-4.0.0.

Closes #6928

a910169bd [Cheng Pan] Bump Spark 4.0.0

Authored-by: Cheng Pan <chengpan@apache.org>
Signed-off-by: Cheng Pan <chengpan@apache.org>
---
 .github/workflows/license.yml | 8 ++++----
 .github/workflows/master.yml  | 2 +-
 pom.xml                       | 9 +++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml
index 52adbba7f..84db7cb01 100644
--- a/.github/workflows/license.yml
+++ b/.github/workflows/license.yml
@@ -41,10 +41,10 @@ jobs:
           distribution: temurin
           java-version: 8
           cache: 'maven'
-      - run: >-
-          build/mvn org.apache.rat:apache-rat-plugin:check
-          -Ptpcds -Pkubernetes-it
-          -Pspark-3.3 -Pspark-3.4 -Pspark-3.5
+      - run: |
+          build/mvn org.apache.rat:apache-rat-plugin:check \
+            -Ptpcds -Pkubernetes-it \
+            -Pspark-3.3 -Pspark-3.4 -Pspark-3.5 -Pspark-4.0
       - name: Upload rat report
         if: failure()
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 199790809..2d0c0bbb6 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -77,7 +77,7 @@ jobs:
             comment: 'verify-on-spark-3.4-binary'
           - java: 17
             spark: '3.5'
-            spark-archive: '-Pscala-2.13 -Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-4.0.0-preview2 -Dspark.archive.name=spark-4.0.0-preview2-bin-hadoop3.tgz'
+            spark-archive: '-Pscala-2.13 -Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-4.0.0 -Dspark.archive.name=spark-4.0.0-bin-hadoop3.tgz'
             exclude-tags: '-Dmaven.plugin.scalatest.exclude.tags=org.scalatest.tags.Slow,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest,org.apache.kyuubi.tags.PaimonTest,org.apache.kyuubi.tags.SparkLocalClusterTest'
             comment: 'verify-on-spark-4.0-binary'
     env:
diff --git a/pom.xml b/pom.xml
index 65106fdf9..0158f708a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2042,18 +2042,19 @@
                 <module>extensions/spark/kyuubi-spark-connector-hive</module>
             </modules>
             <properties>
-                <spark.version>4.0.0-preview2</spark.version>
+                <spark.version>4.0.0</spark.version>
                 <spark.binary.version>4.0</spark.binary.version>
                 <antlr4.version>4.13.1</antlr4.version>
-                <!-- TODO: update once Delta support Spark 4.0.0-preview2 -->
+                <!-- TODO: update once Delta support Spark 4.0 -->
                 <delta.version>4.0.0rc1</delta.version>
                 <delta.artifact>delta-spark_${scala.binary.version}</delta.artifact>
                 <!-- TODO: update once Hudi support Spark 4.0 -->
                 <hudi.artifact>hudi-spark3.5-bundle_${scala.binary.version}</hudi.artifact>
                 <!-- TODO: update once Iceberg support Spark 4.0 -->
                 <iceberg.artifact>iceberg-spark-runtime-3.5_${scala.binary.version}</iceberg.artifact>
-                <!-- TODO: update once Paimon support Spark 4.0 -->
-                <paimon.artifact>paimon-spark-3.5</paimon.artifact>
+                <!-- TODO: update once Paimon support Spark 4.0.
+                           paimon-spark-3.5 contains Scala 2.12 classes cause conflicts with Scala 2.13 -->
+                <paimon.artifact>paimon-common</paimon.artifact>
                 <maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest,org.apache.kyuubi.tags.PaimonTest,org.apache.kyuubi.tags.HudiTest</maven.plugin.scalatest.exclude.tags>
                 <spark.archive.name>spark-${spark.version}-bin-hadoop3.tgz</spark.archive.name>
             </properties>