Upgraded spring-ldap
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/eedd2111 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eedd2111 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eedd2111 Branch: refs/heads/master Commit: eedd21114df350ba3d1adf2d1c0713b902151199 Parents: 5d5a1ef Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Feb 7 07:49:51 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Feb 7 07:49:51 2015 +0100 ---------------------------------------------------------------------- components/camel-spring-ldap/pom.xml | 30 ++++++++++++-------- parent/pom.xml | 8 +++--- .../features/src/main/resources/features.xml | 1 + 3 files changed, 23 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/eedd2111/components/camel-spring-ldap/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-ldap/pom.xml b/components/camel-spring-ldap/pom.xml index c4f03ae..00eaec7 100644 --- a/components/camel-spring-ldap/pom.xml +++ b/components/camel-spring-ldap/pom.xml @@ -1,14 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor - license agreements. See the NOTICE file distributed with this work for additional - information regarding copyright ownership. The ASF licenses this file to - You under the Apache License, Version 2.0 (the "License"); you may not use - this file except in compliance with the License. You may obtain a copy of - the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required - by applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS - OF ANY KIND, either express or implied. See the License for the specific - language governing permissions and limitations under the License. --> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> @@ -24,8 +30,8 @@ <properties> <camel.osgi.import.before.defaults> - org.springframework.ldap.*;version="[1.3,1.4)", - org.springframework.transaction.compensating.*;version="[1.3,1.4)" + org.springframework.ldap.*;version="[2,3)", + org.springframework.transaction.compensating.*;version="[2,3)" </camel.osgi.import.before.defaults> <camel.osgi.export.pkg>org.apache.camel.component.springldap.*</camel.osgi.export.pkg> <camel.osgi.export.service> http://git-wip-us.apache.org/repos/asf/camel/blob/eedd2111/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 4878540..da1f558 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -420,12 +420,12 @@ <spring-batch-version>2.2.7.RELEASE</spring-batch-version> <spring-boot-version>1.2.1.RELEASE</spring-boot-version> <spring-castor-bundle-version>1.2.0</spring-castor-bundle-version> - <spring-data-commons-version>1.5.0.RELEASE</spring-data-commons-version> + <spring-data-commons-version>1.6.1.RELEASE</spring-data-commons-version> <spring-data-redis-version>1.3.4.RELEASE</spring-data-redis-version> <spring-integration-version>2.2.6.RELEASE</spring-integration-version> <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version> - <spring-ldap-version>1.3.1.RELEASE</spring-ldap-version> - <spring-ldap-bundle-version>1.3.1.RELEASE_2</spring-ldap-bundle-version> + <spring-ldap-version>2.0.2.RELEASE</spring-ldap-version> + <spring-ldap-bundle-version>2.0.2.RELEASE_1</spring-ldap-bundle-version> <spring-retry-version>1.0.3.RELEASE</spring-retry-version> <!-- Spring 4 can be used in OSGi, but not with spring-dm. Allow Spring 4 for the bundle imports. --> <spring-version-range>[3.2,5)</spring-version-range> @@ -438,7 +438,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-version>2.1.4.RELEASE</spring-ws-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> <sshd-version>0.13.0</sshd-version> http://git-wip-us.apache.org/repos/asf/camel/blob/eedd2111/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 3258727..5b4fb2a 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1312,6 +1312,7 @@ <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.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.springframework.batch/spring-batch-core/${spring-batch-version}</bundle> <bundle dependency='true'>mvn:org.springframework.batch/spring-batch-infrastructure/${spring-batch-version}</bundle> <bundle>mvn:org.apache.camel/camel-spring-ldap/${project.version}</bundle>
