From 89e87c61e56035a36a1adcab1ffc4197e5f2d96d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jul 2026 20:22:18 +0000
Subject: [PATCH 1/2] Bump org.apache.derby:derby in
 /OpenICF-databasetable-connector

Bumps org.apache.derby:derby from 10.14.2.0 to 10.17.1.0.

---
updated-dependencies:
- dependency-name: org.apache.derby:derby
  dependency-version: 10.17.1.0
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 OpenICF-databasetable-connector/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenICF-databasetable-connector/pom.xml b/OpenICF-databasetable-connector/pom.xml
index 7b297ee7..5da00da6 100644
--- a/OpenICF-databasetable-connector/pom.xml
+++ b/OpenICF-databasetable-connector/pom.xml
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
-            <version>10.14.2.0</version>
+            <version>10.17.1.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

From 18afa5ca4cc34e9c084765cf64b2007171de0551 Mon Sep 17 00:00:00 2001
From: Valera V Harseko <vharseko@3a-systems.ru>
Date: Wed, 8 Jul 2026 11:31:10 +0300
Subject: [PATCH 2/2] Keep Derby test dependency on a Java 11-compatible
 release (10.15.2.0)

Derby 10.17.1.0 requires Java 21 and splits EmbeddedDriver into derbytools,
breaking the Java 11/17 rows of the CI matrix. Derby is a test-only embedded
database here and the CVE-2022-46337 LDAP authenticator is never used, so bump
to 10.15.2.0 (newest release supporting Java 9+) and add the derbytools and
derbyshared modules to the test classpath instead.
---
 OpenICF-databasetable-connector/pom.xml | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/OpenICF-databasetable-connector/pom.xml b/OpenICF-databasetable-connector/pom.xml
index 5da00da6..0a7f6af5 100644
--- a/OpenICF-databasetable-connector/pom.xml
+++ b/OpenICF-databasetable-connector/pom.xml
@@ -21,6 +21,8 @@
  with the fields enclosed by brackets [] replaced by
  your own identifying information:
  "Portions Copyrighted [year] [name of copyright owner]"
+
+ Portions Copyrighted 2026 3A Systems, LLC
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -75,10 +77,30 @@
             <artifactId>connector-framework-contract</artifactId>
             <scope>test</scope>
         </dependency>
+        <!--
+          Derby is used only as an embedded test database (test scope).
+          10.15.2.0 is the newest release that still supports Java 9+ (i.e. Java 11),
+          which is the minimum of the CI build matrix; 10.16 requires Java 17 and
+          10.17 requires Java 21. Since 10.15 the jars were split into JPMS modules,
+          so org.apache.derby.jdbc.EmbeddedDriver now lives in derbytools and the
+          shared classes in derbyshared - both are required on the test classpath.
+        -->
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
-            <version>10.17.1.0</version>
+            <version>10.15.2.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbytools</artifactId>
+            <version>10.15.2.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbyshared</artifactId>
+            <version>10.15.2.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>