Make more camel-spring-xxx modules 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/de1c208c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/de1c208c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/de1c208c Branch: refs/heads/master Commit: de1c208cc701037dbc25a3132d926f8ed3ced0b2 Parents: d38e24e Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Mar 12 14:26:29 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Mar 12 14:26:29 2016 +0100 ---------------------------------------------------------------------- parent/pom.xml | 2 +- platforms/karaf/features/src/main/resources/features.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/de1c208c/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 919b64b..ef07002 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -495,7 +495,7 @@ <spring-boot-version>1.3.3.RELEASE</spring-boot-version> <spring-castor-bundle-version>1.2.0</spring-castor-bundle-version> <spring-data-commons-version>1.6.5.RELEASE</spring-data-commons-version> - <spring-data-redis-version>1.6.0.RELEASE</spring-data-redis-version> + <spring-data-redis-version>1.6.4.RELEASE</spring-data-redis-version> <spring-integration-version>4.2.3.RELEASE</spring-integration-version> <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version> <spring-ldap-version>2.0.4.RELEASE</spring-ldap-version> http://git-wip-us.apache.org/repos/asf/camel/blob/de1c208c/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 63702fd..b27b53a 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1504,10 +1504,10 @@ <bundle>mvn:org.apache.camel/camel-spring-ldap/${project.version}</bundle> </feature> <feature name='camel-spring-redis' version='${project.version}' resolver='(obr)' start-level='50'> - <details>spring-data-redis doesn't support importing spring version which is above 4.0.5 </details> + <details>camel-spring-redis only works with Spring 4.2.x</details> <feature version='${project.version}'>camel-core</feature> - <feature version='${spring-version-range}'>spring</feature> - <feature version='${spring-version-range}'>spring-tx</feature> + <feature version='${spring42-version-range}'>spring</feature> + <feature version='${spring42-version-range}'>spring-tx</feature> <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> <bundle dependency='true'>mvn:org.springframework.data/spring-data-redis/${spring-data-redis-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jedis/${jedis-client-bundle-version}</bundle>
