[AMQ-8309] Fix spring import range, change optional to be more flexible and avoid refresh, support Camel 3 namespace handler
diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index bf08b2a..d578d62 100644
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -206,7 +206,7 @@
org.apache.activemq.camel*;version:="${project.version}";-noimport:=true
</Export-Package>
<Import-Package>
- 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 9fb6629..feecb4a 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -26,7 +26,7 @@
<feature>aries-blueprint</feature>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_2.0_spec/1.0-alpha-2</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
<bundle dependency="true">mvn:org.jvnet.jaxb2_commons/jaxb2-basics-runtime/${jaxb-basics-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 573ba4a..67589be 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -162,7 +162,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,
@@ -175,15 +177,15 @@
org.eclipse.jetty*;resolution:=optional;version="[9.0,10)",
org.apache.zookeeper*;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,
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,
@@ -200,6 +202,7 @@
org.objectweb.asm;version="[5,8)";resolution:=optional,
mx4j.tools*;resolution:=optional,
org.slf4j*;resolution:=optional,
+ org.osgi.service.blueprint;resolution:=optional,
*
</Import-Package>
<Private-Package>
diff --git a/activemq-osgi/src/main/resources/META-INF/spring.handlers b/activemq-osgi/src/main/resources/META-INF/spring.handlers
index 900c754..f819393 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
diff --git a/activemq-osgi/src/main/resources/META-INF/spring.schemas b/activemq-osgi/src/main/resources/META-INF/spring.schemas
index 89860b6..4491643 100644
--- a/activemq-osgi/src/main/resources/META-INF/spring.schemas
+++ b/activemq-osgi/src/main/resources/META-INF/spring.schemas
@@ -71,6 +71,8 @@
http\://activemq.apache.org/schema/core/activemq-core-5.15.14.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.16.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.16.1.xsd=activemq.xsd
+http\://activemq.apache.org/schema/core/activemq-core-5.16.2.xsd=activemq.xsd
+http\://activemq.apache.org/schema/core/activemq-core-5.17.0.xsd=activemq.xsd
http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd
