From e3139f0822dc81482c5e1a865b266911c2ab0b56 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Thu, 22 Dec 2016 14:06:31 +0100
Subject: [PATCH] #240 - Upgraded to Ingalls RC1.

Upgrade to Spring Boot 1.5 snapshots due to minor API changes in Spring Data REST so that recompilation is requited and only 1.5 picks up Ingalls. Upgraded to Querydsl 4.1.4, Spring Framework 5 build profile to 5.0 M3.

Switched to @SpringBootTest in Spring Data Redis samples as the previously deprecated @SpringApplicationConfiguation has been removed in 1.5.
---
 pom.xml                                               | 11 +++++------
 .../springdata/redis/cluster/BasicUsageTests.java     |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index eecddcdd..62872489 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.2.RELEASE</version>
+		<version>1.5.0.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<modules>
@@ -34,9 +34,9 @@
 
 		<apt.version>1.1.3</apt.version>
 		<java.version>1.8</java.version>
-		<querydsl.version>4.1.3</querydsl.version>
-		<spring-data-releasetrain.version>Ingalls-M1</spring-data-releasetrain.version>
-		<spring-hateoas.version>0.21.0.RELEASE</spring-hateoas.version>
+		<querydsl.version>4.1.4</querydsl.version>
+		<spring-data-releasetrain.version>Ingalls-RC1</spring-data-releasetrain.version>
+		<spring-hateoas.version>0.22.0.RELEASE</spring-hateoas.version>
 		<jedis.version>2.9.0</jedis.version>
 		<cassandra-driver.version>3.0.3</cassandra-driver.version>
 
@@ -46,8 +46,7 @@
 		<profile>
 			<id>spring5</id>
 			<properties>
-				<spring.version>5.0.0.M2</spring.version>
-				<spring-hateoas.version>0.21.0.RELEASE</spring-hateoas.version>
+				<spring.version>5.0.0.M3</spring.version>
 			</properties>
 		</profile>
 	</profiles>
diff --git a/redis/cluster/src/test/java/example/springdata/redis/cluster/BasicUsageTests.java b/redis/cluster/src/test/java/example/springdata/redis/cluster/BasicUsageTests.java
index 5d3e9aea..417b6e82 100644
--- a/redis/cluster/src/test/java/example/springdata/redis/cluster/BasicUsageTests.java
+++ b/redis/cluster/src/test/java/example/springdata/redis/cluster/BasicUsageTests.java
@@ -28,7 +28,7 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.core.RedisCallback;
@@ -43,7 +43,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Christoph Strobl
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = { AppConfig.class })
+@SpringBootTest(classes = { AppConfig.class })
 public class BasicUsageTests {
 
 	@Autowired RedisTemplate<String, String> template;