You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2012/02/27 21:44:18 UTC
svn commit: r1294318 - in /activemq/trunk:
activemq-karaf/src/main/resources/features.xml pom.xml
Author: tabish
Date: Mon Feb 27 20:44:17 2012
New Revision: 1294318
URL: http://svn.apache.org/viewvc?rev=1294318&view=rev
Log:
apply fix for: https://issues.apache.org/jira/browse/AMQ-3740
Modified:
activemq/trunk/activemq-karaf/src/main/resources/features.xml
activemq/trunk/pom.xml
Modified: activemq/trunk/activemq-karaf/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features.xml?rev=1294318&r1=1294317&r2=1294318&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Mon Feb 27 20:44:17 2012
@@ -20,9 +20,9 @@
<features name="activemq-${activemq-version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
<feature name="activemq" version="${activemq-version}" resolver="(obr)">
<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-j2ee-management_1.1_spec/1.0.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-j2ee-management_1.1_spec/1.0.1</bundle>
<bundle dependency="true">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/2.4_4</bundle>
@@ -36,28 +36,29 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
- <bundle>mvn:org.apache.activemq/activemq-core/${activemq-version}</bundle>
- <bundle>mvn:org.apache.activemq/kahadb/${activemq-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-version}</bundle>
+ <bundle>mvn:org.apache.activemq/activemq-core/${activemq-version}</bundle>
+ <bundle>mvn:org.apache.activemq/kahadb/${activemq-version}</bundle>
<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-ra/${activemq-version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-pool/${activemq-version}</bundle>
- <bundle>mvn:org.apache.activemq/activemq-karaf/${activemq-version}</bundle>
+ <bundle>mvn:org.apache.activemq/activemq-karaf/${activemq-version}</bundle>
<bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-version}</bundle>
</feature>
<feature name="activemq-spring" version="${activemq-version}" resolver="(obr)">
- <feature version="[1,2)">spring-dm</feature>
- <feature version="${activemq-version}">activemq</feature>
- <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
- <bundle>mvn:org.apache.activemq/activemq-spring/${activemq-version}</bundle>
+ <feature version="[1,2)">spring-dm</feature>
+ <feature version="${activemq-version}">activemq</feature>
+ <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
+ <bundle>mvn:org.apache.activemq/activemq-spring/${activemq-version}</bundle>
</feature>
<feature name="activemq-blueprint" version="${activemq-version}" resolver="(obr)">
- <feature version="${activemq-version}">activemq</feature>
+ <feature version="${activemq-version}">activemq</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-jexl/2.0.1</bundle>
- <bundle dependency="true">mvn:org.apache.xbean/xbean-blueprint/${xbean-version}</bundle>
- <bundle>mvn:org.apache.activemq/activemq-blueprint/${activemq-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.xbean/xbean-blueprint/${xbean-version}</bundle>
+ <bundle>mvn:org.apache.activemq/activemq-blueprint/${activemq-version}</bundle>
</feature>
<feature name="activemq-optional" version="${activemq-version}" resolver="(obr)">
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1294318&r1=1294317&r2=1294318&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Mon Feb 27 20:44:17 2012
@@ -43,7 +43,7 @@
<annogen-version>0.1.0</annogen-version>
<ant-version>1.8.2</ant-version>
<aopalliance-version>1.0</aopalliance-version>
- <aries-version>0.2-incubating</aries-version>
+ <aries-version>0.3</aries-version>
<axion-version>1.0-M3-dev</axion-version>
<axis-version>1.4.2</axis-version>
<camel-version>2.9.0</camel-version>