Repository: camel Updated Branches: refs/heads/master a7ac627a2 -> 8e54290c2
Upgrade vertx and spring Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8e54290c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8e54290c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8e54290c Branch: refs/heads/master Commit: 8e54290c22b46c6d6d7411c0894d9e47d419250c Parents: a7ac627 Author: Claus Ibsen <[email protected]> Authored: Fri Oct 9 07:32:08 2015 +0200 Committer: Claus Ibsen <[email protected]> Committed: Fri Oct 9 07:32:08 2015 +0200 ---------------------------------------------------------------------- parent/pom.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8e54290c/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index f08e344..fa3023c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -462,7 +462,7 @@ <spring-data-redis-version>1.6.0.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>2.0.3.RELEASE</spring-ldap-version> + <spring-ldap-version>2.0.4.RELEASE</spring-ldap-version> <spring-ldap-bundle-version>2.0.3.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> @@ -472,13 +472,14 @@ <!-- Karaf features file. --> <spring-version-range-karaf>[3.2,4)</spring-version-range-karaf> <spring-version>${spring4-version}</spring-version> - <spring32-version>3.2.13.RELEASE</spring32-version> + <spring32-version>3.2.14.RELEASE</spring32-version> <spring40-version>4.0.9.RELEASE</spring40-version> - <spring4-version>4.1.6.RELEASE</spring4-version> + <spring41-version>4.1.7.RELEASE</spring41-version> + <spring4-version>4.1.7.RELEASE</spring4-version> <spring-osgi-version>1.2.1</spring-osgi-version> <spring-security-version>3.2.8.RELEASE</spring-security-version> - <spring-ws-bundle-version>2.1.4.RELEASE</spring-ws-bundle-version> - <spring-ws-version>2.2.1.RELEASE</spring-ws-version> + <spring-ws-bundle-version>2.2.2.RELEASE_1</spring-ws-bundle-version> + <spring-ws-version>2.2.2.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> <squareup-okhttp-version>2.5.0</squareup-okhttp-version> @@ -509,7 +510,7 @@ <velocity-bundle-version>1.7_6</velocity-bundle-version> <velocity-tools-version>2.0</velocity-tools-version> <velocity-version>1.7</velocity-version> - <vertx-version>3.0.0</vertx-version> + <vertx-version>3.1.0</vertx-version> <vysper-version>0.7</vysper-version> <weld2-version>2.3.0.Final</weld2-version> <werken-xpath-bundle-version>0.9.4_5</werken-xpath-bundle-version>
