diff --git a/README.adoc b/README.adoc index 9840b06..6ee4074 100644 --- a/README.adoc +++ b/README.adoc @@ -203,8 +203,8 @@ public class Config { } @Bean - public SessionRepositoryFilter sessionFilter(SessionRepository sessionRepository) { - return new SessionRepositoryFilter(sessionRepository); + public SessionRepositoryFilter sessionFilter(SessionRepository sessionRepository) { + return new SessionRepositoryFilter(sessionRepository); } } diff --git a/gradle/java.gradle b/gradle/java.gradle index f0c0e12..e24bfbe 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -11,7 +11,7 @@ group = 'org.springframework.session' ext.jstlVersion = '1.2.1' ext.servletApiVersion = '3.0.1' ext.springSecurityVersion = '3.2.4.RELEASE' -ext.springVersion = '4.0.2.RELEASE' +ext.springVersion = '4.1.0.RELEASE' ext.groovyVersion = '2.0.5' ext.seleniumVersion = '2.33.0' ext.spockVersion = '0.7-groovy-2.0' @@ -40,6 +40,13 @@ repositories { maven { url 'http://clojars.org/repo' } } +configurations.all { + resolutionStrategy.eachDependency { DependencyResolveDetails details -> + if (details.requested.group == 'org.springframework') { + details.useVersion springVersion + } + } +} // Integration test setup configurations { integrationTestCompile { diff --git a/samples/web/src/main/java/Config.java b/samples/web/src/main/java/Config.java index f8d98a8..054384f 100644 --- a/samples/web/src/main/java/Config.java +++ b/samples/web/src/main/java/Config.java @@ -25,7 +25,6 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; import org.springframework.session.ExpiringSession; import org.springframework.session.SessionRepository; import org.springframework.session.data.redis.RedisOperationsSessionRepository; -import org.springframework.session.data.redis.RedisOperationsSessionRepository.RedisSession; import org.springframework.session.web.http.SessionRepositoryFilter; import redis.clients.jedis.Protocol; @@ -80,7 +79,7 @@ public class Config { } @Bean - public SessionRepositoryFilter sessionFilter(SessionRepository sessionRepository) { - return new SessionRepositoryFilter(sessionRepository); + public SessionRepositoryFilter sessionFilter(SessionRepository sessionRepository) { + return new SessionRepositoryFilter(sessionRepository); } } diff --git a/spring-session/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java b/spring-session/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java index 49d1ff7..2ebb226 100644 --- a/spring-session/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java +++ b/spring-session/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java @@ -233,7 +233,7 @@ public class RedisOperationsSessionRepository implements SessionRepository delta = new HashMap();