From 3a8b45d20c35ed77fc66d582d7d453f3e2b9276a Mon Sep 17 00:00:00 2001
From: Olivier Lamy <oliver.lamy@gmail.com>
Date: Tue, 3 Mar 2020 10:20:27 +1000
Subject: [PATCH] Issue #4619 align derby version (#4626)

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 jetty-plus/pom.xml                             |  1 -
 pom.xml                                        | 10 ++++++++++
 tests/test-loginservice/pom.xml                |  2 --
 tests/test-sessions/test-jdbc-sessions/pom.xml |  2 --
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml
index 7f32152b2513..25245b0ff349 100644
--- a/jetty-plus/pom.xml
+++ b/jetty-plus/pom.xml
@@ -60,7 +60,6 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.1.2.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index eee9fcc97be5..dc8feb9356f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1123,6 +1123,16 @@
         <artifactId>jnr-unixsocket</artifactId>
         <version>0.24</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.derby</groupId>
+        <artifactId>derby</artifactId>
+        <version>10.14.2.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.derby</groupId>
+        <artifactId>derbytools</artifactId>
+        <version>10.14.2.0</version>
+      </dependency>
       <!-- avoid depending on a range dependency from a transitive dependency -->
       <dependency>
         <groupId>io.grpc</groupId>
diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml
index de86ead6f89d..ee1c08be5e7c 100644
--- a/tests/test-loginservice/pom.xml
+++ b/tests/test-loginservice/pom.xml
@@ -46,13 +46,11 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.4.1.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derbytools</artifactId>
-      <version>10.4.1.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml
index de6aefad1016..0ed9795be05f 100644
--- a/tests/test-sessions/test-jdbc-sessions/pom.xml
+++ b/tests/test-sessions/test-jdbc-sessions/pom.xml
@@ -48,13 +48,11 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.12.1.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derbytools</artifactId>
-      <version>10.12.1.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>