You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2013/01/13 16:39:21 UTC
svn commit: r1432643 - in /camel/trunk: parent/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Author: cmueller
Date: Sun Jan 13 15:39:21 2013
New Revision: 1432643
URL: http://svn.apache.org/viewvc?rev=1432643&view=rev
Log:
CAMEL-5964: Camel feature file doesn't validate
Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1432643&r1=1432642&r2=1432643&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sun Jan 13 15:39:21 2013
@@ -330,6 +330,7 @@
<spring-integration-version>2.2.0.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
<spring-neo4j-version>2.1.0.RELEASE</spring-neo4j-version>
+ <spring-retry-version>1.0.2.RELEASE</spring-retry-version>
<!-- CAMEL-5768 using spring3.1.x by default -->
<spring-version>${spring31-version}</spring-version>
<spring30-version>3.0.7.RELEASE</spring30-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1432643&r1=1432642&r2=1432643&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sun Jan 13 15:39:21 2013
@@ -803,8 +803,9 @@
<bundle>mvn:org.apache.camel/camel-spring-batch/${project.version}</bundle>
</feature>
<feature name='camel-spring-integration' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.springframework.integration/spring-integration-core/${spring-integration-version}</bundle>
<feature version='${project.version}'>camel-spring</feature>
+ <bundle dependency='true'>mvn:org.springframework.retry/spring-retry/${spring-retry-version}</bundle>
+ <bundle dependency='true'>mvn:org.springframework.integration/spring-integration-core/${spring-integration-version}</bundle>
<bundle>mvn:org.apache.camel/camel-spring-integration/${project.version}</bundle>
</feature>
<feature name='camel-spring-javaconfig' version='${project.version}' resolver='(obr)' start-level='50'>