From f0735392d93bcaa339adafddccb1737ec2e4531c Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Mon, 28 Nov 2011 12:10:51 +0100
Subject: [PATCH] DATACMNS-103 - Create hybrid Spring 3.0.6 / 3.1 build.

Introduced version range for Spring dependency of [3.0.6.RELEASE, 3.1.0.RC1]. This causes Maven to scan the metadata in the configured repositories to find the latest version up to Spring 3.1.0.RC1. For users having the Spring Milestone repo configured this will resolve against 3.1.0.RC1 then. All others will get the latest one from Maven Central which is 3.0.6. To let Bundlor still use 3.0.6 I've created a org.springframework.version.30 property and let template.mf use that.
---
 spring-data-commons-core/template.mf | 24 ++++++++++++------------
 spring-data-commons-parent/pom.xml   |  3 ++-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/spring-data-commons-core/template.mf b/spring-data-commons-core/template.mf
index 6d652ae31..332e69927 100644
--- a/spring-data-commons-core/template.mf
+++ b/spring-data-commons-core/template.mf
@@ -6,18 +6,18 @@ Import-Package:
  sun.reflect;version="0";resolution:=optional
 Import-Template:
  com.mysema.query.*;version="[2.2.0,3.0.0)";resolution:=optional,
- org.springframework.aop.*;version="${org.springframework.version:[=.=.=,+1.0.0)}", 
- org.springframework.beans.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
- org.springframework.core.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
- org.springframework.context.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
- org.springframework.dao.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
- org.springframework.util.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
- org.springframework.expression.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
- org.springframework.expression.spel.standard.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
- org.springframework.expression.spel.support.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
- org.springframework.transaction.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
- org.springframework.validation.*;version="${org.springframework.version:[=.=.=,+1.0.0)}",
- org.springframework.web.*;version="${org.springframework.version:[=.=.=,+1.0.0)}";resolution:=optional,
+ org.springframework.aop.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}", 
+ org.springframework.beans.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
+ org.springframework.core.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
+ org.springframework.context.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
+ org.springframework.dao.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
+ org.springframework.util.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
+ org.springframework.expression.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
+ org.springframework.expression.spel.standard.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
+ org.springframework.expression.spel.support.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
+ org.springframework.transaction.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
+ org.springframework.validation.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}",
+ org.springframework.web.*;version="${org.springframework.version.30:[=.=.=,+1.0.0)}";resolution:=optional,
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.joda.time.*;version="[1.6.0,2.0.0)";resolution:=optional,
diff --git a/spring-data-commons-parent/pom.xml b/spring-data-commons-parent/pom.xml
index 3766b1213..8774dc437 100644
--- a/spring-data-commons-parent/pom.xml
+++ b/spring-data-commons-parent/pom.xml
@@ -14,7 +14,8 @@
 		<junit.version>4.8.1</junit.version>
 		<log4j.version>1.2.16</log4j.version>
 		<org.mockito.version>1.8.4</org.mockito.version>
-		<org.springframework.version>3.0.6.RELEASE</org.springframework.version>
+		<org.springframework.version.30>3.0.6.RELEASE</org.springframework.version.30>
+		<org.springframework.version>[${org.springframework.version.30}, 3.1.0.RC1]</org.springframework.version>
 		<org.hamcrest.version>1.2.1</org.hamcrest.version>
 	</properties>
 	<profiles>