From 731d577afba059c5c5e3abb95b076b4cf2168cfc Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Thu, 1 Mar 2012 10:56:10 +0100
Subject: [PATCH] Moved to Spring dependency version ranges.

---
 pom.xml     | 35 ++++++++++++++++++++++-------------
 template.mf |  4 ++--
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4942996a9..e5ea52d89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,10 @@
 	</licenses>
 	
 	<properties>
-		<spring.version>3.0.5.RELEASE</spring.version>
+		<spring.version.30>3.0.7.RELEASE</spring.version.30>
+		<spring.version.40>4.0.0.RELEASE</spring.version.40>
+		<spring.version.range>[${spring.version.30}, ${spring.version.40})</spring.version.range>
+		<spring.version.resolved>3.1.1.RELEASE</spring.version.resolved>
 		<spring.data.commons.version>1.1.0.RELEASE</spring.data.commons.version>
 		<hibernate.version>3.6.5.Final</hibernate.version>
 		<openjpa.version>2.1.0</openjpa.version>
@@ -248,23 +251,23 @@
 	</profiles>
 	
 	<dependencies>
-	
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-data-commons-core</artifactId>
-			<version>${spring.data.commons.version}</version>
-		</dependency>
 		
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
-			<version>${spring.version}</version>
+			<version>${spring.version.range}</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+			<version>${spring.version.range}</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>${spring.version}</version>
+			<version>${spring.version.range}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>
@@ -273,6 +276,12 @@
 			</exclusions>
 		</dependency>
 		
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-data-commons-core</artifactId>
+			<version>${spring.data.commons.version}</version>
+		</dependency>
+		
 		<!-- Logging (SLF4J + JCL bridge) -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -301,14 +310,14 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aspects</artifactId>
-			<version>${spring.version}</version>
+			<version>${spring.version.range}</version>
 			<optional>true</optional>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
-			<version>${spring.version}</version>
+			<version>${spring.version.range}</version>
 			<scope>test</scope>
 		</dependency>
 		
@@ -441,13 +450,13 @@
 					<includes>
 						<include>**/*Tests.java</include>
 					</includes>
-					<argLine>-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring.version}/spring-instrument-${spring.version}.jar -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar</argLine>
+					<argLine>-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring.version.resolved}/spring-instrument-${spring.version.resolved}.jar -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar</argLine>
 				</configuration>
 				<dependencies>
 					<dependency>
 						<groupId>org.springframework</groupId>
 						<artifactId>spring-instrument</artifactId>
-						<version>${spring.version}</version>
+						<version>${spring.version.range}</version>
 						<scope>runtime</scope>
 					</dependency>
 					<dependency>
diff --git a/template.mf b/template.mf
index e0e6437e6..7490c43bc 100644
--- a/template.mf
+++ b/template.mf
@@ -17,8 +17,8 @@ Import-Template:
  org.hibernate.*;version="[3.5.3,4.0.0)";resolution:=optional, 
  org.joda.time.*;version="[1.5.0,2.0.0)";resolution:=optional,
  org.slf4j.*;version="${slf4j.version:[=.=.=,+1.0.0)}",
- org.springframework.*;version="${spring.version:[=.=.=.=,+1.0.0)}",
- org.springframework.beans.factory.aspectj;version="${spring.version:[=.=.=.=,+1.0.0)}";resolution:=optional,
+ org.springframework.*;version="${spring.version.range}",
+ org.springframework.beans.factory.aspectj;version="${spring.version.range}";resolution:=optional,
  org.springframework.data.*;version="${spring.data.commons.version:[=.=.=.=,+1.0.0)}",
  org.w3c.*;version="0.0.0"
  
\ No newline at end of file