diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml index 4f085ccfd8..b2ed388a9f 100644 --- a/activemq-blueprint/pom.xml +++ b/activemq-blueprint/pom.xml @@ -37,20 +37,6 @@ - - - servicemix - Apache ServiceMix Repository - http://svn.apache.org/repos/asf/servicemix/m2-repo - - true - - - false - - - - org.apache.aries.blueprint diff --git a/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommand.java b/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommand.java index 3dd9bc6914..581852b28c 100644 --- a/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommand.java +++ b/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommand.java @@ -143,7 +143,7 @@ public class ActiveMQCommand extends AbstractCommand implements CompletableFunct } } - protected Action createNewAction() throws Exception { + public Action createNewAction() { Action action = (Action) blueprintContainer.getComponentInstance(actionId); if (action instanceof BlueprintContainerAware) { ((BlueprintContainerAware) action).setBlueprintContainer(blueprintContainer); diff --git a/pom.xml b/pom.xml index ec4f1cfdcd..19fc344847 100755 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 0.1.0 1.7.1 1.0 - 0.1-r964701 + 0.2-incubating 1.0-M3-dev 1.2-RC1 2.4.0 @@ -70,7 +70,7 @@ 2.5.1 4.5 2.0 - 2.0.0 + 2.1.0 1.2.14 1.5.2 10.1.3.1