From 41f2d9cf5330c715f0aa34cfa8ce3fd830c1e072 Mon Sep 17 00:00:00 2001
From: Yi Hu <yathu@google.com>
Date: Sat, 17 May 2025 16:56:17 -0400
Subject: [PATCH] Use default CI Java for Spark3 Java Version PreCommit

---
 .../workflows/beam_PreCommit_Java_Spark3_Versions.yml  |  7 -------
 runners/spark/3/build.gradle                           | 10 +++++-----
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/beam_PreCommit_Java_Spark3_Versions.yml b/.github/workflows/beam_PreCommit_Java_Spark3_Versions.yml
index 9211203f4fe1..f08d1bb3843f 100644
--- a/.github/workflows/beam_PreCommit_Java_Spark3_Versions.yml
+++ b/.github/workflows/beam_PreCommit_Java_Spark3_Versions.yml
@@ -87,19 +87,12 @@ jobs:
           github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
       - name: Setup environment
         uses: ./.github/actions/setup-environment-action
-        with:
-          java-version: |
-            8
-            11
-      # TODO(https://github.com/apache/beam/issues/32207) Run test with Java11
       - name: run sparkVersionsTest script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:
           gradle-command: :runners:spark:3:sparkVersionsTest
           arguments: |
             -PdisableSpotlessCheck=true \
-            -PtestJavaVersion=8 \
-            -Pjava8Home=$JAVA_HOME_8_X64 \
       - name: Archive JUnit Test Results
         uses: actions/upload-artifact@v4
         if: ${{ !success() }}
diff --git a/runners/spark/3/build.gradle b/runners/spark/3/build.gradle
index 1cea408d08fd..0282f6e4c27b 100644
--- a/runners/spark/3/build.gradle
+++ b/runners/spark/3/build.gradle
@@ -34,11 +34,11 @@ createJavaExamplesArchetypeValidationTask(type: 'Quickstart', runner: 'Spark')
 
 // Additional supported Spark versions (used in compatibility tests)
 def sparkVersions = [
-    "350": "3.5.5",
-    "341": "3.4.4",
-    "332": "3.3.4",
-    "324": "3.2.4",
-    "312": "3.1.3",
+    "35": "3.5.5",
+    "34": "3.4.4",
+    "33": "3.3.4",
+    "32": "3.2.4",
+    "31": "3.1.3",
 ]
 
 sparkVersions.each { kv ->