From fef0e9e200515522590a77d3ea27eaf1062fb6e3 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Tue, 1 Jul 2014 10:09:01 +0200
Subject: [PATCH] #77 - Upgrade to Spring 4 as build baseline.

Upgraded to Spring 4.0.5.RELEASE as baseline for Spring Data builds. Removed spring32-next profile as well as the spring4 one. Added a dedicated spring41-next profile to be able to build against Spring 4.1 snapshots.
---
 parent/pom.xml | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 951fe3c4..6d2d9fab 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -114,7 +114,7 @@
 		<mockito>1.9.5</mockito>
 		<querydsl>3.4.0</querydsl>
 		<slf4j>1.7.7</slf4j>
-		<spring>3.2.9.RELEASE</spring>
+		<spring>4.0.5.RELEASE</spring>
 		<webbeans>1.2.4</webbeans>
 
 	</properties>
@@ -526,12 +526,21 @@
 
 		<profile>
 
-			<id>spring32-next</id>
+			<id>spring4-next</id>
 
 			<properties>
-				<spring>3.2.10.BUILD-SNAPSHOT</spring>
+				<spring>4.0.6.BUILD-SNAPSHOT</spring>
 			</properties>
 
+			<dependencies>
+				<dependency>
+					<groupId>javax.servlet</groupId>
+					<artifactId>javax.servlet-api</artifactId>
+					<version>3.0.1</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+
 			<repositories>
 				<repository>
 					<id>spring-libs-snapshot</id>
@@ -543,29 +552,10 @@
 
 		<profile>
 
-			<id>spring4</id>
+			<id>spring41-next</id>
 
 			<properties>
-				<spring>4.0.4.RELEASE</spring>
-			</properties>
-
-			<dependencies>
-				<dependency>
-					<groupId>javax.servlet</groupId>
-					<artifactId>javax.servlet-api</artifactId>
-					<version>3.0.1</version>
-					<scope>test</scope>
-				</dependency>
-			</dependencies>
-
-		</profile>
-
-		<profile>
-
-			<id>spring4-next</id>
-
-			<properties>
-				<spring>4.0.5.BUILD-SNAPSHOT</spring>
+				<spring>4.1.0.BUILD-SNAPSHOT</spring>
 			</properties>
 
 			<dependencies>