Repository: activemq Updated Branches: refs/heads/master b3dff48a0 -> ab1bc5b54
AMQ-6681, AMQ-6704 - Update karaf and aries-blueprint-core Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/ab1bc5b5 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/ab1bc5b5 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/ab1bc5b5 Branch: refs/heads/master Commit: ab1bc5b549135b1ef648f1bd9c12e71cc5944090 Parents: b3dff48 Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Authored: Sat Jun 24 09:50:58 2017 -0400 Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Committed: Sat Jun 24 09:50:58 2017 -0400 ---------------------------------------------------------------------- .../org/apache/activemq/karaf/itest/ObrFeatureTest.java | 9 +++++++-- activemq-karaf/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/ab1bc5b5/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java index 2e8a1c5..2aa0759 100644 --- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java +++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java @@ -68,7 +68,7 @@ public class ObrFeatureTest extends AbstractFeatureTest { @Test(timeout = 5 * 60 * 1000) public void testClientWithSpring32() throws Throwable { - testWithSpringVersion("3.2.17.RELEASE_1"); + testWithSpringVersion("3.2.18.RELEASE_1"); } @Test(timeout = 5 * 60 * 1000) @@ -83,7 +83,12 @@ public class ObrFeatureTest extends AbstractFeatureTest { @Test(timeout = 5 * 60 * 1000) public void testClientWithSpring42() throws Throwable { - testWithSpringVersion("4.2.8.RELEASE_1"); + testWithSpringVersion("4.2.9.RELEASE_1"); + } + + @Test(timeout = 5 * 60 * 1000) + public void testClientWithSpring43() throws Throwable { + testWithSpringVersion("4.3.5.RELEASE_1"); } private void testWithSpringVersion(String version) throws Exception, Throwable { http://git-wip-us.apache.org/repos/asf/activemq/blob/ab1bc5b5/activemq-karaf/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml index f5c0c25..0f58255 100644 --- a/activemq-karaf/pom.xml +++ b/activemq-karaf/pom.xml @@ -63,7 +63,7 @@ <dependency> <groupId>org.apache.aries.blueprint</groupId> <artifactId>org.apache.aries.blueprint.core</artifactId> - <version>1.4.4</version> + <version>1.7.1</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> http://git-wip-us.apache.org/repos/asf/activemq/blob/ab1bc5b5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index de95259..2e7a557 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ <junit-version>4.12</junit-version> <hamcrest-version>1.3</hamcrest-version> <jxta-version>2.0</jxta-version> - <karaf-version>4.0.8</karaf-version> + <karaf-version>4.0.9</karaf-version> <leveldb-api-version>0.9</leveldb-api-version> <leveldb-version>0.9</leveldb-version> <leveldbjni-version>1.8</leveldbjni-version>