Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-6681, AMQ-6704 - Update karaf and aries-blueprint-core

This commit is contained in:
Christopher L. Shannon (cshannon) 2017-06-24 09:50:58 -04:00
parent b3dff48a0a
commit ab1bc5b549
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java
View File

@ -68,7 +68,7 @@ public class ObrFeatureTest extends AbstractFeatureTest {
@Test(timeout = 5 * 60 * 1000) @Test(timeout = 5 * 60 * 1000)
public void testClientWithSpring32() throws Throwable { public void testClientWithSpring32() throws Throwable {
testWithSpringVersion("3.2.17.RELEASE_1"); testWithSpringVersion("3.2.18.RELEASE_1");
} }
@Test(timeout = 5 * 60 * 1000) @Test(timeout = 5 * 60 * 1000)
@ -83,7 +83,12 @@ public class ObrFeatureTest extends AbstractFeatureTest {
@Test(timeout = 5 * 60 * 1000) @Test(timeout = 5 * 60 * 1000)
public void testClientWithSpring42() throws Throwable { 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 { private void testWithSpringVersion(String version) throws Exception, Throwable {

2
activemq-karaf/pom.xml
View File

@ -63,7 +63,7 @@
<dependency> <dependency>
<groupId>org.apache.aries.blueprint</groupId> <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId> <artifactId>org.apache.aries.blueprint.core</artifactId>
<version>1.4.4</version> <version>1.7.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>

2
pom.xml
View File

@ -89,7 +89,7 @@
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
<hamcrest-version>1.3</hamcrest-version> <hamcrest-version>1.3</hamcrest-version>
<jxta-version>2.0</jxta-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-api-version>0.9</leveldb-api-version>
<leveldb-version>0.9</leveldb-version> <leveldb-version>0.9</leveldb-version>
<leveldbjni-version>1.8</leveldbjni-version> <leveldbjni-version>1.8</leveldbjni-version>