Repository: camel Updated Branches: refs/heads/master c0af48134 -> a01e2bd3a
CAMEL-8407: Use bundle version of spring-ws in osgi. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/754a615c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/754a615c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/754a615c Branch: refs/heads/master Commit: 754a615c4f87d438daa202491c447cb33f4aa6f3 Parents: c0af481 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Feb 25 16:56:45 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Feb 25 16:56:45 2015 +0100 ---------------------------------------------------------------------- parent/pom.xml | 1 + platforms/karaf/features/src/main/resources/features.xml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/754a615c/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 70df6ab..1b4e47f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -441,6 +441,7 @@ <spring4-version>4.1.4.RELEASE</spring4-version> <spring-osgi-version>1.2.1</spring-osgi-version> <spring-security-version>3.2.5.RELEASE</spring-security-version> + <spring-ws-bundle-version>2.1.4.RELEASE</spring-ws-bundle-version> <spring-ws-version>2.2.0.RELEASE</spring-ws-version> <spymemcached-bundle-version>2.5_2</spymemcached-bundle-version> <!-- FIXME cmueller: not in sync! --> <spymemcached-version>2.8.4</spymemcached-version> http://git-wip-us.apache.org/repos/asf/camel/blob/754a615c/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 139fc8b..74abb47 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1358,9 +1358,9 @@ <feature version='${spring-version-range-karaf}'>spring-jms</feature> <feature version='${spring-version-range-karaf}'>spring-web</feature> <feature version='${spring-version-range-karaf}'>spring-oxm</feature> - <bundle dependency='true'>mvn:org.springframework.ws/spring-xml/${spring-ws-version}</bundle> - <bundle dependency='true'>mvn:org.springframework.ws/spring-ws-core/${spring-ws-version}</bundle> - <bundle dependency='true'>mvn:org.springframework.ws/spring-ws-support/${spring-ws-version}</bundle> + <bundle dependency='true'>mvn:org.springframework.ws/spring-xml/${spring-ws-bundle-version}</bundle> + <bundle dependency='true'>mvn:org.springframework.ws/spring-ws-core/${spring-ws-bundle-version}</bundle> + <bundle dependency='true'>mvn:org.springframework.ws/spring-ws-support/${spring-ws-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-spring-ws/${project.version}</bundle> </feature> <feature name='camel-sql' version='${project.version}' resolver='(obr)' start-level='50'>
