From 856d37df0ecd163a53a104bfd5b1f683c7fa2fd7 Mon Sep 17 00:00:00 2001 From: jbonofre Date: Sun, 4 Jul 2021 07:28:19 +0200 Subject: [PATCH] [AMQ-8309] Upgrade features and import to avoid cascading refresh --- activemq-camel/pom.xml | 2 +- activemq-karaf/src/main/resources/features-core.xml | 4 ++-- activemq-osgi/pom.xml | 13 ++++++++----- .../src/main/resources/META-INF/spring.handlers | 4 ++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml index 3b1a6969b6..37b5b3f23d 100644 --- a/activemq-camel/pom.xml +++ b/activemq-camel/pom.xml @@ -32,7 +32,7 @@ - org.springframework.jms*;version="[4,5)", + org.springframework.jms*;version="[4,6)", org.apache.activemq.pool, org.apache.camel*;version="${camel-version-range}", * diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml index f32a351f87..ac1eb45490 100644 --- a/activemq-karaf/src/main/resources/features-core.xml +++ b/activemq-karaf/src/main/resources/features-core.xml @@ -22,11 +22,11 @@ - spring + spring aries-blueprint mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1 mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1 - mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1 + mvn:org.apache.geronimo.specs/geronimo-jms_2.0_spec/1.0-alpha-2 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} diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml index aafbe12b48..66693ce32c 100644 --- a/activemq-osgi/pom.xml +++ b/activemq-osgi/pom.xml @@ -48,7 +48,9 @@ com.thoughtworks.xstream*;resolution:=optional, org.apache.activeio*;resolution:=optional, org.apache.activemq.camel*;resolution:=optional, - org.apache.camel*;version:="${camel-version-range}";resolution:=optional, + org.apache.camel*;version="${camel-version-range}";resolution:=optional, + org.apache.camel.spring.handler;version="${camel-version-range}";resolution:=optional, + org.apache.camel.spring.xml.handler;version="${camel-version-range}";resolution:=optional, org.apache.derby.jdbc*;resolution:=optional, org.apache.geronimo.transaction.manager*;resolution:=optional, org.apache.hadoop*;resolution:=optional, @@ -62,16 +64,16 @@ org.apache.zookeeper*;resolution:=optional, org.fusesource.leveldbjni*;resolution:=optional, org.fusesource.hawtjni*;resolution:=optional, - org.springframework.jms*;version="[4,5)";resolution:=optional, - org.springframework.transaction*;version="[4,5)";resolution:=optional, - org.springframework*;version="[4,5)";resolution:=optional, + org.springframework.jms*;version="[4,6)";resolution:=optional, + org.springframework.transaction*;version="[4,6)";resolution:=optional, + org.springframework*;version="[4,6)";resolution:=optional, org.xmlpull*;resolution:=optional, scala*;resolution:=optional, javax.annotation*;version="[1,4)", !com.thoughtworks.qdox*, org.apache.commons.logging;version="[1.2,2)";resolution:=optional, javax.jms*;version="[1.1,3)", - javax.management*, + javax.management*;resolution:=optional, javax.transaction*;version="[1,3)", javax.naming*;resolution:=optional, org.apache.commons.io*;resolution:=optional, @@ -86,6 +88,7 @@ org.apache.log4j*;resolution:=optional, org.json*;resolution:=optional, org.objectweb.asm;version="[5,8)";resolution:=optional, + org.osgi.service.blueprint;resolution:=optional, * diff --git a/activemq-osgi/src/main/resources/META-INF/spring.handlers b/activemq-osgi/src/main/resources/META-INF/spring.handlers index 900c754c9d..f819393079 100644 --- a/activemq-osgi/src/main/resources/META-INF/spring.handlers +++ b/activemq-osgi/src/main/resources/META-INF/spring.handlers @@ -18,5 +18,5 @@ # manual creation to include camel handler so we can embed camel context in xbean xml config # http\://activemq.apache.org/schema/core=org.apache.xbean.spring.context.v2.XBeanNamespaceHandler -http\://camel.apache.org/schema/spring=org.apache.camel.spring.handler.CamelNamespaceHandler -http\://camel.apache.org/schema/spring/v2.10=org.apache.camel.spring.handler.CamelNamespaceHandler +http\://camel.apache.org/schema/spring=org.apache.camel.spring.xml.handler.CamelNamespaceHandler +http\://camel.apache.org/schema/spring/v2.10=org.apache.camel.spring.xml.handler.CamelNamespaceHandler