From 115ba4d7e6771bc60dde4493c88300a5186e1b26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20K=C5=99e=C4=8Dan?= <lukas@krecan.net>
Date: Fri, 22 Sep 2023 22:07:35 +0200
Subject: [PATCH 1/3] Java 21

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 369959d85..101997fd1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,13 +15,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '17', '20']
+        java: [ '17', '21']
         # Kotlin needs access to java.util
         include:
           - java: '17'
             maven-opts: --add-opens java.base/java.util=ALL-UNNAMED
             maven-params: ''
-          - java: '20'
+          - java: '21'
             maven-opts: --add-opens java.base/java.util=ALL-UNNAMED
             maven-params: ''
     steps:

From 74f2d269e290cd9c0b65bcb6441f3a6780732e1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20K=C5=99e=C4=8Dan?= <lukas@krecan.net>
Date: Sat, 23 Sep 2023 06:17:08 +0200
Subject: [PATCH 2/3] Use Zulu JDK

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 101997fd1..432cb6735 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,7 +30,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'temurin'
+          distribution: 'zulu'
       - name: Cache Maven packages
         uses: actions/cache@v3
         with:

From ccdec58f7333068f481a3abe2007db5c243533c7 Mon Sep 17 00:00:00 2001
From: Lukas Krecan <lukas@krecan.net>
Date: Sat, 23 Sep 2023 21:34:46 +0200
Subject: [PATCH 3/3] Skip Ignite test on Java 21

 https://github.com/apache/ignite/issues/10720
---
 .github/workflows/build.yml                   | 13 +++--------
 .../ignite/shedlock-provider-ignite/pom.xml   | 22 +++++++++++++++++--
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 432cb6735..6974674aa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,14 +16,6 @@ jobs:
     strategy:
       matrix:
         java: [ '17', '21']
-        # Kotlin needs access to java.util
-        include:
-          - java: '17'
-            maven-opts: --add-opens java.base/java.util=ALL-UNNAMED
-            maven-params: ''
-          - java: '21'
-            maven-opts: --add-opens java.base/java.util=ALL-UNNAMED
-            maven-params: ''
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java }}
@@ -40,8 +32,9 @@ jobs:
             maven-
       - name: Build with Maven
         env:
-          MAVEN_OPTS: ${{ matrix.maven-opts }}
-        run: mvn ${{ matrix.maven-params }} test javadoc:javadoc
+          # Kotlin needs access to java.util
+          MAVEN_OPTS: --add-opens java.base/java.util=ALL-UNNAMED
+        run: mvn test javadoc:javadoc
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v4
         if: always() # always run even if the previous step fails
diff --git a/providers/ignite/shedlock-provider-ignite/pom.xml b/providers/ignite/shedlock-provider-ignite/pom.xml
index 574717319..acf9313b8 100644
--- a/providers/ignite/shedlock-provider-ignite/pom.xml
+++ b/providers/ignite/shedlock-provider-ignite/pom.xml
@@ -55,9 +55,9 @@
     </build>
     <profiles>
         <profile>
-            <id>surefire-java16</id>
+            <id>surefire-java17</id>
             <activation>
-                <jdk>[16,)</jdk>
+                <jdk>[17,)</jdk>
             </activation>
             <build>
                 <plugins>
@@ -71,5 +71,23 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <!-- https://github.com/apache/ignite/issues/10720 -->
+            <id>skip-tests-in-java21</id>
+            <activation>
+                <jdk>21</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skipTests>true</skipTests>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
   </project>