More features can install in karaf
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/842efc1e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/842efc1e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/842efc1e Branch: refs/heads/master Commit: 842efc1e96b85c024e6adf1d31c290b6adfc14ed Parents: 501e437 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Mar 15 14:04:36 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Mar 15 14:04:36 2016 +0100 ---------------------------------------------------------------------- components/camel-spring-javaconfig/pom.xml | 5 +++++ platforms/karaf/features/src/main/resources/features.xml | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/842efc1e/components/camel-spring-javaconfig/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-javaconfig/pom.xml b/components/camel-spring-javaconfig/pom.xml index d9601e3..905c5d1 100644 --- a/components/camel-spring-javaconfig/pom.xml +++ b/components/camel-spring-javaconfig/pom.xml @@ -30,6 +30,11 @@ <packaging>bundle</packaging> <properties> + <!-- camel-spring uses spring-dm that is spring 3.x --> + <camel.osgi.import> + org.springframework*;version="${spring-dm-version-range}", + * + </camel.osgi.import> <camel.osgi.export.pkg>org.apache.camel.spring.javaconfig.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/842efc1e/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 d6c7713..f4d0708 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1471,7 +1471,6 @@ </feature> <feature name='camel-spring-javaconfig' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-spring</feature> - <feature version='${spring-version-range}'>spring-test</feature> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-spring-javaconfig/${project.version}</bundle> </feature>
