This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch boot2ga
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/boot2ga by this push:
new dde7820 CAMEL-12430: Fixed Karaf test of spring-ldap
dde7820 is described below
commit dde7820d031c7da662a65678f4559bd95b7d5bb2
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Apr 10 16:51:32 2018 +0200
CAMEL-12430: Fixed Karaf test of spring-ldap
---
platforms/karaf/features/src/main/resources/features.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index d4fbf02..ad18199 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2063,9 +2063,9 @@
<feature name='camel-spring-ldap' version='${project.version}'
resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature>transaction</feature>
- <feature version='${spring42-version-range}'>spring</feature>
- <feature version='${spring42-version-range}'>spring-jdbc</feature>
- <feature version='${spring42-version-range}'>spring-tx</feature>
+ <feature version='${spring-version-range}'>spring</feature>
+ <feature version='${spring-version-range}'>spring-jdbc</feature>
+ <feature version='${spring-version-range}'>spring-tx</feature>
<bundle
dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle
dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.commons/commons-pool2/${commons-pool2-version}</bundle>
@@ -2073,14 +2073,14 @@
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-ldap/${spring-ldap-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-batch-core/${spring-batch-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-batch-infrastructure/${spring-batch-bundle-version}</bundle>
- <bundle
dependency='true'>mvn:org.springframework.data/spring-data-commons/${spring-data-commons-version}</bundle>
+ <bundle
dependency='true'>wrap:mvn:org.springframework.data/spring-data-commons/${spring-data-commons-version}</bundle>
<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>Does not work with Karaf 4.1.x due KARAF-4921, but work with
Karaf 4.2.x</details>
<feature version='${project.version}'>camel-core</feature>
- <feature version='${spring42-version-range}'>spring</feature>
- <feature version='${spring42-version-range}'>spring-tx</feature>
+ <feature version='${spring-version-range}'>spring</feature>
+ <feature version='${spring-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.springframework.data/spring-data-keyvalue/${spring-data-keyvalue-version}</bundle>
--
To stop receiving notification emails like this one, please contact
davscl...@apache.org.
