diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 0cbc13dcbdd..3ba67eabbe8 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -143,7 +143,7 @@
4.0.3.RELEASE
1.0.3.RELEASE
2.0.8.RELEASE
- 1.0.2.RELEASE
+ 1.1.0.RC1
1.1.4.RELEASE
2.0.3.RELEASE
1.0.2.RELEASE
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 c5d65551661..3351dd9c5df 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 sessionRedisTemplate() {
- RedisTemplate redisTemplate = new RedisTemplate();
- redisTemplate.setConnectionFactory(mock(RedisConnectionFactory.class));
- return redisTemplate;
- }
-
- }
-
- @Configuration
- public static class Session11RedisTemplateConfig {
+ public static class SessionRedisTemplateConfig {
@Bean
public RedisTemplate