[activemq] branch main updated: [AMQ-7325] Upgrade to Derby 10.15.2.0

[jbonofre]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/main by this push:
     new ee21925  [AMQ-7325] Upgrade to Derby 10.15.2.0
     new 546df47  Merge pull request #402 from jbonofre/AMQ-7325
ee21925 is described below

commit ee21925c0876cbbc9dbb4428d3d219474c38eec7
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Thu Oct 31 07:30:49 2019 +0100

    [AMQ-7325] Upgrade to Derby 10.15.2.0
---
 activemq-jdbc-store/pom.xml | 5 +++++
 activemq-unit-tests/pom.xml | 5 +++++
 assembly/pom.xml            | 5 +++++
 pom.xml                     | 7 ++++++-
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/activemq-jdbc-store/pom.xml b/activemq-jdbc-store/pom.xml
index 19820dc..285a475 100644
--- a/activemq-jdbc-store/pom.xml
+++ b/activemq-jdbc-store/pom.xml
@@ -49,6 +49,11 @@
       <optional>true</optional>
     </dependency>
     <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
       <optional>true</optional>
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index ee2bbbc..7ecd446 100644
--- a/activemq-unit-tests/pom.xml
+++ b/activemq-unit-tests/pom.xml
@@ -143,6 +143,11 @@
       <optional>true</optional>
     </dependency>
     <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
       <optional>true</optional>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 9d32850..d700015 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -346,6 +346,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
       <artifactId>derbynet</artifactId>
       <optional>true</optional>
     </dependency>
diff --git a/pom.xml b/pom.xml
index ee9c6ac..49d9ca9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
     <mockito-version>3.8.0</mockito-version>
     <owasp-dependency-check-version>5.2.4</owasp-dependency-check-version>
     <mqtt-client-version>1.16</mqtt-client-version>
-    <org-apache-derby-version>10.14.2.0</org-apache-derby-version>
+    <org-apache-derby-version>10.15.2.0</org-apache-derby-version>
     <osgi-version>6.0.0</osgi-version>
     <linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version>
     <zookeeper-version>3.4.14</zookeeper-version>
@@ -776,6 +776,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.derby</groupId>
+        <artifactId>derbytools</artifactId>
+        <version>${org-apache-derby-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.derby</groupId>
         <artifactId>derbynet</artifactId>
         <version>${org-apache-derby-version}</version>
       </dependency>