From c18fd47b3186e6052cf8cdb0ae4d40f1122e8a8b Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@vmware.com>
Date: Mon, 20 Aug 2012 17:07:59 +0200
Subject: [PATCH] DATAJPA-249 - Make Spring 3.1.2.RELEASE default Spring
 dependency version.

We move away from Maven version ranges as they complicate the build and dependency resolution process. They make the build in-reproducible. Users stuck with a 3.0.x version of Spring will now have to manually declare Spring dependencies in their needed 3.0.x version. Not that at least Spring 3.0.7 is required currently.
---
 pom.xml | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 47fe2b1a5..b02513522 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,8 +53,7 @@
 	
 	<properties>
 		<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>3.1.2.RELEASE</spring.version>
 		<spring.data.commons.version>1.4.0.BUILD-SNAPSHOT</spring.data.commons.version>
 		<hibernate.version>3.6.10.Final</hibernate.version>
 		<openjpa.version>2.2.0</openjpa.version>
@@ -116,7 +115,7 @@
 							<!-- copies doc-files subdirectory which contains image resources -->
 							<docfilessubdirs>true</docfilessubdirs>
 							<links>
-								<link>http://static.springframework.org/spring/docs/3.0.x/javadoc-api</link>
+								<link>http://static.springframework.org/spring/docs/3.1.x/javadoc-api</link>
 								<link>http://download.oracle.com/javase/1.5.0/docs/api</link>
 								<link>http://static.springsource.org/spring-data/data-commons/docs/${spring.data.commons.version}/api</link>
 							</links>
@@ -248,44 +247,44 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
-			<version>${spring.version.range}</version>
+			<version>${spring.version}</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>${spring.version.range}</version>
+			<version>${spring.version}</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aop</artifactId>
-			<version>${spring.version.range}</version>
+			<version>${spring.version}</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
-			<version>${spring.version.range}</version>
+			<version>${spring.version}</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-			<version>${spring.version.range}</version>
+			<version>${spring.version}</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-instrument</artifactId>
-			<version>${spring.version.range}</version>
+			<version>${spring.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>${spring.version.range}</version>
+			<version>${spring.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>
@@ -322,14 +321,14 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aspects</artifactId>
-			<version>${spring.version.range}</version>
+			<version>${spring.version}</version>
 			<optional>true</optional>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
-			<version>${spring.version.range}</version>
+			<version>${spring.version}</version>
 			<scope>test</scope>
 		</dependency>
 		
@@ -500,13 +499,13 @@
 					<includes>
 						<include>**/*Tests.java</include>
 					</includes>
-					<argLine>-javaagent:${settings.localRepository}/org/springframework/spring-instrument/3.1.1.RELEASE/spring-instrument-3.1.1.RELEASE.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}/spring-instrument-${spring.version}.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.range}</version>
+						<version>${spring.version}</version>
 						<scope>runtime</scope>
 					</dependency>
 					<dependency>