From 5d3c2c3d08825163c86fc3134780f9ff12593e90 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 12 Nov 2023 00:56:59 -0500
Subject: [PATCH] [derby] Retool derby to add back java 11 and let it
 selectively change per build jdk

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

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 06b1c216..b14431cd 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 e68ca28b..9c868b7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,6 @@
   <groupId>org.mybatis</groupId>
   <artifactId>mybatis2</artifactId>
   <version>2.5.1-SNAPSHOT</version>
-  <packaging>jar</packaging>
 
   <name>mybatis2</name>
   <description>The mybatis data mapper framework makes it easier to use a relational database with object-oriented
@@ -64,6 +63,7 @@
 
   <properties>
     <clirr.comparisonVersion>2.4.4</clirr.comparisonVersion>
+    <derby.version>10.17.1.0</derby.version>
     <java.version>8</java.version>
     <java.release.version>8</java.release.version>
     <java.test.version>8</java.test.version>
@@ -143,19 +143,19 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.16.1.1</version>
+      <version>${derby.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derbyshared</artifactId>
-      <version>10.16.1.1</version>
+      <version>${derby.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derbyoptionaltools</artifactId>
-      <version>10.16.1.1</version>
+      <version>${derby.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -192,6 +192,15 @@
   </build>
 
   <profiles>
+    <profile>
+      <id>pre16</id>
+      <activation>
+        <jdk>(,16)</jdk>
+      </activation>
+      <properties>
+          <derby.version>10.15.2.0</derby.version>
+      </properties>
+    </profile>
     <profile>
       <id>jdk17on</id>
       <activation>
@@ -199,6 +208,16 @@
       </activation>
       <properties>
         <argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine>
+        <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>