diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java index 66a44c1a29..6cb007b089 100644 --- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java +++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java @@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory; @ExamReactorStrategy(PerClass.class) public abstract class AbstractFeatureTest { - private static final String KARAF_MAJOR_VERSION = "4.2.8"; + private static final String KARAF_MAJOR_VERSION = "4.2.10"; public static final Logger LOG = LoggerFactory.getLogger(AbstractFeatureTest.class); public static final long ASSERTION_TIMEOUT = 30000L; public static final String RESOURCE_BASE = "src/test/resources/org/apache/activemq/karaf/itest/"; @@ -120,6 +120,7 @@ public abstract class AbstractFeatureTest { } protected void assertBrokerStarted() throws Exception { + Thread.sleep(4000); withinReason(new Runnable() { public void run() { assertEquals("brokerName = amq-broker", executeCommand("activemq:list").trim()); diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml index 6ff831fcd4..ea7c3fb783 100644 --- a/activemq-karaf/src/main/resources/features-core.xml +++ b/activemq-karaf/src/main/resources/features-core.xml @@ -18,12 +18,12 @@ --> - + mvn:org.apache.karaf.features/spring-legacy/[4,5)/xml/features - + spring shell-compat mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1 @@ -32,28 +32,28 @@ mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1 mvn:org.jvnet.jaxb2_commons/jaxb2-basics-runtime/${jaxb-basics-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version} - mvn:org.apache.commons/commons-pool2/${commons-pool2-version} - mvn:commons-net/commons-net/${commons-net-version} - mvn:org.apache.zookeeper/zookeeper/${zookeeper-version} + mvn:org.apache.commons/commons-pool2/${commons-pool2-version} + mvn:commons-net/commons-net/${commons-net-version} + mvn:org.apache.zookeeper/zookeeper/${zookeeper-version} mvn:org.apache.activemq/activemq-osgi/${project.version} - + activemq-client scr mvn:org.apache.activemq/activemq-cf/${project.version} - + connector http activemq-client mvn:org.apache.activemq/activemq-karaf/${project.version} mvn:commons-io/commons-io/${commons-io-version} mvn:commons-collections/commons-collections/${commons-collections-version} - mvn:commons-lang/commons-lang/${commons-lang-version} + mvn:commons-lang/commons-lang/${commons-lang-version} mvn:commons-codec/commons-codec/1.9 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.7_6 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.2_1 @@ -70,4 +70,4 @@ mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson-version} mvn:org.scala-lang/scala-library/${scala-version} - + diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml index 9c514df700..3e748bc576 100644 --- a/activemq-karaf/src/main/resources/features.xml +++ b/activemq-karaf/src/main/resources/features.xml @@ -18,26 +18,26 @@ --> - + mvn:org.apache.activemq/activemq-karaf/${project.version}/xml/features-core - + activemq mvn:org.apache.activemq/activemq-karaf/${project.version}/xml/activemq mvn:org.apache.activemq/activemq-karaf/${project.version}/cfg/activemq - + activemq mvn:org.apache.activemq/activemq-karaf/${project.version}/xml/activemq mvn:org.apache.activemq/activemq-karaf/${project.version}/cfg/activemq activemq-web-console - + activemq-client mvn:org.apache.activemq/activemq-camel/${project.version} camel-jms @@ -46,14 +46,14 @@ camel-blueprint - - war - eventadmin + + war + eventadmin mvn:org.apache.activemq/activemq-karaf/${project.version}/cfg/activemq-webconsole mvn:org.apache.activemq/activemq-web-console/${project.version}/war - + activemq mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version} mvn:org.apache.commons/commons-jexl/2.0.1 diff --git a/pom.xml b/pom.xml index a339ff99bc..f54645e773 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ 4.13.1 1.3 2.0 - 4.2.8 + 4.2.10 0.9 0.9 1.8