root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Upgrade to Spring Session 1.1.0.RC1 

Closes gh-5161
This commit is contained in:
Andy Wilkinson 2016-02-19 16:19:52 +00:00
parent 99b3af9216
commit 7512687cba
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-dependencies/pom.xml
View File

@ -143,7 +143,7 @@
<spring-security.version>4.0.3.RELEASE</spring-security.version> <spring-security.version>4.0.3.RELEASE</spring-security.version>
<spring-security-jwt.version>1.0.3.RELEASE</spring-security-jwt.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-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.version>1.1.4.RELEASE</spring-social.version>
<spring-social-facebook.version>2.0.3.RELEASE</spring-social-facebook.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> <spring-social-linkedin.version>1.0.2.RELEASE</spring-social-linkedin.version>

26
spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java
View File

@ -47,7 +47,6 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.session.ExpiringSession;
import org.springframework.test.util.ReflectionTestUtils; import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.util.SocketUtils; import org.springframework.util.SocketUtils;
@ -237,17 +236,10 @@ public class LocalDevToolsAutoConfigurationTests {
} }
@Test @Test
public void sessionRedisTemplateIsConfiguredWithCustomDeserializers10() public void sessionRedisTemplateIsConfiguredWithCustomDeserializers()
throws Exception { throws Exception {
sessionRedisTemplateIsConfiguredWithCustomDeserializers( sessionRedisTemplateIsConfiguredWithCustomDeserializers(
Session10RedisTemplateConfig.class); SessionRedisTemplateConfig.class);
}
@Test
public void sessionRedisTemplateIsConfiguredWithCustomDeserializers11()
throws Exception {
sessionRedisTemplateIsConfiguredWithCustomDeserializers(
Session11RedisTemplateConfig.class);
} }
private void sessionRedisTemplateIsConfiguredWithCustomDeserializers( private void sessionRedisTemplateIsConfiguredWithCustomDeserializers(
@ -316,19 +308,7 @@ public class LocalDevToolsAutoConfigurationTests {
} }
@Configuration @Configuration
public static class Session10RedisTemplateConfig { public static class SessionRedisTemplateConfig {
@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 {
@Bean @Bean
public RedisTemplate<Object, Object> sessionRedisTemplate() { public RedisTemplate<Object, Object> sessionRedisTemplate() {