Skip to content

Commit 526110d

Browse files
committed
[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 a910169 [Cheng Pan] Bump Spark 4.0.0 Authored-by: Cheng Pan <[email protected]> Signed-off-by: Cheng Pan <[email protected]>
1 parent 873503e commit 526110d

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

.github/workflows/license.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ jobs:
4141
distribution: temurin
4242
java-version: 8
4343
cache: 'maven'
44-
- run: >-
45-
build/mvn org.apache.rat:apache-rat-plugin:check
46-
-Ptpcds -Pkubernetes-it
47-
-Pspark-3.3 -Pspark-3.4 -Pspark-3.5
44+
- run: |
45+
build/mvn org.apache.rat:apache-rat-plugin:check \
46+
-Ptpcds -Pkubernetes-it \
47+
-Pspark-3.3 -Pspark-3.4 -Pspark-3.5 -Pspark-4.0
4848
- name: Upload rat report
4949
if: failure()
5050
uses: actions/upload-artifact@v4

.github/workflows/master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
comment: 'verify-on-spark-3.4-binary'
7878
- java: 17
7979
spark: '3.5'
80-
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'
80+
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'
8181
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'
8282
comment: 'verify-on-spark-4.0-binary'
8383
env:

pom.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2064,18 +2064,19 @@
20642064
<module>extensions/spark/kyuubi-spark-connector-hive</module>
20652065
</modules>
20662066
<properties>
2067-
<spark.version>4.0.0-preview2</spark.version>
2067+
<spark.version>4.0.0</spark.version>
20682068
<spark.binary.version>4.0</spark.binary.version>
20692069
<antlr4.version>4.13.1</antlr4.version>
2070-
<!-- TODO: update once Delta support Spark 4.0.0-preview2 -->
2070+
<!-- TODO: update once Delta support Spark 4.0 -->
20712071
<delta.version>4.0.0rc1</delta.version>
20722072
<delta.artifact>delta-spark_${scala.binary.version}</delta.artifact>
20732073
<!-- TODO: update once Hudi support Spark 4.0 -->
20742074
<hudi.artifact>hudi-spark3.5-bundle_${scala.binary.version}</hudi.artifact>
20752075
<!-- TODO: update once Iceberg support Spark 4.0 -->
20762076
<iceberg.artifact>iceberg-spark-runtime-3.5_${scala.binary.version}</iceberg.artifact>
2077-
<!-- TODO: update once Paimon support Spark 4.0 -->
2078-
<paimon.artifact>paimon-spark-3.5</paimon.artifact>
2077+
<!-- TODO: update once Paimon support Spark 4.0.
2078+
paimon-spark-3.5 contains Scala 2.12 classes cause conflicts with Scala 2.13 -->
2079+
<paimon.artifact>paimon-common</paimon.artifact>
20792080
<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>
20802081
<spark.archive.name>spark-${spark.version}-bin-hadoop3.tgz</spark.archive.name>
20812082
</properties>

0 commit comments

Comments
 (0)