Repository: camel Updated Branches: refs/heads/master e5af49da3 -> 96b1de6c7
CAMEL-9334: Upgrade to spring 4.2.x and spring-boot 1.3.x Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/96b1de6c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/96b1de6c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/96b1de6c Branch: refs/heads/master Commit: 96b1de6c716e525b69218a6410b35beaf9106de8 Parents: e5af49d Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Nov 18 09:23:43 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Nov 18 09:23:43 2015 +0100 ---------------------------------------------------------------------- components/camel-test-spring3/pom.xml | 2 +- components/camel-test-spring40/pom.xml | 2 +- parent/pom.xml | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/96b1de6c/components/camel-test-spring3/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-spring3/pom.xml b/components/camel-test-spring3/pom.xml index c370a29..4cea0fb 100644 --- a/components/camel-test-spring3/pom.xml +++ b/components/camel-test-spring3/pom.xml @@ -27,7 +27,7 @@ <artifactId>camel-test-spring3</artifactId> <packaging>bundle</packaging> - <name>Camel :: Test :: Spring 3.x</name> + <name>Camel :: Test :: Spring 3.x (deprecated)</name> <description>Camel Testing Library using JUnit and Spring 3.x</description> <properties> http://git-wip-us.apache.org/repos/asf/camel/blob/96b1de6c/components/camel-test-spring40/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-spring40/pom.xml b/components/camel-test-spring40/pom.xml index 3d07ff0..c7eec66 100644 --- a/components/camel-test-spring40/pom.xml +++ b/components/camel-test-spring40/pom.xml @@ -27,7 +27,7 @@ <artifactId>camel-test-spring40</artifactId> <packaging>bundle</packaging> - <name>Camel :: Test :: Spring 4.0</name> + <name>Camel :: Test :: Spring 4.0 (deprecated)</name> <description>Camel Testing Library using JUnit and Spring 4.0</description> <properties> http://git-wip-us.apache.org/repos/asf/camel/blob/96b1de6c/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 92d471e..d85a7ae 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -464,7 +464,7 @@ <splunk-version>1.5.0.0_1</splunk-version> <spring-batch-version>3.0.4.RELEASE</spring-batch-version> <spring-batch-bundle-version>3.0.4.RELEASE_1</spring-batch-bundle-version> - <spring-boot-version>1.2.7.RELEASE</spring-boot-version> + <spring-boot-version>1.3.0.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> @@ -480,10 +480,11 @@ <!-- Karaf features file. --> <spring-version-range-karaf>[3.2,4)</spring-version-range-karaf> <spring-version>${spring4-version}</spring-version> - <spring32-version>3.2.14.RELEASE</spring32-version> + <spring32-version>3.2.15.RELEASE</spring32-version> <spring40-version>4.0.9.RELEASE</spring40-version> <spring41-version>4.1.8.RELEASE</spring41-version> - <spring4-version>4.1.8.RELEASE</spring4-version> + <spring42-version>4.2.3.RELEASE</spring42-version> + <spring4-version>4.2.3.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.2.2.RELEASE_1</spring-ws-bundle-version>
