svn commit: r1406323 - in /servicemix/smx4/features/trunk: assemblies/apache-servicemix/src/main/filtered-resources/features.xml parent/pom.xml

[ge...@apache.org]

Author: gertv
Date: Tue Nov  6 20:58:18 2012
New Revision: 1406323

URL: http://svn.apache.org/viewvc?rev=1406323&view=rev
Log:
SMX4-1272: Error installing 'connector' and 'activiti' features - thanks to Filippo for providing the patch

Modified:
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
    servicemix/smx4/features/trunk/parent/pom.xml

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml?rev=1406323&r1=1406322&r2=1406323&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml Tue Nov  6 20:58:18 2012
@@ -24,7 +24,7 @@
 
 
     <feature name="connector" version="${version}" resolver="(obr)" start-level='50'>
-        <feature version="${aries.version}">transaction</feature>
+        <feature version="${aries.transaction.version}">transaction</feature>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo-j2ee-connector.version}</bundle>
         <bundle>mvn:org.apache.geronimo.components/geronimo-connector/${geronimo-connector.version}</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
@@ -328,7 +328,7 @@
     <!-- Activiti support -->
     <feature name="activiti" version="${activiti.version}" resolver="(obr)">
         <feature version="${cxf.version}">cxf-specs</feature>
-        <feature version="${aries.version}">transaction</feature>
+        <feature version="${aries.transaction.version}">transaction</feature>
         <feature version="${camel.version}">camel</feature>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mybatis/${mybatis.bundle.version}</bundle>

Modified: servicemix/smx4/features/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/parent/pom.xml?rev=1406323&r1=1406322&r2=1406323&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/parent/pom.xml (original)
+++ servicemix/smx4/features/trunk/parent/pom.xml Tue Nov  6 20:58:18 2012
@@ -46,6 +46,7 @@
 
     <karaf.version>2.2.9</karaf.version>
     <aries.version>0.3</aries.version>
+    <aries.transaction.version>0.3.1</aries.transaction.version>
     <pax.logging.version>1.6.5</pax.logging.version>
 
     <servicemix.components.version>2012.01-SNAPSHOT</servicemix.components.version>