You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/11/09 13:20:28 UTC
camel git commit: Upgrade spring ldap
Repository: camel
Updated Branches:
refs/heads/master 201a2e174 -> 33063a86c
Upgrade spring ldap
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/33063a86
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/33063a86
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/33063a86
Branch: refs/heads/master
Commit: 33063a86c9511e57e774bf5024d9921c33b35137
Parents: 201a2e1
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Nov 9 14:20:20 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Nov 9 14:20:20 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 6 +++---
platforms/karaf/features/src/main/resources/features.xml | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/33063a86/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2368027..fe15f4d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -545,12 +545,12 @@
<spring-batch-bundle-version>3.0.7.RELEASE_1</spring-batch-bundle-version>
<spring-boot-version>1.4.2.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-commons-version>1.11.6.RELEASE</spring-data-commons-version>
<spring-data-redis-version>1.7.5.RELEASE</spring-data-redis-version>
<spring-integration-version>4.3.5.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
- <spring-ldap-version>2.0.4.RELEASE</spring-ldap-version>
- <spring-ldap-bundle-version>2.0.4.RELEASE_2</spring-ldap-bundle-version>
+ <spring-ldap-version>2.1.0.RELEASE</spring-ldap-version>
+ <spring-ldap-bundle-version>2.1.0.RELEASE_1</spring-ldap-bundle-version>
<!-- spring 1.1.0 is not OSGi bundle any more -->
<spring-retry-version>1.0.3.RELEASE</spring-retry-version>
<!-- spring-dm only supports spring 3.x -->
http://git-wip-us.apache.org/repos/asf/camel/blob/33063a86/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 3fd9548..3d1f708 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1657,19 +1657,19 @@
<bundle>mvn:org.apache.camel/camel-spring-javaconfig/${project.version}</bundle>
</feature>
<feature name='camel-spring-ldap' version='${project.version}' resolver='(obr)' start-level='50'>
- <details>camel-spring-ldap only works with Spring 4.0.x</details>
<feature version='${project.version}'>camel-core</feature>
<feature>transaction</feature>
- <feature version='${spring40-version-range}'>spring</feature>
- <feature version='${spring40-version-range}'>spring-jdbc</feature>
- <feature version='${spring40-version-range}'>spring-tx</feature>
+ <feature version='${spring42-version-range}'>spring</feature>
+ <feature version='${spring42-version-range}'>spring-jdbc</feature>
+ <feature version='${spring42-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>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-ldap/${spring-ldap-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.springframework.data/spring-data-commons/${spring-data-commons-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>mvn:org.apache.camel/camel-spring-ldap/${project.version}</bundle>
</feature>
<feature name='camel-spring-redis' version='${project.version}' resolver='(obr)' start-level='50'>