You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/06/26 16:32:52 UTC
git commit: Fixed wrong spring osgi import
Repository: camel
Updated Branches:
refs/heads/master d00f44409 -> 1b07210d6
Fixed wrong spring osgi import
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1b07210d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1b07210d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1b07210d
Branch: refs/heads/master
Commit: 1b07210d6ac0db0890c86aa9ebf10da3556b5239
Parents: d00f444
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jun 26 16:32:02 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 26 16:32:02 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1b07210d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e5b8c12..0aa72e4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -381,8 +381,9 @@
<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-retry-version>1.0.3.RELEASE</spring-retry-version>
- <spring-version-range>[3.2,5)</spring-version-range>
+ <spring-retry-version>1.0.3.RELEASE</spring-retry-version>
+ <!-- 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>${spring32-version}</spring-version>
<spring32-version>3.2.9.RELEASE</spring32-version>
<spring4-version>4.0.5.RELEASE</spring4-version>