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

AMQ-7146 - Support Spring 5 in OSGi

This commit is contained in:
Guillaume Nodet 2019-02-05 11:40:54 +01:00
parent 0a93863c0b
commit c628357f91
3 changed files with 6 additions and 6 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> <properties>
<activemq.osgi.import.pkg> <activemq.osgi.import.pkg>
org.springframework.jms*;version="[4,5)", org.springframework.jms*;version="[4,6)",
org.apache.activemq.pool, org.apache.activemq.pool,
org.apache.camel*;version="${camel-version-range}", org.apache.camel*;version="${camel-version-range}",
* *

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

@ -21,11 +21,11 @@
<features name="activemq-core-${project.version}"> <features name="activemq-core-${project.version}">
<!-- In order to work with any Karaf version, the user has to add spring-legacy features repo by hand corresponding to his Karaf version --> <!-- In order to work with any Karaf version, the user has to add spring-legacy features repo by hand corresponding to his Karaf version -->
<!-- <repository>mvn:org.apache.karaf.features/spring-legacy/[4,5)/xml/features</repository> --> <!-- <repository>mvn:org.apache.karaf.features/spring-legacy/[4,6)/xml/features</repository> -->
<!-- Bundles needed if only client will be deployed in the container --> <!-- Bundles needed if only client will be deployed in the container -->
<feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}" resolver="(obr)" start-level="50"> <feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}" resolver="(obr)" start-level="50">
<feature version="[4,5)">spring</feature> <feature version="[4,6)">spring</feature>
<feature version="[4,5)">shell-compat</feature> <feature version="[4,5)">shell-compat</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-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-jta_1.1_spec/1.1.1</bundle>

6
activemq-osgi/pom.xml
View File

@ -57,9 +57,9 @@
org.apache.zookeeper*;resolution:=optional, org.apache.zookeeper*;resolution:=optional,
org.fusesource.leveldbjni*;resolution:=optional, org.fusesource.leveldbjni*;resolution:=optional,
org.fusesource.hawtjni*;resolution:=optional, org.fusesource.hawtjni*;resolution:=optional,
org.springframework.jms*;version="[4,5)";resolution:=optional, org.springframework.jms*;version="[4,6)";resolution:=optional,
org.springframework.transaction*;version="[4,5)";resolution:=optional, org.springframework.transaction*;version="[4,6)";resolution:=optional,
org.springframework*;version="[4,5)";resolution:=optional, org.springframework*;version="[4,6)";resolution:=optional,
org.xmlpull*;resolution:=optional, org.xmlpull*;resolution:=optional,
scala*;resolution:=optional, scala*;resolution:=optional,
javax.annotation*, javax.annotation*,