From 86e5166559c0bb49e0010b4f551a90a01ca675a3 Mon Sep 17 00:00:00 2001
From: kasemir <kay.kasemir@gmail.com>
Date: Tue, 13 Sep 2022 16:39:03 -0400
Subject: [PATCH] Update derby

---
 dependencies/phoebus-target/.classpath |  4 +++-
 dependencies/phoebus-target/pom.xml    | 12 +++++++++++-
 pom.xml                                |  1 +
 services/scan-server/pom.xml           | 12 +++++++++++-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/dependencies/phoebus-target/.classpath b/dependencies/phoebus-target/.classpath
index 77fb2edbc0..593bded105 100644
--- a/dependencies/phoebus-target/.classpath
+++ b/dependencies/phoebus-target/.classpath
@@ -22,7 +22,9 @@
     <classpathentry exported="true" kind="lib" path="target/lib/commons-logging-1.1.3.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/commons-compress-1.21.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/controlsfx-11.0.3.jar"/>
-    <classpathentry exported="true" kind="lib" path="target/lib/derby-10.14.1.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="target/lib/derby-10.16.1.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="target/lib/derbytools-10.16.1.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="target/lib/derbyshared-10.16.1.1.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/eclipselink-2.7.0.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/elasticsearch-6.8.4.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/elasticsearch-cli-6.8.4.jar"/>
diff --git a/dependencies/phoebus-target/pom.xml b/dependencies/phoebus-target/pom.xml
index 8f33743d5e..312229bc37 100644
--- a/dependencies/phoebus-target/pom.xml
+++ b/dependencies/phoebus-target/pom.xml
@@ -270,7 +270,17 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.14.1.0</version>
+      <version>${derby.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <version>${derby.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbyshared</artifactId>
+      <version>${derby.version}</version>
     </dependency>
 
     <!-- Kafka, used by alarm tools -->
diff --git a/pom.xml b/pom.xml
index ff9c1e11cc..6476eef819 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,7 @@
     <skipITTests>true</skipITTests>
     <guava.version>31.0.1-jre</guava.version>
     <log4j-to-slf4j.version>2.17.1</log4j-to-slf4j.version>
+    <derby.version>10.16.1.1</derby.version>
   </properties>
   <build>
     <plugins>
diff --git a/services/scan-server/pom.xml b/services/scan-server/pom.xml
index f47046ced8..54ffaaf200 100644
--- a/services/scan-server/pom.xml
+++ b/services/scan-server/pom.xml
@@ -44,7 +44,17 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.14.1.0</version>
+      <version>${derby.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <version>${derby.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbyshared</artifactId>
+      <version>${derby.version}</version>
     </dependency>
 
     <dependency>