From b4bb4d8913b3fadda658af6818d17daca6bea6c4 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Thu, 29 May 2025 13:48:41 -0400
Subject: [PATCH] Add dependency version for derbytools

Add dependency version for derbytools, which is now required
as a dependency when using embedded derby JDBC driver

Issue-ID: CCSDK-4096
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I14f48a90a8959092181c9a09146215988726352f
---
 dependencies-bom/pom.xml                            | 6 ++++++
 dependencies-odl-bom/pom.xml                        | 6 ++++++
 odlparent/binding-parent/pom.xml                    | 5 +++++
 odlparent/bundle-parent/pom.xml                     | 5 +++++
 odlparent/feature-repo-parent/pom.xml               | 5 +++++
 odlparent/karaf4-parent/pom.xml                     | 5 +++++
 odlparent/mdsal-it-parent/pom.xml                   | 5 +++++
 odlparent/odlparent-lite/pom.xml                    | 5 +++++
 odlparent/odlparent/pom.xml                         | 5 +++++
 odlparent/setup/src/main/resources/pom-template.xml | 5 +++++
 odlparent/single-feature-parent/pom.xml             | 5 +++++
 11 files changed, 57 insertions(+)

diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index 49d13f24..e25da145 100644
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -197,6 +197,12 @@
                 <version>10.17.1.0</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbytools</artifactId>
+                <version>10.17.1.0</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index a69ff87d..edfa1f7f 100644
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml
@@ -173,6 +173,12 @@
                 <version>10.17.1.0</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbytools</artifactId>
+                <version>10.17.1.0</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.apache.sshd</groupId>
                 <artifactId>sshd-core</artifactId>
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 1200ebda..11ca9074 100644
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -240,6 +240,11 @@
                 <artifactId>derby</artifactId>
                 <version>${derby.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbytools</artifactId>
+                <version>${derby.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index a91a450e..e15adefa 100644
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -240,6 +240,11 @@
                 <artifactId>derby</artifactId>
                 <version>${derby.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbytools</artifactId>
+                <version>${derby.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index aad6fc8a..83dd4c6f 100644
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -240,6 +240,11 @@
                 <artifactId>derby</artifactId>
                 <version>${derby.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbytools</artifactId>
+                <version>${derby.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index d0d7bbb2..bf3564ff 100644
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -240,6 +240,11 @@
                 <artifactId>derby</artifactId>
                 <version>${derby.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbytools</artifactId>
+                <version>${derby.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 17de82b9..25cc532e 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -240,6 +240,11 @@
                 <artifactId>derby</artifactId>
                 <version>${derby.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbytools</artifactId>
+                <version>${derby.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 4743c8f0..dcc23f2b 100644
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -240,6 +240,11 @@
                 <artifactId>derby</artifactId>
                 <version>${derby.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbytools</artifactId>
+                <version>${derby.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 712ff208..1f337e69 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -240,6 +240,11 @@
                 <artifactId>derby</artifactId>
                 <version>${derby.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbytools</artifactId>
+                <version>${derby.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index c33f0a45..e9cb9b64 100755
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -240,6 +240,11 @@
                 <artifactId>derby</artifactId>
                 <version>\${derby.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbytools</artifactId>
+                <version>\${derby.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 3b59af7f..a8b223dd 100644
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -240,6 +240,11 @@
                 <artifactId>derby</artifactId>
                 <version>${derby.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbytools</artifactId>
+                <version>${derby.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-- 
2.16.6