camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [2/3] git commit: Revert "expand the Spring version range to include Spring 4.0.x after we set Spring 4 as default"
Date Mon, 15 Sep 2014 04:28:51 GMT
Revert "expand the Spring version range to include Spring 4.0.x after we set Spring 4 as default"

This change confuse the karaf and break the OSGi integration tests

This reverts commit 0b55370096efe59f2dc527a214747fd16f38132a.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5178bda9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5178bda9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5178bda9

Branch: refs/heads/camel-2.14.x
Commit: 5178bda9cb2b43a5e245064c7e8e7795c5c93bf0
Parents: 693168a
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Mon Sep 15 12:02:04 2014 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Mon Sep 15 12:02:04 2014 +0800

----------------------------------------------------------------------
 parent/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/5178bda9/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 7bb8f8f..c35c967 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -404,7 +404,8 @@
     <spring-ldap-version>1.3.1.RELEASE</spring-ldap-version>
     <spring-ldap-bundle-version>1.3.1.RELEASE_2</spring-ldap-bundle-version>
     <spring-retry-version>1.0.3.RELEASE</spring-retry-version>
-    <spring-version-range>[3.2,4.1)</spring-version-range>
+    <!-- spring-dm does not support spring 4.x so import-range must be 3.x only until
a solution in karaf exists -->
+    <spring-version-range>[3.2,4)</spring-version-range>
     <spring-version>${spring4-version}</spring-version>
     <spring32-version>3.2.11.RELEASE</spring32-version>
     <spring4-version>4.0.7.RELEASE</spring4-version>


Mime
View raw message