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/07/24 15:20:44 UTC

svn commit: r1365036 - in /activemq/trunk: activemq-karaf/src/main/resources/features.xml pom.xml

Author: tabish
Date: Tue Jul 24 13:20:44 2012
New Revision: 1365036

URL: http://svn.apache.org/viewvc?rev=1365036&view=rev
Log:
fix for: https://issues.apache.org/jira/browse/AMQ-3859

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=1365036&r1=1365035&r2=1365036&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Tue Jul 24 13:20:44 2012
@@ -69,7 +69,7 @@
 
     <feature name="activemq-camel" version="${activemq-version}" resolver="(obr)">
         <feature version="${activemq-version}">activemq</feature>
-        <feature version="${camel-version}">camel-jms</feature>
+        <feature version="${camel-version-range}">camel-jms</feature>
         <bundle>mvn:org.apache.activemq/activemq-camel/${activemq-version}</bundle>
     </feature>
 

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1365036&r1=1365035&r2=1365036&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Tue Jul 24 13:20:44 2012
@@ -47,6 +47,7 @@
     <axion-version>1.0-M3-dev</axion-version>
     <axis-version>1.4.2</axis-version>
     <camel-version>2.9.2</camel-version>
+    <camel-version-range>2.9,3</camel-version-range>
     <cglib-version>2.0</cglib-version>
     <openjpa-version>1.2.0</openjpa-version>
     <commons-beanutils-version>1.8.3</commons-beanutils-version>
@@ -1165,7 +1166,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore></ignore>
+                    <execute></execute>
                   </action>
                 </pluginExecution>
               </pluginExecutions>