CAMEL-7716 Upgrade to commons-csv 1.1 and fix karaf feature for camel-csv
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7d91940b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7d91940b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7d91940b Branch: refs/heads/master Commit: 7d91940bf3a533f2299ab3407b7af66d5eeb3682 Parents: 3af1165 Author: Antoine DESSAIGNE <antoine.dessai...@gmail.com> Authored: Mon Nov 24 09:51:46 2014 +0100 Committer: Antoine DESSAIGNE <antoine.dessai...@gmail.com> Committed: Wed Nov 26 15:21:20 2014 +0100 ---------------------------------------------------------------------- parent/pom.xml | 2 +- platforms/karaf/features/src/main/resources/features.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7d91940b/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 42fc1f5..94ed548 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -91,7 +91,7 @@ <commons-compress-version>1.5</commons-compress-version> <commons-configuration-version>1.9</commons-configuration-version> <commons-configuration-bundle-version>1.9_1</commons-configuration-bundle-version> - <commons-csv-version>1.0</commons-csv-version> + <commons-csv-version>1.1</commons-csv-version> <commons-cli-version>1.2</commons-cli-version> <commons-daemon-version>1.0.15</commons-daemon-version> <commons-dbcp-bundle-version>1.4_3</commons-dbcp-bundle-version> http://git-wip-us.apache.org/repos/asf/camel/blob/7d91940b/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 89a00d0..15168ce 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -264,7 +264,7 @@ <bundle>mvn:org.apache.camel/camel-crypto/${project.version}</bundle> </feature> <feature name='camel-csv' version='${project.version}' resolver='(obr)' start-level='50'> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-csv/${commons-csv-bundle-version}</bundle> + <bundle dependency='true'>mvn:org.apache.commons/commons-csv/${commons-csv-version}</bundle> <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-csv/${project.version}</bundle> </feature>
