Author: dejanb
Date: Thu Mar 24 12:35:50 2011
New Revision: 1084933
URL: http://svn.apache.org/viewvc?rev=1084933&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3142 - use 5.4.2 activemq-karaf for
2.1.x compatibility
Modified:
activemq/trunk/activemq-karaf/src/main/resources/features-2.1.xml
Modified: activemq/trunk/activemq-karaf/src/main/resources/features-2.1.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features-2.1.xml?rev=1084933&r1=1084932&r2=1084933&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features-2.1.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features-2.1.xml Thu Mar
24 12:35:50 2011
@@ -18,7 +18,6 @@
-->
<features name="activemq-${activemq-version}">
- <repository>mvn:org.apache.karaf/apache-karaf/2.1.0/xml/features</repository>
<feature name="activemq" version="${activemq-version}">
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
@@ -37,9 +36,7 @@
<bundle>mvn:org.apache.activemq/activemq-console/${activemq-version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-ra/${activemq-version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-pool/${activemq-version}</bundle>
-
<bundle>mvn:org.apache.felix/org.apache.felix.gogo.command/0.8.0</bundle>
-
<bundle>mvn:org.apache.felix/org.apache.felix.gogo.runtime/0.8.0</bundle>
-
<bundle>mvn:org.apache.activemq/activemq-karaf/${activemq-version}</bundle>
+ <bundle>mvn:org.apache.activemq/activemq-karaf/5.4.2</bundle> <!-- use
the old one for compatibility reasons -->
<bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-version}</bundle>
</feature>
