Repository: camel Updated Branches: refs/heads/master 90b897d6c -> b3c3282d9
Upgrade spring and removed not used spring 32 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b3c3282d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b3c3282d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b3c3282d Branch: refs/heads/master Commit: b3c3282d9536b655f1bebe9e82bd278ced0b1a81 Parents: f56dfea Author: Claus Ibsen <davscl...@apache.org> Authored: Sat May 7 09:21:59 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat May 7 09:22:09 2016 +0200 ---------------------------------------------------------------------- parent/pom.xml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b3c3282d/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index f133faf..8f72d11 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -522,18 +522,17 @@ <!-- spring-dm only supports spring 3.x --> <spring-dm-version-range>[3.2,4)</spring-dm-version-range> <spring-all-version-range>[3.2,5)</spring-all-version-range> - <!-- karaf 2.x/3.x/4.x supports spring 4.1 onwards --> + <!-- karaf 3.x/4.x supports spring 4.1 onwards --> <spring-version-range>[4.1,5)</spring-version-range> <!-- and special for only spring 4.0.x --> <spring40-version-range>[4.0,4.1)</spring40-version-range> <!-- and for spring 4.2.x onwards--> <spring42-version-range>[4.2,5)</spring42-version-range> <spring-version>${spring4-version}</spring-version> - <spring32-version>3.2.15.RELEASE</spring32-version> <spring40-version>4.0.9.RELEASE</spring40-version> <spring41-version>4.1.9.RELEASE</spring41-version> - <spring42-version>4.2.5.RELEASE</spring42-version> - <spring4-version>4.2.5.RELEASE</spring4-version> + <spring42-version>4.2.6.RELEASE</spring42-version> + <spring4-version>4.2.6.RELEASE</spring4-version> <spring-osgi-version>1.2.1</spring-osgi-version> <spring-security-version>4.0.4.RELEASE</spring-security-version> <spring-security-bundle-version>4.0.4.RELEASE_1</spring-security-bundle-version> @@ -3505,12 +3504,6 @@ <!-- profiles for choosing default spring version --> <profile> - <id>spring3.2</id> - <properties> - <spring-version>${spring32-version}</spring-version> - </properties> - </profile> - <profile> <id>spring4</id> <properties> <spring-version>${spring4-version}</spring-version>
