Updated Branches: refs/heads/camel-2.10.x 00b8cd9b4 -> ced7d77c5
CAMEL-6496: Upgrade the features.xml file to Apache CXF 2.6.8 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ced7d77c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ced7d77c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ced7d77c Branch: refs/heads/camel-2.10.x Commit: ced7d77c5adc22c0d1ff7b39b323a2d6052518c3 Parents: 00b8cd9 Author: cmueller <cmuel...@apache.org> Authored: Thu Jun 27 22:34:00 2013 +0200 Committer: cmueller <cmuel...@apache.org> Committed: Thu Jun 27 22:34:00 2013 +0200 ---------------------------------------------------------------------- platforms/karaf/features/pom.xml | 1 - platforms/karaf/features/src/main/resources/features.xml | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ced7d77c/platforms/karaf/features/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml index 058d418..e94670c 100644 --- a/platforms/karaf/features/pom.xml +++ b/platforms/karaf/features/pom.xml @@ -53,7 +53,6 @@ <commons-math-version>2.2</commons-math-version> <commons-dbcp-bundle-version>1.4_3</commons-dbcp-bundle-version> <commons-lang-version-xmljson>2.5</commons-lang-version-xmljson> - <cxf-features-version>2.6.6.1</cxf-features-version> <dom4j-bundle-version>1.6.1_5</dom4j-bundle-version> <el-api-1.0-version>1.0.1</el-api-1.0-version> <ezmorph-bundle-version>1.0.6_1</ezmorph-bundle-version> http://git-wip-us.apache.org/repos/asf/camel/blob/ced7d77c/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 1719e42..f4d0bb2 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -18,8 +18,7 @@ --> <features name='camel-${project.version}'> - <repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf-features-version}/xml/features</repository> - <!-- repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features</repository --> + <repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features</repository> <repository>mvn:org.jclouds.karaf/jclouds-karaf/${jclouds-feature-version}/xml/features</repository> <feature name='xml-specs-api' version='${servicemix-specs-version}' resolver='(obr)' start-level='10'>