Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #676 from jbonofre/AMQ-8309-516 

[AMQ-8309] Upgrade features and import to avoid cascading refresh
This commit is contained in:
Jean-Baptiste Onofré 2021-08-03 07:19:32 +02:00 committed by GitHub
parent 380718cab9 856d37df0e
commit 6c4c94bb8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-camel/pom.xml
View File

@ -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}",
*

4
activemq-karaf/src/main/resources/features-core.xml
View File

@ -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>

13
activemq-osgi/pom.xml
View File

@ -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>

4
activemq-osgi/src/main/resources/META-INF/spring.handlers
View File

@ -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