Repository: camel Updated Branches: refs/heads/master 05c983301 -> d1bac6738
More karaf features validates Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d1bac673 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d1bac673 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d1bac673 Branch: refs/heads/master Commit: d1bac6738a3838f62afc14ed95eb66ee585c6fc0 Parents: 05c9833 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Mar 15 11:23:26 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Mar 15 11:23:32 2016 +0100 ---------------------------------------------------------------------- platforms/karaf/features/src/main/resources/features.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d1bac673/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 b46eb74..e40c1c0 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -56,6 +56,7 @@ <bundle>mvn:org.apache.camel.karaf/camel-karaf-commands-catalog/${project.version}</bundle> </feature> <feature name='camel-blueprint' version='${project.version}' resolver='(obr)' start-level='50'> + <feature>aries-blueprint</feature> <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-blueprint/${project.version}</bundle> </feature> @@ -332,13 +333,14 @@ <bundle>mvn:org.apache.camel/camel-csv/${project.version}</bundle> </feature> <feature name='camel-cxf' version='${project.version}' resolver='(obr)' start-level='50'> + <feature version='${project.version}'>camel-blueprint</feature> + <feature version='${project.version}'>camel-spring</feature> <feature version='${cxf-version-range}'>cxf-core</feature> <feature version='${cxf-version-range}'>cxf-jaxrs</feature> <feature version='${cxf-version-range}'>cxf-jaxws</feature> <feature version='${cxf-version-range}'>cxf-http-jetty</feature> <feature version='${cxf-version-range}'>cxf-databinding-jaxb</feature> <feature version='${cxf-version-range}'>cxf-bindings-soap</feature> - <feature version='${project.version}'>camel-spring</feature> <bundle>mvn:org.apache.camel/camel-cxf-transport/${project.version}</bundle> <bundle>mvn:org.apache.camel/camel-cxf/${project.version}</bundle> </feature> @@ -1271,11 +1273,11 @@ </feature> <feature name='camel-restlet' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>mvn:http://maven.restlet.org!org.restlet.osgi/org.restlet/${restlet-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> - <bundle dependency='true'>mvn:http://maven.restlet.org!org.restlet.osgi/org.restlet.ext.httpclient/${restlet-version}</bundle> + <bundle dependency='true'>mvn:http://maven.restlet.org@id=restlet!org.restlet.osgi/org.restlet/${restlet-version}</bundle> + <bundle dependency='true'>mvn:http://maven.restlet.org@id=restlet!org.restlet.osgi/org.restlet.ext.httpclient/${restlet-version}</bundle> <bundle>mvn:org.apache.camel/camel-restlet/${project.version}</bundle> </feature> <feature name='camel-rmi' version='${project.version}' resolver='(obr)' start-level='50'>
