From 5ce8c3d602fa963430aa75c2a186bbeb0e070e70 Mon Sep 17 00:00:00 2001
From: Parth Chandra <parthc@apache.org>
Date: Wed, 1 Oct 2025 15:45:53 -0700
Subject: [PATCH 1/2] build: Add Spark 4.0 to release build script

---
 dev/release/build-release-comet.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dev/release/build-release-comet.sh b/dev/release/build-release-comet.sh
index e8339213eb..91d02885af 100755
--- a/dev/release/build-release-comet.sh
+++ b/dev/release/build-release-comet.sh
@@ -79,6 +79,14 @@ done
 
 echo "Building binaries from $REPO/$BRANCH"
 
+# Check Java version
+JAVA_VERSION=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}' | awk -F '.' '{print $1}')
+if [ "$JAVA_VERSION" -lt 17 ]; then
+  echo "Error: Java version must be at least 17. Current version: $(java -version 2>&1 | head -n 1)"
+  exit 1
+fi
+echo "Java version check passed: $JAVA_VERSION"
+
 WORKING_DIR="$SCRIPT_DIR/comet-rm/workdir"
 cp $SCRIPT_DIR/../cargo.config $WORKING_DIR
 
@@ -194,6 +202,7 @@ LOCAL_REPO=$(mktemp -d /tmp/comet-staging-repo-XXXXX)
 ./mvnw  "-Dmaven.repo.local=${LOCAL_REPO}" -P spark-3.4 -P scala-2.13  -DskipTests install
 ./mvnw  "-Dmaven.repo.local=${LOCAL_REPO}" -P spark-3.5 -P scala-2.12  -DskipTests install
 ./mvnw  "-Dmaven.repo.local=${LOCAL_REPO}" -P spark-3.5 -P scala-2.13  -DskipTests install
+./mvnw  "-Dmaven.repo.local=${LOCAL_REPO}" -P spark-4.0 -P scala-2.13  -DskipTests install
 
 echo "Installed to local repo: ${LOCAL_REPO}"
 

From f347a53837774bb5623b6f2485293a78005d3a76 Mon Sep 17 00:00:00 2001
From: Parth Chandra <parthc@apache.org>
Date: Thu, 2 Oct 2025 11:08:00 -0700
Subject: [PATCH 2/2] explicitly set jdk version for spark 3.4, 3,5

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 90e09900d0..ddcac283d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -599,6 +599,9 @@ under the License.
         <parquet.version>1.13.1</parquet.version>
         <slf4j.version>2.0.6</slf4j.version>
         <shims.minorVerSrc>spark-3.4</shims.minorVerSrc>
+        <java.version>11</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
       </properties>
     </profile>
 
@@ -611,6 +614,9 @@ under the License.
         <parquet.version>1.13.1</parquet.version>
         <slf4j.version>2.0.7</slf4j.version>
         <shims.minorVerSrc>spark-3.5</shims.minorVerSrc>
+        <java.version>11</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
       </properties>
     </profile>