Repository: camel Updated Branches: refs/heads/master 27eb1679a -> cf95dbfa2
camel-spring OSGi is spring-dm so use the spring-dm version range of spring Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cf95dbfa Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cf95dbfa Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cf95dbfa Branch: refs/heads/master Commit: cf95dbfa2d6fc8e61ccde6993805b06a9f827852 Parents: 27eb167 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Mar 15 10:49:16 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Mar 15 10:49:16 2016 +0100 ---------------------------------------------------------------------- components/camel-spring/pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/cf95dbfa/components/camel-spring/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml index a00a514..6d7ab01 100644 --- a/components/camel-spring/pom.xml +++ b/components/camel-spring/pom.xml @@ -30,6 +30,7 @@ <packaging>bundle</packaging> <properties> + <!-- spring-dm only supports spring 3.x so we need to import that range --> <camel.osgi.import> !org.apache.camel.spring.*, !org.apache.camel.osgi.*, @@ -38,6 +39,7 @@ !org.apache.camel.language.spel, org.apache.camel.*;${camel.osgi.import.strict.version}, org.springframework.osgi.*;version="[1.2,2)", + org.springframework*;version="${spring-dm-version-range}", org.osgi.service.event;resolution:=optional, ${camel.osgi.import.defaults}, * @@ -61,7 +63,7 @@ org.apache.camel.osgi.Activator </camel.osgi.activator> <!-- do not skip any tests by default --> - <platform.skip.tests /> + <platform.skip.tests/> </properties> <dependencies>
