Repository: camel Updated Branches: refs/heads/master c581e7131 -> 2ac6bf92e
camel-test-spring 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/2ac6bf92 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ac6bf92 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ac6bf92 Branch: refs/heads/master Commit: 2ac6bf92eae55ae6f56ee221ce82187501ad2d3a Parents: c581e71 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Mar 15 11:15:16 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Mar 15 11:15:16 2016 +0100 ---------------------------------------------------------------------- components/camel-test-spring/pom.xml | 6 ++++++ platforms/karaf/features/src/main/resources/features.xml | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2ac6bf92/components/camel-test-spring/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-spring/pom.xml b/components/camel-test-spring/pom.xml index ba73e02..e66b53e 100644 --- a/components/camel-test-spring/pom.xml +++ b/components/camel-test-spring/pom.xml @@ -31,7 +31,13 @@ <description>Camel Testing Library using JUnit and Spring 4.1+</description> <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.test.spring.*</camel.osgi.export.pkg> + <spring-version>${spring4-version}</spring-version> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/2ac6bf92/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 c480aae..b46eb74 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -50,6 +50,7 @@ </feature> <feature name='camel-catalog' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> + <feature>shell</feature> <bundle>mvn:org.apache.camel/camel-commands-core/${project.version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-karaf-commands/${project.version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-karaf-commands-catalog/${project.version}</bundle> @@ -1622,7 +1623,7 @@ </feature> <feature name='camel-test-spring' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-spring</feature> - <feature version='${spring-version-range}'>spring-test</feature> + <feature version='${spring-dm-version-range}'>spring-test</feature> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-test/${project.version}</bundle> <bundle>mvn:org.apache.camel/camel-test-spring/${project.version}</bundle>
