From 9ee13be9b54caea134f5f0b5512761506551d250 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Mon, 11 Jul 2016 13:05:13 +0200
Subject: [PATCH] #197 - Upgraded to Spring Boot 1.4 RC1.

Tweaked the output folder for Querydsl type generation to avoid running into a bug in the Maven compiler plugin 3.5.1 [0].

Fixed an issue in a sample script used to demonstrate MongoDB script execution as the new JavaScript engine seems to be more strict.

Switched to the MongoDB starter and excluded the legacy MongoDB Java driver from projects using Querydsl to consistently make use of the current driver only.

[0] https://issues.apache.org/jira/browse/MCOMPILER-271
---
 bom/pom.xml                                          |  2 +-
 jpa/pom.xml                                          |  1 -
 mongodb/example/pom.xml                              |  3 ++-
 .../mongodb/advanced/ServersideScriptTests.java      |  2 +-
 mongodb/pom.xml                                      | 12 +++++++++---
 pom.xml                                              |  6 ++----
 rest/starbucks/pom.xml                               |  6 ++++++
 web/querydsl/pom.xml                                 |  6 ++++++
 8 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 4bbda706..5fcb6363 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -45,7 +45,7 @@
 
 		<dependency>
 			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-mongodb</artifactId>
+			<artifactId>spring-data-jpa</artifactId>
 		</dependency>
 
 	</dependencies>
diff --git a/jpa/pom.xml b/jpa/pom.xml
index 07e29796..93b4dd28 100644
--- a/jpa/pom.xml
+++ b/jpa/pom.xml
@@ -30,7 +30,6 @@
 
 	<properties>
 		<hibernate.version>5.2.1.Final</hibernate.version>
-		<spring.version>4.3.0.RELEASE</spring.version>
 	</properties>
 
 	<dependencies>
diff --git a/mongodb/example/pom.xml b/mongodb/example/pom.xml
index f36cbb28..ebda56a2 100644
--- a/mongodb/example/pom.xml
+++ b/mongodb/example/pom.xml
@@ -32,13 +32,14 @@
 							<goal>process</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>target/generated-sources/annotations</outputDirectory>
+							<outputDirectory>target/generated-sources/queries</outputDirectory>
 							<processor>org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor</processor>
 							<logOnlyOnError>true</logOnlyOnError>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
+
 		</plugins>
 	</build>
 
diff --git a/mongodb/example/src/test/java/example/springdata/mongodb/advanced/ServersideScriptTests.java b/mongodb/example/src/test/java/example/springdata/mongodb/advanced/ServersideScriptTests.java
index a7a20fdf..1c648000 100644
--- a/mongodb/example/src/test/java/example/springdata/mongodb/advanced/ServersideScriptTests.java
+++ b/mongodb/example/src/test/java/example/springdata/mongodb/advanced/ServersideScriptTests.java
@@ -104,7 +104,7 @@ public class ServersideScriptTests {
 		operations.getConverter().write(customer, dbo);
 
 		String scriptString = String.format(
-				"object  =  db.%1$s.findOne('{\"_id\": \"%2$s\"}'); if (object == null) { db.%1s.insert(%3$s); return null; } else { return object; }",
+				"object  =  db.%1$s.findOne({\"_id\": \"%2$s\"}); if (object == null) { db.%1s.insert(%3$s); return null; } else { return object; }",
 				collectionName, id, dbo);
 
 		return new ExecutableMongoScript(scriptString);
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index 35e2bab4..a0d4d9e1 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -29,14 +29,20 @@
 	<dependencies>
 
 		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-mongodb</artifactId>
-		</dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+        </dependency>
 
 		<dependency>
 			<groupId>com.querydsl</groupId>
 			<artifactId>querydsl-mongodb</artifactId>
 			<version>${querydsl.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.mongodb</groupId>
+					<artifactId>mongo-java-driver</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 50e383f1..b86ab656 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.4.0.M3</version>
+		<version>1.4.0.RC1</version>
 	</parent>
 
 	<modules>
@@ -34,9 +34,7 @@
 
 		<apt.version>1.1.3</apt.version>
 		<java.version>1.8</java.version>
-		<querydsl.version>4.1.0</querydsl.version>
-		<spring-data-releasetrain.version>Hopper-SR2</spring-data-releasetrain.version>
-		<spring-hateoas.version>0.20.0.RELEASE</spring-hateoas.version>
+		<querydsl.version>4.1.3</querydsl.version>
 
 	</properties>
 
diff --git a/rest/starbucks/pom.xml b/rest/starbucks/pom.xml
index c4dac0b5..60d9573b 100644
--- a/rest/starbucks/pom.xml
+++ b/rest/starbucks/pom.xml
@@ -29,6 +29,12 @@
 			<groupId>com.querydsl</groupId>
 			<artifactId>querydsl-mongodb</artifactId>
 			<version>${querydsl.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.mongodb</groupId>
+					<artifactId>mongo-java-driver</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
diff --git a/web/querydsl/pom.xml b/web/querydsl/pom.xml
index 7f568389..cce4ff3c 100644
--- a/web/querydsl/pom.xml
+++ b/web/querydsl/pom.xml
@@ -28,6 +28,12 @@
 			<groupId>com.querydsl</groupId>
 			<artifactId>querydsl-mongodb</artifactId>
 			<version>${querydsl.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.mongodb</groupId>
+					<artifactId>mongo-java-driver</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		
 		<dependency>