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

In latest derby version, embedded derby JDBC driver is no
longer included in org.apache.derby:derby, but rather
requires addition dependency org.apache.derby:derbytools

Issue-ID: CCSDK-4096
Change-Id: I1fd7c9dbcce4a1c81688a4281f496fe958241846
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 core/sli/common/pom.xml         | 6 +++++-
 core/sli/provider/pom.xml       | 5 +++++
 core/sliapi/provider/pom.xml    | 5 +++++
 northbound/lcm/provider/pom.xml | 5 +++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/core/sli/common/pom.xml b/core/sli/common/pom.xml
index 694b33ed9..05eaa6615 100755
--- a/core/sli/common/pom.xml
+++ b/core/sli/common/pom.xml
@@ -20,7 +20,6 @@
     <properties>
         <!--  Ignore deprecated classes in coverage counts -->
         <sonar.coverage.exclusions>**/MessageWriter.java</sonar.coverage.exclusions>
-
     </properties>
 
     <dependencies>
@@ -29,6 +28,11 @@
             <artifactId>derby</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbytools</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr4</artifactId>
diff --git a/core/sli/provider/pom.xml b/core/sli/provider/pom.xml
index ec1bdd48f..ac8ef4a5c 100755
--- a/core/sli/provider/pom.xml
+++ b/core/sli/provider/pom.xml
@@ -114,6 +114,11 @@
             <artifactId>derby</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbytools</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/core/sliapi/provider/pom.xml b/core/sliapi/provider/pom.xml
index aa6d9a6f6..b44a4d5de 100755
--- a/core/sliapi/provider/pom.xml
+++ b/core/sliapi/provider/pom.xml
@@ -93,6 +93,11 @@
             <artifactId>derby</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbytools</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/northbound/lcm/provider/pom.xml b/northbound/lcm/provider/pom.xml
index 1c2b297f7..9786b09b5 100755
--- a/northbound/lcm/provider/pom.xml
+++ b/northbound/lcm/provider/pom.xml
@@ -83,6 +83,11 @@
             <artifactId>derby</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbytools</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-- 
2.16.6