Repository: activemq Updated Branches: refs/heads/activemq-5.15.x 72b7d948d -> ed23aca30
AMQ-7206 - Update Derby Thanks Jamie Goodyear for the patch (cherry picked from commit b67c141e6a24be9781963c92102fbeb3d432e5ce) Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/ed23aca3 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/ed23aca3 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/ed23aca3 Branch: refs/heads/activemq-5.15.x Commit: ed23aca302fb596c75197ec57128d51c0588ae9a Parents: 72b7d94 Author: Christopher L. Shannon (cshannon) <[email protected]> Authored: Mon Jul 30 07:40:05 2018 -0400 Committer: Christopher L. Shannon (cshannon) <[email protected]> Committed: Mon Jul 30 07:40:57 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/ed23aca3/activemq-web-demo/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml index 57eda46..b9cc56d 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/ed23aca3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6d82c0b..25c7f19 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>
