From cb1339e19a29ae0696ccbf127f83f1b18b3d65e7 Mon Sep 17 00:00:00 2001
From: Fokko Driesprong <fokko@apache.org>
Date: Tue, 20 Aug 2019 23:03:32 +0200
Subject: [PATCH] Bump derby from 10.11.1.1 to 10.14.2.0 (#8292)

* Bump derby from 10.11.1.1 to 10.15.1.3

* Update server/pom.xml as well

* Move to derby 10.14.2.0

10.15.* is Java9+
https://db.apache.org/derby/derby_downloads.html
---
 licenses.yaml  | 3 +--
 pom.xml        | 5 +++--
 server/pom.xml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/licenses.yaml b/licenses.yaml
index 09bfd6402c4a..b2692e92ce0f 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -654,7 +654,7 @@ name: Apache Derby
 license_category: binary
 module: java-core
 license_name: Apache License version 2.0
-version: 10.11.1.1
+version: 10.14.2.0
 libraries:
   - org.apache.derby: derby
   - org.apache.derby: derbyclient
@@ -3452,4 +3452,3 @@ version: 1.2.2
 copyright: Jeremy Ashkenas, DocumentCloud
 license_file_path: licenses/src/underscore.MIT
 # Legacy console modules end
-
diff --git a/pom.xml b/pom.xml
index e2453165621a..08b473df5615 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,7 @@
         <apache.curator.test.version>2.12.0</apache.curator.test.version>
         <avatica.version>1.12.0</avatica.version>
         <calcite.version>1.17.0</calcite.version>
+        <derby.version>10.14.2.0</derby.version>
         <dropwizard.metrics.version>4.0.0</dropwizard.metrics.version>
         <fastutil.version>8.2.3</fastutil.version>
         <guava.version>16.0.1</guava.version>
@@ -680,12 +681,12 @@
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derbynet</artifactId>
-                <version>10.11.1.1</version>
+                <version>${derby.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derbyclient</artifactId>
-                <version>10.11.1.1</version>
+                <version>${derby.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
diff --git a/server/pom.xml b/server/pom.xml
index 2bcd4434822e..540a7834c440 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -167,7 +167,7 @@
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
-            <version>10.11.1.1</version>
+            <version>${derby.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>