Author: janstey
Date: Tue Aug 28 16:39:31 2012
New Revision: 1378213
URL: http://svn.apache.org/viewvc?rev=1378213&view=rev
Log:
Use same ServiceMix specs version as Camel
Modified:
activemq/trunk/activemq-karaf/pom.xml
activemq/trunk/activemq-karaf/src/main/resources/features.xml
Modified: activemq/trunk/activemq-karaf/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/pom.xml?rev=1378213&r1=1378212&r2=1378213&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/pom.xml (original)
+++ activemq/trunk/activemq-karaf/pom.xml Tue Aug 28 16:39:31 2012
@@ -36,7 +36,7 @@
<jdom-bundle-version>1.1_4</jdom-bundle-version>
<dom4j-bundle-version>1.6.1_2</dom4j-bundle-version>
<xstream-bundle-version>1.3_3</xstream-bundle-version>
- <servicemix.specs.version>1.8.0</servicemix.specs.version>
+ <servicemix.specs.version>1.9.0</servicemix.specs.version>
<pax-exam-version>1.2.4</pax-exam-version>
</properties>
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=1378213&r1=1378212&r2=1378213&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Tue Aug 28
16:39:31 2012
@@ -30,7 +30,7 @@
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_3</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.7_1</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.6_1</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/1.9.0</bundle>
+ <bundle
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
<bundle
dependency="true">mvn:joda-time/joda-time/${jodatime-bundle-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
