You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2018/07/30 11:40:41 UTC
activemq git commit: AMQ-7206 - Update Derby
Repository: activemq
Updated Branches:
refs/heads/master 99f0abab5 -> b67c141e6
AMQ-7206 - Update Derby
Thanks Jamie Goodyear for the patch
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b67c141e
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b67c141e
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b67c141e
Branch: refs/heads/master
Commit: b67c141e6a24be9781963c92102fbeb3d432e5ce
Parents: 99f0aba
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Authored: Mon Jul 30 07:40:05 2018 -0400
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Mon Jul 30 07:40:05 2018 -0400
----------------------------------------------------------------------
activemq-web-demo/pom.xml | 1 +
pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/b67c141e/activemq-web-demo/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index a4167ee..9599eb1 100644
--- a/activemq-web-demo/pom.xml
+++ b/activemq-web-demo/pom.xml
@@ -228,6 +228,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
+ <version>${org-apache-derby-version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/activemq/blob/b67c141e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a1f3e10..7b78a26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
<powermock-version>1.6.5</powermock-version>
<mqtt-client-version>1.14</mqtt-client-version>
<openjpa-version>1.2.0</openjpa-version>
- <org-apache-derby-version>10.11.1.1</org-apache-derby-version>
+ <org-apache-derby-version>10.14.2.0</org-apache-derby-version>
<org.osgi.core-version>4.3.1</org.osgi.core-version>
<p2psockets-version>1.1.2</p2psockets-version>
<linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version>