From 3c13160b4f328600917e8cd6d0209c9a82a3e1ec Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 25 Sep 2023 19:22:23 -0400
Subject: [PATCH 1/2] [pom] Drop jdk 20 from allowed build list

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index da7a57904c4..71030204f8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,7 @@
     <!-- Reproducible Builds -->
     <project.build.outputTimestamp>1678513628</project.build.outputTimestamp>
 
-    <allowed.build.jdks>[11,12),[17,18),[20,21),[21,22),[22,23)</allowed.build.jdks>
+    <allowed.build.jdks>[11,12),[17,18),[21,22),[22,23)</allowed.build.jdks>
   </properties>
 
   <dependencies>

From 82e48372c7e8de2fd8aec81e64692d2ef135347d Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 25 Sep 2023 19:24:56 -0400
Subject: [PATCH 2/2] [GHA] Update jdks

---
 .github/workflows/ci.yaml       | 2 +-
 .github/workflows/sonar.yaml    | 2 +-
 .github/workflows/sonatype.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 9e4172f4735..f27e3068693 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        java: [11, 17, 20, 21, 22]
+        java: [11, 17, 21, 22]
         distribution: ['zulu']
       fail-fast: false
       max-parallel: 4
diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
index 7b94af5d98e..445c87ea578 100644
--- a/.github/workflows/sonar.yaml
+++ b/.github/workflows/sonar.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: zulu
       - name: Analyze with SonarCloud
         run: ./mvnw verify jacoco:report sonar:sonar -B -Dsonar.projectKey=mybatis_mybatis-3 -Dsonar.organization=mybatis -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dlicense.skip=true --no-transfer-progress
diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml
index 453771e2b4f..46800b489ea 100644
--- a/.github/workflows/sonatype.yaml
+++ b/.github/workflows/sonatype.yaml
@@ -14,7 +14,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: zulu
       - name: Deploy to Sonatype
         run: ./mvnw deploy -DskipTests -B -V --no-transfer-progress --settings ./.mvn/settings.xml -Dlicense.skip=true