Spark 3.5.1 has been released, bump snapshot versions and pom.xml (#233)

* Spark 3.5.1 has been released, bump snapshot versions and pom.xml * Add 3.5.1 to testing * Update snapshots * Remove Scala 2.12 for Spark 4 snapshot
G-Research · Mar 20, 2024 · c31a58e · c31a58e
1 parent 77e8275
commit c31a58e
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 23 deletions.
diff --git a/.github/actions/test-jvm/action.yml b/.github/actions/test-jvm/action.yml
@@ -74,7 +74,7 @@ runs:
   - name: Scala and Java Tests
     env:
       JDK_JAVA_OPTIONS: --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-exports java.base/sun.util.calendar=ALL-UNNAMED
-    run: mvn --batch-mode -Dspotless.check.skip test
+    run: mvn --batch-mode --update-snapshots -Dspotless.check.skip test
     shell: bash
 
   - name: Diff App test

diff --git a/.github/actions/test-python/action.yml b/.github/actions/test-python/action.yml
@@ -102,7 +102,7 @@ runs:
     shell: bash
 
   - name: Install Spark Extension
-    run: mvn --batch-mode install -Dspotless.check.skip -DskipTests -Dmaven.test.skip=true -Dgpg.skip
+    run: mvn --batch-mode --update-snapshots install -Dspotless.check.skip -DskipTests -Dmaven.test.skip=true -Dgpg.skip
     shell: bash
 
   - name: Python Integration Tests

diff --git a/.github/workflows/build-jvm.yml b/.github/workflows/build-jvm.yml
@@ -35,7 +35,7 @@ jobs:
           - spark-compat-version: '3.5'
             scala-compat-version: '2.12'
             scala-version: '2.12.18'
-            spark-version: '3.5.0'
+            spark-version: '3.5.1'
 
           - spark-compat-version: '3.2'
             spark-version: '3.2.4'
@@ -52,7 +52,7 @@ jobs:
           - spark-compat-version: '3.5'
             scala-compat-version: '2.13'
             scala-version: '2.13.8'
-            spark-version: '3.5.0'
+            spark-version: '3.5.1'
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml
@@ -34,7 +34,7 @@ jobs:
             scala-compat-version: '2.12'
             scala-version: '2.12.17'
           - spark-compat-version: '3.5'
-            spark-version: '3.5.0'
+            spark-version: '3.5.1'
             scala-compat-version: '2.12'
             scala-version: '2.12.18'
 

diff --git a/.github/workflows/build-snapshots.yml b/.github/workflows/build-snapshots.yml
@@ -28,12 +28,7 @@ jobs:
             scala-version: '2.12.17'
             java-compat-version: '8'
           - spark-compat-version: '3.5'
-            spark-version: '3.5.1-SNAPSHOT'
-            scala-compat-version: '2.12'
-            scala-version: '2.12.18'
-            java-compat-version: '8'
-          - spark-compat-version: '4.0'
-            spark-version: '4.0.0-SNAPSHOT'
+            spark-version: '3.5.2-SNAPSHOT'
             scala-compat-version: '2.12'
             scala-version: '2.12.18'
             java-compat-version: '8'
@@ -54,7 +49,7 @@ jobs:
             scala-version: '2.13.8'
             java-compat-version: '8'
           - spark-compat-version: '3.5'
-            spark-version: '3.5.1-SNAPSHOT'
+            spark-version: '3.5.2-SNAPSHOT'
             scala-compat-version: '2.13'
             scala-version: '2.13.8'
             java-compat-version: '8'

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -30,13 +30,13 @@ jobs:
       - name: Check
         id: check
         run: |
-          mvn --batch-mode spotless:check
+          mvn --batch-mode --update-snapshots spotless:check
         shell: bash
 
       - name: Changes
         if: failure() && steps.check.outcome == 'failure'
         run: |
-          mvn --batch-mode spotless:apply
+          mvn --batch-mode --update-snapshots spotless:apply
           git diff
         shell: bash
 

diff --git a/.github/workflows/test-jvm.yml b/.github/workflows/test-jvm.yml
@@ -69,6 +69,11 @@ jobs:
             scala-version: '2.12.18'
             spark-patch-version: '0'
             hadoop-version: '3'
+          - spark-compat-version: '3.5'
+            scala-compat-version: '2.12'
+            scala-version: '2.12.18'
+            spark-patch-version: '1'
+            hadoop-version: '3'
 
           - spark-compat-version: '3.2'
             scala-compat-version: '2.13'
@@ -108,6 +113,11 @@ jobs:
             scala-version: '2.13.8'
             spark-patch-version: '0'
             hadoop-version: '3'
+          - spark-compat-version: '3.5'
+            scala-compat-version: '2.13'
+            scala-version: '2.13.8'
+            spark-patch-version: '1'
+            hadoop-version: '3'
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml
@@ -40,7 +40,7 @@ jobs:
             scala-compat-version: '2.12'
             scala-version: '2.12.17'
           - spark-compat-version: '3.5'
-            spark-version: '3.5.0'
+            spark-version: '3.5.1'
             scala-compat-version: '2.12'
             scala-version: '2.12.18'
 

diff --git a/.github/workflows/test-snapshots.yml b/.github/workflows/test-snapshots.yml
@@ -28,15 +28,10 @@ jobs:
             scala-version: '2.12.17'
             java-compat-version: '8'
           - spark-compat-version: '3.5'
-            spark-version: '3.5.1-SNAPSHOT'
+            spark-version: '3.5.2-SNAPSHOT'
             scala-compat-version: '2.12'
             scala-version: '2.12.17'
             java-compat-version: '8'
-          - spark-compat-version: '4.0'
-            spark-version: '4.0.0-SNAPSHOT'
-            scala-compat-version: '2.12'
-            scala-version: '2.12.18'
-            java-compat-version: '8'
 
           - spark-compat-version: '3.2'
             spark-version: '3.2.5-SNAPSHOT'
@@ -54,7 +49,7 @@ jobs:
             scala-version: '2.13.8'
             java-compat-version: '8'
           - spark-compat-version: '3.5'
-            spark-version: '3.5.1-SNAPSHOT'
+            spark-version: '3.5.2-SNAPSHOT'
             scala-compat-version: '2.13'
             scala-version: '2.13.8'
             java-compat-version: '8'

diff --git a/pom.xml b/pom.xml
@@ -46,7 +46,7 @@
     <!-- keep in-sync with python/requirements-3.3_2.13.txt -->
     <spark.major.version>3</spark.major.version>
     <spark.minor.version>5</spark.minor.version>
-    <spark.patch.version>0</spark.patch.version>
+    <spark.patch.version>1</spark.patch.version>
     <spark.compat.version>${spark.major.version}.${spark.minor.version}</spark.compat.version>
     <spark.version>${spark.compat.version}.${spark.patch.version}</spark.version>
   </properties>