Remove deprecated Spark versions, and update JDK version for build

apache · jiangzho · Apr 1, 2024 · Apr 4, 2024 · Apr 4, 2024 · Apr 5, 2024
commit d0db806b2898730dc2da069dbe7f7599656bfc9a
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: [ 11, 17 ]
+        java-version: [ 11, 17, 21 ]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3

diff --git a/e2e-tests/spark-apps/spark_3_4_1/pyspark-example.yaml b/e2e-tests/spark-apps/spark_3_4_1/pyspark-example.yaml
diff --git a/e2e-tests/spark-apps/spark_3_4_1/spark-pi_scala_2.12.yaml b/e2e-tests/spark-apps/spark_3_4_1/spark-pi_scala_2.12.yaml
diff --git a/e2e-tests/spark-apps/spark_3_4_1/sparkr-example.yaml b/e2e-tests/spark-apps/spark_3_4_1/sparkr-example.yaml
diff --git a/e2e-tests/spark-apps/spark_3_5_0/pyspark-example.yaml b/e2e-tests/spark-apps/spark_3_5_0/pyspark-example.yaml
diff --git a/e2e-tests/spark-apps/spark_3_5_0/spark-pi_scala_2.12.yaml b/e2e-tests/spark-apps/spark_3_5_0/spark-pi_scala_2.12.yaml
diff --git a/e2e-tests/spark-apps/spark_3_5_0/sparkr-example.yaml b/e2e-tests/spark-apps/spark_3_5_0/sparkr-example.yaml
diff --git a/spark-operator-api/src/main/java/org/apache/spark/kubernetes/operator/spec/JDKVersion.java b/spark-operator-api/src/main/java/org/apache/spark/kubernetes/operator/spec/JDKVersion.java
@@ -21,5 +21,5 @@
 public enum JDKVersion {
   Java11,
   Java17,
-  Java23
+  Java21
 }
diff --git a/spark-operator-api/src/main/java/org/apache/spark/kubernetes/operator/spec/SparkVersion.java b/spark-operator-api/src/main/java/org/apache/spark/kubernetes/operator/spec/SparkVersion.java
@@ -24,7 +24,5 @@
  */
 public enum SparkVersion {
   v3_5_1,
-  v3_5_0,
-  v3_4_2,
-  v3_4_1,
+  v3_4_2
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,5 +21,5 @@ @@
     public enum JDKVersion {
       Java11,
       Java17,
-      Java23
+      Java21
     }