From f4773bf190e5dfec99f9631b6f8e630747d86b33 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Fri, 3 Nov 2023 21:47:08 -0400
Subject: [PATCH 1/4] [pom] Bump to java 11 as that is required baseline for
 EE10

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

diff --git a/pom.xml b/pom.xml
index f02664b2..1b504f2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,6 +87,9 @@
   </distributionManagement>
 
   <properties>
+    <java.version>11</java.version>
+    <java.release.version>11</java.release.version>
+
     <clirr.comparisonVersion>3.10</clirr.comparisonVersion>
     <spotbugs.onlyAnalyze>org.mybatis.guice.*</spotbugs.onlyAnalyze>
     <gcu.product>Guice</gcu.product>

From 0cebdc6e2c81cd9d29c043269b9201199daf92b3 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Fri, 3 Nov 2023 21:47:29 -0400
Subject: [PATCH 2/4] [pom] Bump derby to 10.16.1.1

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

diff --git a/pom.xml b/pom.xml
index 1b504f2e..7cdc7e4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -315,19 +315,19 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.15.2.0</version>
+      <version>10.16.1.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derbyshared</artifactId>
-      <version>10.15.2.0</version>
+      <version>10.16.1.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derbyoptionaltools</artifactId>
-      <version>10.15.2.0</version>
+      <version>10.16.1.1</version>
       <scope>test</scope>
     </dependency>
 

From 3364eac97069418ebf3c4c2f2d934cdd3a61d32d Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Fri, 3 Nov 2023 21:47:38 -0400
Subject: [PATCH 3/4] [pom] Bump jakarta resource api to 2.1.0

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

diff --git a/pom.xml b/pom.xml
index 7cdc7e4a..4aa7b64d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@
     <dependency>
       <groupId>jakarta.resource</groupId>
       <artifactId>jakarta.resource-api</artifactId>
-      <version>2.0.0</version>
+      <version>2.1.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

From 9ecb9b551f89d5bfd246f202758828c4d51cabc4 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Fri, 3 Nov 2023 22:01:14 -0400
Subject: [PATCH 4/4] [GHA] Drop java 11 from build matrix

no real need for it and this allows derby to be up to date.  code is locked to java 11 by the release flag and enforcer prevents any transients going higher already.
---
 .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 b14431cd..06b1c216 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