Updated Branches: refs/heads/master 8d73838a4 -> 80a14c8af
make sure the solr feature use the same commons-io version as other features Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/80a14c8a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/80a14c8a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/80a14c8a Branch: refs/heads/master Commit: 80a14c8af863c15c012f2a3a290e21dd7e856f84 Parents: 8d73838 Author: cmueller <cmuel...@apache.org> Authored: Tue Oct 1 22:10:20 2013 +0200 Committer: cmueller <cmuel...@apache.org> Committed: Tue Oct 1 22:10:20 2013 +0200 ---------------------------------------------------------------------- platforms/karaf/features/src/main/resources/features.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/80a14c8a/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 558b935..8499b9e 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -898,7 +898,7 @@ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.solr-solrj/${solr-bundle-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle> - <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-solr/${project.version}</bundle> </feature> <feature name='camel-spring-batch' version='${project.version}' resolver='(obr)' start-level='50'>