From 11419665a02552ac563d06f8f1e0e89975091de1 Mon Sep 17 00:00:00 2001
From: Julian Reschke <reschke@apache.org>
Date: Mon, 29 Jan 2024 14:42:31 +0100
Subject: [PATCH] JCR-5022: Update derby dependency to 10.15.2.0

---
 jackrabbit-core/pom.xml       | 5 +++++
 jackrabbit-jca/pom.xml        | 6 ++++++
 jackrabbit-jcr-rmi/pom.xml    | 5 +++++
 jackrabbit-jcr-server/pom.xml | 5 +++++
 jackrabbit-jcr2dav/pom.xml    | 5 +++++
 jackrabbit-parent/pom.xml     | 7 ++++++-
 jackrabbit-spi2dav/pom.xml    | 5 +++++
 jackrabbit-spi2jcr/pom.xml    | 5 +++++
 jackrabbit-webapp/pom.xml     | 6 ++++++
 9 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/jackrabbit-core/pom.xml b/jackrabbit-core/pom.xml
index 4c95d4c6001..d8fa14716e8 100644
--- a/jackrabbit-core/pom.xml
+++ b/jackrabbit-core/pom.xml
@@ -293,6 +293,11 @@ org.apache.jackrabbit.core.version.ModifyNonVersionableCheckedOutTest#testModify
       <artifactId>derby</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-tests</artifactId>
diff --git a/jackrabbit-jca/pom.xml b/jackrabbit-jca/pom.xml
index 4970e681a7a..d2a3b9f97c8 100644
--- a/jackrabbit-jca/pom.xml
+++ b/jackrabbit-jca/pom.xml
@@ -130,6 +130,12 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
diff --git a/jackrabbit-jcr-rmi/pom.xml b/jackrabbit-jcr-rmi/pom.xml
index 72e031b0b6f..e222b3639a2 100644
--- a/jackrabbit-jcr-rmi/pom.xml
+++ b/jackrabbit-jcr-rmi/pom.xml
@@ -573,6 +573,11 @@ org.apache.jackrabbit.test.api.observation.EventJournalTest
       <artifactId>derby</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/jackrabbit-jcr-server/pom.xml b/jackrabbit-jcr-server/pom.xml
index 4fa248d4834..c4e8396102a 100644
--- a/jackrabbit-jcr-server/pom.xml
+++ b/jackrabbit-jcr-server/pom.xml
@@ -282,6 +282,11 @@
       <artifactId>derby</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/jackrabbit-jcr2dav/pom.xml b/jackrabbit-jcr2dav/pom.xml
index fde130e36e5..69586e33d4d 100644
--- a/jackrabbit-jcr2dav/pom.xml
+++ b/jackrabbit-jcr2dav/pom.xml
@@ -207,6 +207,11 @@
       <artifactId>derby</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/jackrabbit-parent/pom.xml b/jackrabbit-parent/pom.xml
index 12d62448951..e2183484e74 100644
--- a/jackrabbit-parent/pom.xml
+++ b/jackrabbit-parent/pom.xml
@@ -560,7 +560,12 @@
       <dependency>
         <groupId>org.apache.derby</groupId>
         <artifactId>derby</artifactId>
-        <version>10.14.2.0</version>
+        <version>10.15.2.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.derby</groupId>
+        <artifactId>derbytools</artifactId>
+        <version>10.15.2.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
diff --git a/jackrabbit-spi2dav/pom.xml b/jackrabbit-spi2dav/pom.xml
index b0a1c204265..c6ad8460959 100644
--- a/jackrabbit-spi2dav/pom.xml
+++ b/jackrabbit-spi2dav/pom.xml
@@ -252,6 +252,11 @@
       <artifactId>derby</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <scope>test</scope>
+    </dependency>
     <!-- for testing connection via a proxy -->
      <dependency>
         <groupId>org.littleshoot</groupId>
diff --git a/jackrabbit-spi2jcr/pom.xml b/jackrabbit-spi2jcr/pom.xml
index 1cfa92e91c7..562ad10f520 100644
--- a/jackrabbit-spi2jcr/pom.xml
+++ b/jackrabbit-spi2jcr/pom.xml
@@ -181,5 +181,10 @@ org.apache.jackrabbit.test.api.query.qom.EquiJoinConditionTest#testLeftOuterJoin
       <artifactId>derby</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/jackrabbit-webapp/pom.xml b/jackrabbit-webapp/pom.xml
index 570873e8860..ccd832f0e45 100644
--- a/jackrabbit-webapp/pom.xml
+++ b/jackrabbit-webapp/pom.xml
@@ -127,6 +127,12 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>