From 1372798fe7175cef1965af6155ea8218f8da8117 Mon Sep 17 00:00:00 2001
From: semyonsinchenko <ssinchenko@apache.org>
Date: Wed, 26 Feb 2025 10:01:22 +0100
Subject: [PATCH 1/2] Testing against both java-11 and java-17

---
 .github/workflows/scala-ci.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/scala-ci.yml b/.github/workflows/scala-ci.yml
index 1e4c04a58..d9234e9f7 100644
--- a/.github/workflows/scala-ci.yml
+++ b/.github/workflows/scala-ci.yml
@@ -8,8 +8,16 @@ jobs:
         include:
           - spark-version: 3.5.4
             scala-version: 2.13.8
+            java-version: 11
+          - spark-version: 3.5.4
+            scala-version: 2.13.8
+            java-version: 17
+          - spark-version: 3.5.4
+            scala-version: 2.12.18
+            java-version: 11
           - spark-version: 3.5.4
             scala-version: 2.12.18
+            java-version: 17
     runs-on: ubuntu-22.04
     env:
       # fixing this error after tests success: sbt.ForkMain failed with exit code 134
@@ -21,12 +29,12 @@ jobs:
     - uses: actions/setup-java@v4
       with:
         distribution: "zulu"
-        java-version: "11"
+        java-version: "${{ matrix.java-version }}"
     - uses: actions/cache@v4
       with:
         path: |
           ~/.ivy2/cache
-        key: sbt-ivy-cache-spark-${{ matrix.spark-version}}-scala-${{ matrix.scala-version }}
+        key: sbt-ivy-cache-spark-${{ matrix.spark-version}}-scala-${{ matrix.scala-version }}-java-${{ matrix.java-version }}
     - name: Check scalafmt
       run: build/sbt root/scalafmtCheckAll
     - name: Build and Test

From c1361ce54c83f593fc908ffb9d6fec14c5fd7138 Mon Sep 17 00:00:00 2001
From: semyonsinchenko <ssinchenko@apache.org>
Date: Wed, 26 Feb 2025 10:27:26 +0100
Subject: [PATCH 2/2] Fix 11-17 migration based on oracle's guide

---
 build.sbt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index 4ee4d9bd5..0ce3c3876 100644
--- a/build.sbt
+++ b/build.sbt
@@ -57,7 +57,10 @@ lazy val root = (project in file("."))
       "-XX:ReservedCodeCacheSize=384m",
       "-XX:MaxMetaspaceSize=384m",
       "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",
-      "--add-opens=java.base/java.lang=ALL-UNNAMED"
+      "--add-opens=java.base/java.lang=ALL-UNNAMED",
+      "--add-opens=java.base/java.nio=ALL-UNNAMED",
+      "--add-opens=java.base/java.lang.invoke=ALL-UNNAMED",
+      "--add-opens=java.base/java.util=ALL-UNNAMED",
     ),
 
     // Global settings