You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2021/08/03 05:19:40 UTC
[activemq] branch activemq-5.16.x updated: [AMQ-8309] Upgrade
features and import to avoid cascading refresh
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.16.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.16.x by this push:
new 856d37d [AMQ-8309] Upgrade features and import to avoid cascading refresh
new 6c4c94b Merge pull request #676 from jbonofre/AMQ-8309-516
856d37d is described below
commit 856d37df0ecd163a53a104bfd5b1f683c7fa2fd7
Author: jbonofre <jb...@apache.org>
AuthorDate: Sun Jul 4 07:28:19 2021 +0200
[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 ++++++++-----
activemq-osgi/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 3b1a696..37b5b3f 100644
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -32,7 +32,7 @@
<properties>
<activemq.osgi.import.pkg>
- 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 f32a351..ac1eb45 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -22,11 +22,11 @@
<!-- Bundles needed if only client will be deployed in the container -->
<feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}">
- <feature version="[4,5)">spring</feature>
+ <feature version="[4,6)">spring</feature>
<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 aafbe12..66693ce 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,
*
</activemq.osgi.import.pkg>
<activemq.osgi.export>
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