From 296b7ab5c80a48ab3f7308d182b3913297ee040e Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 12 Nov 2023 01:13:21 -0500
Subject: [PATCH 1/3] [derby] Restore java 11 and adjust derby to change per
 jdk version

---
 .github/workflows/ci.yaml |  2 +-
 pom.xml                   | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 06b1c2163e..b14431cd50 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: [17, 21, 22-ea]
+        java: [11, 17, 21, 22-ea]
         distribution: ['temurin']
       fail-fast: false
       max-parallel: 4
diff --git a/pom.xml b/pom.xml
index 2cd823925f..25ceaed902 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,6 +109,7 @@
     <java.version>17</java.version>
     <java.release.version>17</java.release.version>
 
+    <derby.version>10.17.1.0</derby.version>
     <mybatis.version>3.5.14</mybatis.version>
     <spring.version>6.0.13</spring.version>
     <spring-batch.version>5.0.3</spring-batch.version>
@@ -167,7 +168,7 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.16.1.1</version>
+      <version>${derby.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -460,4 +461,34 @@
       </plugin>
     </plugins>
   </build>
+
+ <profiles>
+    <profile>
+      <id>pre16</id>
+      <activation>
+        <jdk>(,16)</jdk>
+      </activation>
+      <properties>
+          <derby.version>10.15.2.0</derby.version>
+      </properties>
+    </profile>
+    <profile>
+      <id>17</id>
+      <activation>
+        <jdk>[17,)</jdk>
+      </activation>
+      <properties>
+          <derby.version>10.16.1.1</derby.version>
+      </properties>
+    </profile>
+    <profile>
+      <id>19</id>
+      <activation>
+        <jdk>[19,)</jdk>
+      </activation>
+      <properties>
+          <derby.version>10.17.1.0</derby.version>
+      </properties>
+    </profile>
+  </profiles>
 </project>

From 2141d75f92ec9bb0f3aa09eef58b93b2a7ac4181 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 12 Nov 2023 01:13:30 -0500
Subject: [PATCH 2/3] [pom] Remove jacoco override as no longer needed

---
 pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 25ceaed902..62b011b77c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,9 +120,6 @@
     <!-- Reproducible Builds -->
     <project.build.outputTimestamp>1684514485</project.build.outputTimestamp>
 
-    <!-- TODO: Remove this after mybatis-parent 40 -->
-    <jacoco.plugin>0.8.11</jacoco.plugin>
-
     <!-- Set byte buddy to experimental -->
     <net.bytebuddy.experimental>true</net.bytebuddy.experimental>
   </properties>

From b5fcb5e6d625f990275fd8c826d8814252331075 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 12 Nov 2023 01:18:25 -0500
Subject: [PATCH 3/3] [GHA] Drop jdk 11 again as this is spring 6

left profile as that needs copied to javax support.  Javax support can run 11 with derby this way.
---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b14431cd50..06b1c2163e 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, 21, 22-ea]
+        java: [17, 21, 22-ea]
         distribution: ['temurin']
       fail-fast: false
       max-parallel: 4