From 99d1597756b3c688b4eca438a139b6a223c0b16b Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Sat, 27 Feb 2016 12:30:31 +0100
Subject: [PATCH] #155 - Upgraded to Spring Boot 1.4 M1.

Switched to renamed Redis starter POM.

Removed invalid @Transactional annotation from projections example in MongoDB.

Added Mark Paluch as contributor in the root POM.
---
 .../projections/CustomerRepositoryIntegrationTest.java   | 2 --
 pom.xml                                                  | 9 ++++++---
 redis/cluster-sentinel/pom.xml                           | 2 +-
 redis/cluster/pom.xml                                    | 6 +++---
 redis/example/pom.xml                                    | 2 +-
 redis/pom.xml                                            | 1 +
 redis/util/pom.xml                                       | 8 ++++----
 7 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/mongodb/example/src/test/java/example/springdata/mongodb/projections/CustomerRepositoryIntegrationTest.java b/mongodb/example/src/test/java/example/springdata/mongodb/projections/CustomerRepositoryIntegrationTest.java
index 5a4d7b20..66669ab8 100644
--- a/mongodb/example/src/test/java/example/springdata/mongodb/projections/CustomerRepositoryIntegrationTest.java
+++ b/mongodb/example/src/test/java/example/springdata/mongodb/projections/CustomerRepositoryIntegrationTest.java
@@ -29,7 +29,6 @@ import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.projection.TargetAware;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Integration tests for {@link CustomerRepository} to show projection capabilities.
@@ -38,7 +37,6 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration
-@Transactional
 public class CustomerRepositoryIntegrationTest {
 
 	@Configuration
diff --git a/pom.xml b/pom.xml
index 130e15f4..57c8266f 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.2.RELEASE</version>
+		<version>1.4.0.M1</version>
 	</parent>
 
 	<modules>
@@ -35,8 +35,6 @@
 		<apt.version>1.1.3</apt.version>
 		<java.version>1.8</java.version>
 		<querydsl.version>4.0.8</querydsl.version>
-		<solr.version>5.4.1</solr.version>
-		<spring-data-releasetrain.version>Hopper-M1</spring-data-releasetrain.version>
 
 	</properties>
 
@@ -61,6 +59,11 @@
 			<name>Greg Turnquist</name>
 			<email>gturnquist@pivotal.io</email>
 		</developer>
+		<developer>
+			<id>mpaluch</id>
+			<name>Mark Paluch</name>
+			<email>mpaluch@pivotal.io</email>
+		</developer>
 	</developers>
 
 	<dependencies>
diff --git a/redis/cluster-sentinel/pom.xml b/redis/cluster-sentinel/pom.xml
index 83ceecbd..239bfd97 100644
--- a/redis/cluster-sentinel/pom.xml
+++ b/redis/cluster-sentinel/pom.xml
@@ -16,7 +16,7 @@
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-redis</artifactId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/redis/cluster/pom.xml b/redis/cluster/pom.xml
index 35637e5b..bd620a31 100644
--- a/redis/cluster/pom.xml
+++ b/redis/cluster/pom.xml
@@ -16,9 +16,9 @@
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-redis</artifactId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-data-redis-example-utils</artifactId>
@@ -31,7 +31,7 @@
 			<artifactId>spring-boot-configuration-processor</artifactId>
 			<optional>true</optional>
 		</dependency>
-		
+
 	</dependencies>
 
 </project>
\ No newline at end of file
diff --git a/redis/example/pom.xml b/redis/example/pom.xml
index a0bff9c9..790993b3 100644
--- a/redis/example/pom.xml
+++ b/redis/example/pom.xml
@@ -16,7 +16,7 @@
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-redis</artifactId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
 
 		<dependency>
diff --git a/redis/pom.xml b/redis/pom.xml
index 220dfcaf..52f8a4a1 100644
--- a/redis/pom.xml
+++ b/redis/pom.xml
@@ -9,6 +9,7 @@
 		<groupId>org.springframework.data.examples</groupId>
 		<artifactId>spring-data-examples</artifactId>
 		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<name>Spring Data Redis - Examples</name>
diff --git a/redis/util/pom.xml b/redis/util/pom.xml
index bb99a097..7d72cf68 100644
--- a/redis/util/pom.xml
+++ b/redis/util/pom.xml
@@ -2,9 +2,6 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>spring-data-redis-example-utils</artifactId>
-	<name>Spring Data Redis - Example utilities</name>
-
 	<parent>
 		<groupId>org.springframework.data.examples</groupId>
 		<artifactId>spring-data-redis-examples</artifactId>
@@ -12,6 +9,9 @@
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
+	<artifactId>spring-data-redis-example-utils</artifactId>
+	<name>Spring Data Redis - Example utilities</name>
+
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
@@ -19,7 +19,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-redis</artifactId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
 	</dependencies>