From 7512687cbad0e2a95146b1b505acd0033eba50bc Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 19 Feb 2016 16:19:52 +0000
Subject: [PATCH] Upgrade to Spring Session 1.1.0.RC1

Closes gh-5161
---
 spring-boot-dependencies/pom.xml              |  2 +-
 .../LocalDevToolsAutoConfigurationTests.java  | 26 +++----------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 0cbc13dcbd..3ba67eabbe 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -143,7 +143,7 @@
 		<spring-security.version>4.0.3.RELEASE</spring-security.version>
 		<spring-security-jwt.version>1.0.3.RELEASE</spring-security-jwt.version>
 		<spring-security-oauth.version>2.0.8.RELEASE</spring-security-oauth.version>
-		<spring-session.version>1.0.2.RELEASE</spring-session.version>
+		<spring-session.version>1.1.0.RC1</spring-session.version>
 		<spring-social.version>1.1.4.RELEASE</spring-social.version>
 		<spring-social-facebook.version>2.0.3.RELEASE</spring-social-facebook.version>
 		<spring-social-linkedin.version>1.0.2.RELEASE</spring-social-linkedin.version>
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java
index c5d6555166..3351dd9c5d 100644
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java
@@ -47,7 +47,6 @@ import org.springframework.context.annotation.Import;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.session.ExpiringSession;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.util.SocketUtils;
 
@@ -237,17 +236,10 @@ public class LocalDevToolsAutoConfigurationTests {
 	}
 
 	@Test
-	public void sessionRedisTemplateIsConfiguredWithCustomDeserializers10()
+	public void sessionRedisTemplateIsConfiguredWithCustomDeserializers()
 			throws Exception {
 		sessionRedisTemplateIsConfiguredWithCustomDeserializers(
-				Session10RedisTemplateConfig.class);
-	}
-
-	@Test
-	public void sessionRedisTemplateIsConfiguredWithCustomDeserializers11()
-			throws Exception {
-		sessionRedisTemplateIsConfiguredWithCustomDeserializers(
-				Session11RedisTemplateConfig.class);
+				SessionRedisTemplateConfig.class);
 	}
 
 	private void sessionRedisTemplateIsConfiguredWithCustomDeserializers(
@@ -316,19 +308,7 @@ public class LocalDevToolsAutoConfigurationTests {
 	}
 
 	@Configuration
-	public static class Session10RedisTemplateConfig {
-
-		@Bean
-		public RedisTemplate<String, ExpiringSession> sessionRedisTemplate() {
-			RedisTemplate<String, ExpiringSession> redisTemplate = new RedisTemplate<String, ExpiringSession>();
-			redisTemplate.setConnectionFactory(mock(RedisConnectionFactory.class));
-			return redisTemplate;
-		}
-
-	}
-
-	@Configuration
-	public static class Session11RedisTemplateConfig {
+	public static class SessionRedisTemplateConfig {
 
 		@Bean
 		public RedisTemplate<Object, Object> sessionRedisTemplate() {