From 27b117fe2e8b31e95e0c5b6c3a9c9910596dcee2 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Wed, 2 Mar 2016 11:13:04 +0100
Subject: [PATCH] #230 - Upgraded Spring Framework baseline to 4.2.

Adapted additional build profiles accordingly.
---
 parent/pom.xml | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 971cad43..fd12fb81 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -59,7 +59,7 @@
 			<name>Apache License, Version 2.0</name>
 			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
 			<comments>
-			Copyright 2008-2013 the original author or authors.
+			Copyright 2008-2016 the original author or authors.
 
 			Licensed under the Apache License, Version 2.0 (the "License");
 			you may not use this file except in compliance with the License.
@@ -103,7 +103,7 @@
 		<querydsl>4.0.8</querydsl>
 		<rxjava>1.1.0</rxjava>
 		<slf4j>1.7.15</slf4j>
-		<spring>4.1.9.RELEASE</spring>
+		<spring>4.2.5.RELEASE</spring>
 		<spring-hateoas>0.19.0.RELEASE</spring-hateoas>
 		<threetenbp>1.3.1</threetenbp>
 		<webbeans>1.2.8</webbeans>
@@ -508,22 +508,12 @@
 
 		</profile>
 
-		<profile>
-
-			<id>spring42</id>
-
-			<properties>
-				<spring>4.2.3.RELEASE</spring>
-			</properties>
-
-		</profile>
-
 		<profile>
 
 			<id>spring42-next</id>
 
 			<properties>
-				<spring>4.2.4.BUILD-SNAPSHOT</spring>
+				<spring>4.2.6.BUILD-SNAPSHOT</spring>
 			</properties>
 
 			<repositories>