From 0c1bee04b34be3dae06f08ca7ccb120b9d2365ed Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Tue, 1 Sep 2015 13:45:19 +0200
Subject: [PATCH] #128 - Upgraded to Spring Data Gosling GA.

Spring Boot 1.3.0 M2 -> 1.3.0 M4
Spring Framework 4.2.0 -> 4.2.1
---
 bom/pom.xml                                           |  4 ++--
 jpa/java8/pom.xml                                     |  6 +-----
 jpa/security/pom.xml                                  |  4 ----
 mongodb/security/pom.xml                              |  4 ----
 pom.xml                                               |  7 ++++---
 rest/pom.xml                                          |  4 ----
 rest/starbucks/pom.xml                                |  3 ++-
 web/example/pom.xml                                   |  2 +-
 web/pom.xml                                           |  2 +-
 web/querydsl/pom.xml                                  | 11 +++--------
 .../main/java/example/users/web/UserController.java   |  2 +-
 11 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 8c86a2bc..4bbda706 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -9,8 +9,8 @@
 	<name>Spring Data - Using the BOM for dependency management</name>
 
 	<properties>
-		<spring.version>4.2.0.RELEASE</spring.version>
-		<spring-data.version>Fowler-RELEASE</spring-data.version>
+		<spring.version>4.2.1.RELEASE</spring.version>
+		<spring-data.version>Gosling-RELEASE</spring-data.version>
 	</properties>
 
 	<dependencyManagement>
diff --git a/jpa/java8/pom.xml b/jpa/java8/pom.xml
index 0bfab8d7..9685749f 100644
--- a/jpa/java8/pom.xml
+++ b/jpa/java8/pom.xml
@@ -8,11 +8,7 @@
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
-	<properties>
-		<spring-data-releasetrain.version>Gosling-BUILD-SNAPSHOT</spring-data-releasetrain.version>
-	</properties>
-
 	<artifactId>spring-data-jpa-java8</artifactId>
 	<name>Spring Data JPA - Java 8 specific features</name>
-	
+
 </project>
\ No newline at end of file
diff --git a/jpa/security/pom.xml b/jpa/security/pom.xml
index 713eaa2e..cfb98f91 100644
--- a/jpa/security/pom.xml
+++ b/jpa/security/pom.xml
@@ -11,10 +11,6 @@
 	<artifactId>spring-data-jpa-security</artifactId>
 	<name>Spring Data JPA - Spring Security integration</name>
 
-	<properties>
-		<spring-security.version>4.0.0.RELEASE</spring-security.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/mongodb/security/pom.xml b/mongodb/security/pom.xml
index 1d45459c..c3d04dc7 100644
--- a/mongodb/security/pom.xml
+++ b/mongodb/security/pom.xml
@@ -11,10 +11,6 @@
 	<artifactId>spring-data-mongodb-security</artifactId>
 	<name>Spring Data MongoDB - Spring Security Integration</name>
 
-	<properties>
-		<spring-data-releasetrain.version>Gosling-BUILD-SNAPSHOT</spring-data-releasetrain.version>
-	</properties>
-
 	<dependencies>
 
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 5826bfc9..e1f0027b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.0.M2</version>
+		<version>1.3.0.M4</version>
 	</parent>
 
 	<modules>
@@ -33,9 +33,10 @@
 
 		<apt.version>1.1.3</apt.version>
 		<java.version>1.8</java.version>
-		<spring.version>4.2.0.RELEASE</spring.version>
+		<spring.version>4.2.1.RELEASE</spring.version>
 		<querydsl.version>3.6.6</querydsl.version>
-		<spring-data-releasetrain.version>Gosling-RC1</spring-data-releasetrain.version>
+		<spring-hateoas.version>0.19.0.RELEASE</spring-hateoas.version>
+		<spring-data-releasetrain.version>Gosling-RELEASE</spring-data-releasetrain.version>
 
 	</properties>
 
diff --git a/rest/pom.xml b/rest/pom.xml
index 01127489..b3a65efa 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -22,10 +22,6 @@
 		<module>headers</module>
 	</modules>
 
-	<properties>
-		<spring-hateoas.version>0.18.0.RELEASE</spring-hateoas.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/rest/starbucks/pom.xml b/rest/starbucks/pom.xml
index 523cb57a..35f037ac 100644
--- a/rest/starbucks/pom.xml
+++ b/rest/starbucks/pom.xml
@@ -22,12 +22,13 @@
 		<dependency>
 			<groupId>com.mysema.querydsl</groupId>
 			<artifactId>querydsl-mongodb</artifactId>
-			<version>3.6.6</version>
+			<version>${querydsl.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-rest-hal-browser</artifactId>
+			<version>2.4.0.DATAREST-627-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 
diff --git a/web/example/pom.xml b/web/example/pom.xml
index 682ff1d3..736fa5ff 100644
--- a/web/example/pom.xml
+++ b/web/example/pom.xml
@@ -4,7 +4,7 @@
 
 	<artifactId>spring-data-web-example</artifactId>
 
-	<name>Spring Data - Web support example</name>
+	<name>Spring Data - Basic web example</name>
 
 	<parent>
 		<groupId>org.springframework.data.examples</groupId>
diff --git a/web/pom.xml b/web/pom.xml
index b69368cc..68c19af4 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -11,7 +11,7 @@
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
-	<name>Spring Data Web - Examples</name>
+	<name>Spring Data - Web examples</name>
 	<description>Sample projects for Spring Data Web Support</description>
 	<inceptionYear>2015</inceptionYear>
 
diff --git a/web/querydsl/pom.xml b/web/querydsl/pom.xml
index 72e80c22..d060ef01 100644
--- a/web/querydsl/pom.xml
+++ b/web/querydsl/pom.xml
@@ -4,7 +4,7 @@
 
 	<artifactId>spring-data-web-querydsl</artifactId>
 
-	<name>Spring Data Web - QueryDSL Example</name>
+	<name>Spring Data - QueryDSL web example</name>
 
 	<parent>
 		<groupId>org.springframework.data.examples</groupId>
@@ -12,11 +12,6 @@
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
-	<properties>
-		<spring-hateoas.version>0.18.0.BUILD-SNAPSHOT</spring-hateoas.version>
-		<spring-data-releasetrain.version>Gosling-BUILD-SNAPSHOT</spring-data-releasetrain.version>
-	</properties>
-
 	<dependencies>
 
 		<dependency>
@@ -80,12 +75,12 @@
 
 	<build>
 		<plugins>
-			
+
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>com.mysema.maven</groupId>
 				<artifactId>apt-maven-plugin</artifactId>
diff --git a/web/querydsl/src/main/java/example/users/web/UserController.java b/web/querydsl/src/main/java/example/users/web/UserController.java
index d73bc0cc..37f4d2d0 100644
--- a/web/querydsl/src/main/java/example/users/web/UserController.java
+++ b/web/querydsl/src/main/java/example/users/web/UserController.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.web.querydsl.QuerydslPredicate;
+import org.springframework.data.querydsl.binding.QuerydslPredicate;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.util.MultiValueMap;