Add JDK 21 support for spark40 test and javadoc tasks

Signed-off-by: Sotaro Hikita <bering1814@gmail.com>

Author: lawofcycles

.github/workflows/build_spark_40.yml

@@ -43,6 +43,16 @@ jobs:
       - name: 'Setup: Java 17 env'
         run: echo "JAVA17_HOME=$JAVA_HOME" >> $GITHUB_ENV
 
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+          cache: 'gradle'
+
+      - name: 'Setup: Java 21 env'
+        run: echo "JAVA21_HOME=$JAVA_HOME" >> $GITHUB_ENV
+
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 

spark/core/build.gradle

@@ -128,7 +128,7 @@ sparkVariants {
                 dependsOn compileScala
                 source(generatedJavaDirectory)
                 if (variant.name.contains('spark40')) {
-                    executable = new File(System.getenv('JAVA17_HOME') ?: project.ext.runtimeJavaHome.toString(), 'bin/javadoc').absolutePath
+                    executable = new File(System.getenv('JAVA21_HOME') ?: System.getenv('JAVA17_HOME') ?: project.ext.runtimeJavaHome.toString(), 'bin/javadoc').absolutePath
                     options.addStringOption('Xdoclint:none', '-quiet')
                     failOnError = false
                 }
@@ -170,7 +170,7 @@ if (JavaVersion.current() >= JavaVersion.VERSION_17) {
 // Spark 4.0 requires JDK 17+, override the runtime for spark40 test tasks
 tasks.withType(Test) { Test task ->
     if (task.name.contains("Spark40") || task.name.contains("spark40")) {
-        task.executable = new File(System.getenv('JAVA17_HOME') ?: project.ext.runtimeJavaHome.toString(), 'bin/java').absolutePath
+        task.executable = new File(System.getenv('JAVA21_HOME') ?: System.getenv('JAVA17_HOME') ?: project.ext.runtimeJavaHome.toString(), 'bin/java').absolutePath
         task.jvmArgs "--add-opens=java.base/java.io=ALL-UNNAMED"
         task.jvmArgs "--add-opens=java.base/java.nio=ALL-UNNAMED"
         task.jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED"

spark/sql-40/build.gradle

@@ -162,7 +162,7 @@ sparkVariants {
             dependsOn compileScala
             source(generatedJavaDirectory)
             // Spark 4.0 jars are compiled with JDK 17, so javadoc must also run on JDK 17+
-            executable = new File(System.getenv('JAVA17_HOME') ?: project.ext.runtimeJavaHome.toString(), 'bin/javadoc').absolutePath
+            executable = new File(System.getenv('JAVA21_HOME') ?: System.getenv('JAVA17_HOME') ?: project.ext.runtimeJavaHome.toString(), 'bin/javadoc').absolutePath
             options.addStringOption('Xdoclint:none', '-quiet')
             failOnError = false
         }
@@ -175,7 +175,7 @@ sparkVariants {
 
 // Spark 4.0 requires JDK 17+, override the runtime for all test tasks
 tasks.withType(Test) { Test task ->
-    task.executable = new File(System.getenv('JAVA17_HOME') ?: project.ext.runtimeJavaHome.toString(), 'bin/java').absolutePath
+    task.executable = new File(System.getenv('JAVA21_HOME') ?: System.getenv('JAVA17_HOME') ?: project.ext.runtimeJavaHome.toString(), 'bin/java').absolutePath
     task.jvmArgs "--add-opens=java.base/java.io=ALL-UNNAMED"
     task.jvmArgs "--add-opens=java.base/java.nio=ALL-UNNAMED"
     task.jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED"