#483: Spark 4+Java17 compatibility (Agent)

.github/workflows/build.yml

@@ -24,8 +24,27 @@ on:
 
 jobs:
   test-agent-reader-and-model:
-    name: Test Agent, Reader and Model
+    name: ${{ matrix.name }}
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Test Agent, Reader and Model (Spark 3, Java 8)
+            java-version: '8'
+            test-command: testAllStandard
+            doc-command: doc
+
+          - name: Test Agent, Reader and Model (Spark 3, Java 11)
+            java-version: '11'
+            test-command: testReaderModelSpark3
+            doc-command: docReaderModelSpark3
+
+          - name: Test Agent, Reader and Model (Spark 4, Java 17)
+            java-version: '17'
+            test-command: testReaderModelSpark4
+            doc-command: docReaderModelSpark4
+
     steps:
       - name: Checkout code
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
@@ -34,16 +53,17 @@ jobs:
           persist-credentials: false
       - uses: coursier/cache-action@95e5b1029b6b86e7bac033ee44a0697d8a527d2d
 
-      - name: Setup Scala
-        uses: olafurpg/setup-scala@32ffa16635ff8f19cc21ea253a987f0fdf29844c
+      - name: Setup JDK ${{ matrix.java-version }}
+        uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
-          java-version: "adopt@1.8"
+          distribution: temurin
+          java-version: ${{ matrix.java-version }}
 
       - name: Build and run tests
-        run: sbt testAllStandard
+        run: sbt ${{ matrix.test-command }}
 
-      - name: Generate documenation
-        run: sbt doc
+      - name: Generate documentation
+        run: sbt ${{ matrix.doc-command }}
 
   test-database-and-server:
     name: Test Database and Server
@@ -69,10 +89,11 @@ jobs:
           persist-credentials: false
       - uses: coursier/cache-action@95e5b1029b6b86e7bac033ee44a0697d8a527d2d
 
-      - name: Setup Scala
-        uses: olafurpg/setup-scala@32ffa16635ff8f19cc21ea253a987f0fdf29844c
+      - name: Setup JDK 11
+        uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
-          java-version: "adopt@1.11.0-11"
+          distribution: temurin
+          java-version: '11'
 
       - name: Build and run unit tests
         run: sbt "project database" test "project server" test

.github/workflows/format_check.yml

@@ -33,10 +33,11 @@ jobs:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.ref }}
 
-      - name: Setup Scala
-        uses: olafurpg/setup-scala@32ffa16635ff8f19cc21ea253a987f0fdf29844c
+      - name: Setup JDK 8
+        uses: actions/setup-java@cf277c60eb25467037889841efdb72551f06f6c3 # v4
         with:
-          java-version: "adopt@1.8"
+          distribution: temurin
+          java-version: '8'
 
       - name: Run scalafmt And Print Diff
         continue-on-error: true

.github/workflows/jacoco_report.yml

@@ -101,10 +101,11 @@ jobs:
           persist-credentials: false
           fetch-depth: 0
 
-      - name: Setup Scala
-        uses: olafurpg/setup-scala@32ffa16635ff8f19cc21ea253a987f0fdf29844c
+      - name: Setup JDK 11
+        uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
-          java-version: "adopt@1.11.0-11"
+          distribution: temurin
+          java-version: '11'
 
       - name: Prepare testing database
         run: sbt flywayMigrate

.github/workflows/license_check.yml

@@ -30,8 +30,9 @@ jobs:
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
         with:
           persist-credentials: false
-      - name: Setup Scala
-        uses: olafurpg/setup-scala@32ffa16635ff8f19cc21ea253a987f0fdf29844c
+      - name: Setup JDK 8
+        uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
-          java-version: "adopt@1.8"
+          distribution: temurin
+          java-version: '8'
       - run: sbt headerCheck

.github/workflows/release_publish.yml

@@ -31,10 +31,14 @@ jobs:
           fetch-depth: 0
       - uses: coursier/cache-action@95e5b1029b6b86e7bac033ee44a0697d8a527d2d
 
-      - name: Setup Scala
-        uses: olafurpg/setup-scala@32ffa16635ff8f19cc21ea253a987f0fdf29844c
+      - name: Setup JDK 17
+        # The Spark 4 rows of the agent are only added to the project matrix on Java 17+, so publishing has to
+        # run on a JDK 17 or `atum-agent-spark4_2.13` would silently never be released. The Spark 3 / model /
+        # reader rows still compile with `-release 8`, so their bytecode stays Java 8 compatible either way.
+        uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
-          java-version: "adopt@1.8"
+          distribution: temurin
+          java-version: '17'
 
       - name: Run sbt ci-release
         run: sbt ci-release
@@ -56,10 +60,12 @@ jobs:
           fetch-depth: 0
       - uses: coursier/cache-action@95e5b1029b6b86e7bac033ee44a0697d8a527d2d
 
-      - name: Setup Scala
-        uses: olafurpg/setup-scala@32ffa16635ff8f19cc21ea253a987f0fdf29844c
+      - name: Setup JDK 11
+        uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
         with:
-          java-version: "adopt@1.11.0-11"
+          distribution: temurin
+          java-version: '11'
+
       - name: Run sbt assembly (produces jar)
         run: sbt assembly
 

.sbtrc

@@ -35,6 +35,19 @@ alias testDB=; project database; testOnly *
 # Run specific: agent-server compatibility tests
 alias testCompatibility=; testOnly *CompatibilityTests
 
+# Run specific: agent tests against both Spark 3 build rows (Scala 2.12 and 2.13), on the recommended Java 11 runtime
+alias testAgentSpark3=; project agent_spark3; testAllStandard; project agent_spark32_12; testAllStandard
+
+# Run specific: agent tests against the Spark 4 build row (requires Java 17+)
+alias testAgentSpark4=; project agent_spark4; testAllStandard
+
+# Convenience aliases: bundle reader + model together with a specific agent Spark row/doc task.
+alias testReaderModelSpark3=; project reader; testAllStandard; project model; testAllStandard; testAgentSpark3
+alias docReaderModelSpark3=; project reader; doc; project model; doc
+
+alias testReaderModelSpark4=; project reader; testAllStandard; project model; testAllStandard; testAgentSpark4
+alias docReaderModelSpark4=; project reader; doc; project model; doc; project agent_spark4; doc
+
 # Jacoco Aliases
 alias jacoco=; jacocoOn; jacocoAgent; jacocoReader; jacocoModel; jacocoServer; jacocoOff