Author: ningjiang
Date: Tue Nov 15 14:47:54 2011
New Revision: 1202214
URL: http://svn.apache.org/viewvc?rev=1202214&view=rev
Log:
CAMEL-4684 Using commons-io 1.4 across camel components
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
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=1202214&r1=1202213&r2=1202214&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Nov 15 14:47:54 2011
@@ -77,6 +77,7 @@
<feature name='camel-crypto' version='${pom.version}' resolver='(obr)'
start-level='50'>
<feature version='${pom.version}'>camel-core</feature>
<bundle
dependency="true">mvn:commons-codec/commons-codec/${commons-codec}</bundle>
+ <bundle
dependency="true">mvn:commons-io/commons-io/${commons-io-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcpg-jdk16/${bcpg-jdk16-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-crypto/${pom.version}</bundle>
</feature>
@@ -229,8 +230,7 @@
<feature name='camel-exec' version='${pom.version}' resolver='(obr)'
start-level='50'>
<feature version='${pom.version}'>camel-core</feature>
<bundle
dependency="true">mvn:org.apache.commons/commons-exec/${commons-exec-version}</bundle>
- <!-- Force the commons-io version as it's specific to camel-exec -->
- <bundle dependency="true">mvn:commons-io/commons-io/1.4</bundle>
+ <bundle
dependency="true">mvn:commons-io/commons-io/${commons-io-version}</bundle>
<bundle>mvn:org.apache.camel/camel-exec/${pom.version}</bundle>
</feature>
<feature name='camel-flatpack' version='${pom.version}' resolver='(obr)'
start-level='50'>
