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

Revert "https://issues.apache.org/jira/browse/AMQ-6136" 

This reverts commit 4ee29c363f.

We need to remove the dependency on Spring DM before doing this

(cherry picked from commit 7eb25ec50b)
This commit is contained in:
Christopher L. Shannon (cshannon) 2016-01-29 14:57:11 +00:00
parent b47d544f3f
commit 0ebc7a4da8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@
<!-- 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="[3.2,5)">spring</feature> <feature version="[3.2,4)">spring</feature>
<feature>spring-dm</feature> <feature>spring-dm</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>