Release 2.0.0.M4

Update Spring Security 5.0.0.M4
Harmonize ReactorSessionRepository API
2017-09-13 18:04:06 -05:00 · 2017-09-13 18:03:33 -05:00 · 2017-09-12 23:00:16 +02:00 · 2017-09-12 15:41:10 -05:00 · 2017-09-12 15:22:29 -05:00 · 2017-09-12 07:54:14 +02:00
271 changed files with 4994 additions and 2216 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,20 @@
 language: java

-services:
-  - redis-server
+sudo: required

-jdk:
-  - oraclejdk8
+services: docker

-os:
-  - linux
+jdk: oraclejdk8

 before_cache:
  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+
 cache:
  directories:
    - $HOME/.gradle/caches/
    - $HOME/.gradle/wrapper/

-script: ./gradlew build
+install: true
+
+script: ./gradlew clean build --refresh-dependencies --no-daemon
--- a/29
+++ b/29
@@ -24,21 +24,6 @@ try {
 			}
 		}
 	},
-	sonar: {
-		stage('Sonar') {
-			node {
-				checkout scm
-				withCredentials([string(credentialsId: 'spring-sonar.login', variable: 'SONAR_LOGIN')]) {
-					try {
-						sh "./gradlew clean sonarqube -PexcludeProjects='**/samples/**' -Dsonar.host.url=$SPRING_SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN --refresh-dependencies --no-daemon"
-					} catch(Exception e) {
-						currentBuild.result = 'FAILED: sonar'
-						throw e
-					}
-				}
-			}
-		}
-	},
 	springio: {
 		stage('Spring IO') {
 			node {
@@ -56,7 +41,17 @@ try {
 	}

 	if(currentBuild.result == 'SUCCESS') {
-		parallel docs: {
+		parallel artifactory: {
+			stage('Artifactory Deploy') {
+				node {
+					checkout scm
+					withCredentials([usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) {
+						sh "./gradlew artifactoryPublish -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --no-daemon --stacktrace"
+					}
+				}
+			}
+		},
+		docs: {
 			stage('Deploy Docs') {
 				node {
 					checkout scm
@@ -85,7 +80,7 @@ try {
 					subject: subject,
 					body: details,
 					recipientProviders: RECIPIENTS,
-					to: "$SPRING_SECURITY_TEAM_EMAILS"
+					to: "$SPRING_SESSION_TEAM_EMAILS"
 				)
 			}
 		}
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,10 @@
 buildscript {
 	dependencies {
-		classpath 'io.spring.gradle:spring-build-conventions:0.0.1.RELEASE'
+		classpath 'io.spring.gradle:spring-build-conventions:0.0.3.RELEASE'
 		classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
 	}
 	repositories {
-		maven { url 'https://repo.spring.io/libs-snapshot' }
-		maven { url 'https://repo.spring.io/plugins-snapshot' }
+		maven { url 'https://repo.spring.io/plugins-release' }
 	}
 }
 apply plugin: 'io.spring.convention.root'
--- a/docs/spring-session-docs.gradle
+++ b/docs/spring-session-docs.gradle
@@ -2,8 +2,10 @@ apply plugin: 'io.spring.convention.docs'
 apply plugin: 'io.spring.convention.spring-test'

 dependencies {
-	testCompile project(':spring-session')
+	testCompile project(':spring-session-core')
 	testCompile project(':spring-session-data-redis')
+	testCompile project(':spring-session-hazelcast')
+	testCompile project(':spring-session-jdbc')
 	testCompile "org.springframework:spring-jdbc"
 	testCompile "org.springframework:spring-messaging"
 	testCompile "org.springframework:spring-webmvc"
@@ -39,5 +41,5 @@ asciidoctor {
 			'docs-test-dir' : rootProject.projectDir.path + '/docs/src/test/java/',
 			'docs-test-resources-dir' : rootProject.projectDir.path + '/docs/src/test/resources/',
 			'samples-dir' : rootProject.projectDir.path + '/samples/',
-			'session-main-resources-dir' : rootProject.projectDir.path + '/spring-session/src/main/resources/'
+			'session-jdbc-main-resources-dir' : project(':spring-session-jdbc').projectDir.path + '/src/main/resources/'
 }
--- a/docs/src/docs/asciidoc/guides/boot-findbyusername.adoc
+++ b/docs/src/docs/asciidoc/guides/boot-findbyusername.adoc
@@ -110,6 +110,7 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 ====
 For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
 Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====

 ----
--- a/docs/src/docs/asciidoc/guides/boot-redis.adoc
+++ b/docs/src/docs/asciidoc/guides/boot-redis.adoc
@@ -93,6 +93,7 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 ====
 For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
 Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====

 ----
--- a/docs/src/docs/asciidoc/guides/boot-websocket.adoc
+++ b/docs/src/docs/asciidoc/guides/boot-websocket.adoc
@@ -85,6 +85,7 @@ server.session.timeout=60
 ====
 For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
 Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====

 ----
--- a/docs/src/docs/asciidoc/guides/grails3.adoc
+++ b/docs/src/docs/asciidoc/guides/grails3.adoc
@@ -86,6 +86,7 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 ====
 For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
 Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====

 ----
@@ -127,3 +128,6 @@ Alternatively, you can also delete the explicit key. Enter the following into yo
 	$ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e

 Now visit the application at http://localhost:8080/test/index and observe that we are no longer authenticated.
+
+NOTE: Spring Session will not work with grails flash scope without additional work. +
+See this answer for an explanation: https://stackoverflow.com/a/43311427
--- a/docs/src/docs/asciidoc/guides/java-custom-cookie.adoc
+++ b/docs/src/docs/asciidoc/guides/java-custom-cookie.adoc
@@ -80,6 +80,7 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 ====
 For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
 Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====

 ----
--- a/docs/src/docs/asciidoc/guides/java-redis.adoc
+++ b/docs/src/docs/asciidoc/guides/java-redis.adoc
@@ -127,6 +127,7 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 ====
 For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
 Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====

 ----
--- a/docs/src/docs/asciidoc/guides/java-rest.adoc
+++ b/docs/src/docs/asciidoc/guides/java-rest.adoc
@@ -128,6 +128,7 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 ====
 For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
 Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====

 ----
--- a/docs/src/docs/asciidoc/guides/java-security.adoc
+++ b/docs/src/docs/asciidoc/guides/java-security.adoc
@@ -132,6 +132,7 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 ====
 For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
 Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====

 ----
--- a/docs/src/docs/asciidoc/guides/java-users.adoc
+++ b/docs/src/docs/asciidoc/guides/java-users.adoc
@@ -21,6 +21,7 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 ====
 For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
 Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====

 ----
--- a/docs/src/docs/asciidoc/guides/xml-redis.adoc
+++ b/docs/src/docs/asciidoc/guides/xml-redis.adoc
@@ -135,6 +135,7 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 ====
 For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
 Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====

 ----
--- a/docs/src/docs/asciidoc/index.adoc
+++ b/docs/src/docs/asciidoc/index.adoc
@@ -416,7 +416,7 @@ include::{docs-test-dir}docs/security/SecurityConfiguration.java[tags=class]
 ----

 This assumes that you've also configured Spring Session to provide a `FindByIndexNameSessionRepository` that
-returns `ExpiringSession` instances.
+returns `Session` instances.

 When using XML configuration, it would look something like this:
 [source,xml,indent=0]
@@ -458,11 +458,7 @@ include::{indexdoc-tests}[tags=repository-demo]
 <5> We retrieve the `Session` from the `SessionRepository`.
 <6> We obtain the persisted `User` from our `Session` without the need for explicitly casting our attribute.

-[[api-expiringsession]]
-=== ExpiringSession
-
-An `ExpiringSession` extends a `Session` by providing attributes related to the `Session` instance's expiration.
-If there is no need to interact with the expiration information, prefer using the more simple `Session` API.
+`Session` API also provides attributes related to the `Session` instance's expiration.

 Typical usage might look like the following:

@@ -471,17 +467,17 @@ Typical usage might look like the following:
 include::{indexdoc-tests}[tags=expire-repository-demo]
 ----

-<1> We create a `SessionRepository` instance with a generic type, `S`, that extends `ExpiringSession`. The generic type is defined in our class.
-<2> We create a new `ExpiringSession` using our `SessionRepository` and assign it to a variable of type `S`.
-<3> We interact with the `ExpiringSession`.
-In our example, we demonstrate updating the amount of time the `ExpiringSession` can be inactive before it expires.
-<4> We now save the `ExpiringSession`.
+<1> We create a `SessionRepository` instance with a generic type, `S`, that extends `Session`. The generic type is defined in our class.
+<2> We create a new `Session` using our `SessionRepository` and assign it to a variable of type `S`.
+<3> We interact with the `Session`.
+In our example, we demonstrate updating the amount of time the `Session` can be inactive before it expires.
+<4> We now save the `Session`.
 This is why we needed the generic type `S`.
-The `SessionRepository` only allows saving `ExpiringSession` instances that were created or retrieved using the same `SessionRepository`.
+The `SessionRepository` only allows saving `Session` instances that were created or retrieved using the same `SessionRepository`.
 This allows for the `SessionRepository` to make implementation specific optimizations (i.e. only writing attributes that have changed).
-The last accessed time is automatically updated when the `ExpiringSession` is saved.
-<5> We retrieve the `ExpiringSession` from the `SessionRepository`.
-If the `ExpiringSession` were expired, the result would be null.
+The last accessed time is automatically updated when the `Session` is saved.
+<5> We retrieve the `Session` from the `SessionRepository`.
+If the `Session` were expired, the result would be null.

 [[api-sessionrepository]]
 === SessionRepository
@@ -640,7 +636,7 @@ HMSET spring:session:sessions:33fdd1b6-b496-4b33-9f7d-df96679d32fe sessionAttr:a
 [[api-redisoperationssessionrepository-expiration]]
 ===== Session Expiration

-An expiration is associated to each session using the EXPIRE command based upon the `ExpiringSession.getMaxInactiveInterval()`.
+An expiration is associated to each session using the EXPIRE command based upon the `Session.getMaxInactiveInterval()`.
 For example:

 ----
@@ -653,7 +649,7 @@ An expiration is set on the session itself five minutes after it actually expire

 [NOTE]
 ====
-The `SessionRepository.getSession(String)` method ensures that no expired sessions will be returned.
+The `SessionRepository.findById(String)` method ensures that no expired sessions will be returned.
 This means there is no need to check the expiration before using a session.
 ====

@@ -670,12 +666,12 @@ EXPIRE spring:session:sessions:expires:33fdd1b6-b496-4b33-9f7d-df96679d32fe 1800

 When a session expires key is deleted or expires, the keyspace notification triggers a lookup of the actual session and a SessionDestroyedEvent is fired.

-One problem with relying on Redis expiration exclusively is that Redis makes no guarantee of when the expired event will be fired if they key has not been accessed.
+One problem with relying on Redis expiration exclusively is that Redis makes no guarantee of when the expired event will be fired if the key has not been accessed.
 Specifically the background task that Redis uses to clean up expired keys is a low priority task and may not trigger the key expiration.
 For additional details see http://redis.io/topics/notifications[Timing of expired events] section in the Redis documentation.

 To circumvent the fact that expired events are not guaranteed to happen we can ensure that each key is accessed when it is expected to expire.
-This means that if the TTL is expired on the key, Redis will remove the key and fire the expired event when we try to access they key.
+This means that if the TTL is expired on the key, Redis will remove the key and fire the expired event when we try to access the key.

 For this reason, each session expiration is also tracked to the nearest minute.
 This allows a background task to access the potentially expired sessions to ensure that Redis expired events are fired in a more deterministic fashion.
@@ -687,7 +683,7 @@ EXPIRE spring:session:expirations1439245080000 2100
 ----

 The background task will then use these mappings to explicitly request each key.
-By accessing they key, rather than deleting it, we ensure that Redis deletes the key for us only if the TTL is expired.
+By accessing the key, rather than deleting it, we ensure that Redis deletes the key for us only if the TTL is expired.

 [NOTE]
 ====
@@ -776,7 +772,7 @@ redis 127.0.0.1:6379> hget spring:session:sessions:4fc39ce3-63b3-4e17-b1c4-5e1ed
 [[api-mapsessionrepository]]
 === MapSessionRepository

-The `MapSessionRepository` allows for persisting `ExpiringSession` in a `Map` with the key being the `ExpiringSession` id and the value being the `ExpiringSession`.
+The `MapSessionRepository` allows for persisting `Session` in a `Map` with the key being the `Session` id and the value being the `Session`.
 The implementation can be used with a `ConcurrentHashMap` as a testing or convenience mechanism.
 Alternatively, it can be used with distributed `Map` implementations. For example, it can be used with Hazelcast.

@@ -860,14 +856,14 @@ For example, with PostgreSQL database you would use the following schema script:

 [source,sql,indent=0]
 ----
-include::{session-main-resources-dir}org/springframework/session/jdbc/schema-postgresql.sql[]
+include::{session-jdbc-main-resources-dir}org/springframework/session/jdbc/schema-postgresql.sql[]
 ----

 And with MySQL database:

 [source,sql,indent=0]
 ----
-include::{session-main-resources-dir}org/springframework/session/jdbc/schema-mysql.sql[]
+include::{session-jdbc-main-resources-dir}org/springframework/session/jdbc/schema-mysql.sql[]
 ----

 ==== Transaction management
@@ -962,19 +958,28 @@ Spring Session is Open Source software released under the http://www.apache.org/

 [[community-extensions]]
 === Community Extensions
-https://github.com/maseev/spring-session-orientdb[Spring Session OrientDB]
-http://infinispan.org/docs/dev/user_guide/user_guide.html#externalizing_session_using_spring_session[Spring Session Infinispan]
+
+|===
+| Name | Location
+
+| Spring Session OrientDB
+| https://github.com/maseev/spring-session-orientdb
+
+| Spring Session Infinispan
+| http://infinispan.org/docs/dev/user_guide/user_guide.html#externalizing_session_using_spring_session
+
+|===

 [[minimum-requirements]]
 == Minimum Requirements

 The minimum requirements for Spring Session are:

-* Java 5+
-* If you are running in a Servlet Container (not required), Servlet 2.5+
-* If you are using other Spring libraries (not required), the minimum required version is Spring 3.2.14.
-While we re-run all unit tests against Spring 3.2.x, we recommend using the latest Spring 4.x version when possible.
+* Java 8+
+* If you are running in a Servlet Container (not required), Servlet 3.1+
+* If you are using other Spring libraries (not required), the minimum required version is Spring 5.0.x.
 * `@EnableRedisHttpSession` requires Redis 2.8+. This is necessary to support <<api-redisoperationssessionrepository-expiration,Session Expiration>>
+* `@EnableHazelcastHttpSession` requires Hazelcast 3.6+. This is necessary to support <<api-enablehazelcasthttpsession-storage,`FindByIndexNameSessionRepository`>>

 [NOTE]
 ====
--- a/docs/src/test/java/docs/HttpSessionConfigurationNoOpConfigureRedisActionXmlTests.java
+++ b/docs/src/test/java/docs/HttpSessionConfigurationNoOpConfigureRedisActionXmlTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import org.junit.runner.RunWith;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.session.ExpiringSession;
+import org.springframework.session.Session;
 import org.springframework.session.web.http.SessionRepositoryFilter;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -38,7 +38,7 @@ import static org.mockito.Mockito.mock;
@WebAppConfiguration
 public class HttpSessionConfigurationNoOpConfigureRedisActionXmlTests {
 	@Autowired
-	SessionRepositoryFilter<? extends ExpiringSession> filter;
+	SessionRepositoryFilter<? extends Session> filter;

 	@Test
 	public void redisConnectionFactoryNotUsedSinceNoValidation() {
--- a/docs/src/test/java/docs/IndexDocTests.java
+++ b/docs/src/test/java/docs/IndexDocTests.java
@@ -16,6 +16,9 @@

 package docs;

+import java.time.Duration;
+import java.util.concurrent.ConcurrentHashMap;
+
 import com.hazelcast.config.Config;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
@@ -26,7 +29,6 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.mock.web.MockServletContext;
-import org.springframework.session.ExpiringSession;
 import org.springframework.session.MapSession;
 import org.springframework.session.MapSessionRepository;
 import org.springframework.session.Session;
@@ -49,8 +51,8 @@ public class IndexDocTests {

 	@Test
 	public void repositoryDemo() {
-		RepositoryDemo<ExpiringSession> demo = new RepositoryDemo<>();
-		demo.repository = new MapSessionRepository();
+		RepositoryDemo<MapSession> demo = new RepositoryDemo<>();
+		demo.repository = new MapSessionRepository(new ConcurrentHashMap<>());

 		demo.demo();
 	}
@@ -68,7 +70,7 @@ public class IndexDocTests {

 			this.repository.save(toSave); // <4>

-			S session = this.repository.getSession(toSave.getId()); // <5>
+			S session = this.repository.findById(toSave.getId()); // <5>

 			// <6>
 			User user = session.getAttribute(ATTR_USER);
@@ -81,24 +83,24 @@ public class IndexDocTests {

 	@Test
 	public void expireRepositoryDemo() {
-		ExpiringRepositoryDemo<ExpiringSession> demo = new ExpiringRepositoryDemo<>();
-		demo.repository = new MapSessionRepository();
+		ExpiringRepositoryDemo<MapSession> demo = new ExpiringRepositoryDemo<>();
+		demo.repository = new MapSessionRepository(new ConcurrentHashMap<>());

 		demo.demo();
 	}

 	// tag::expire-repository-demo[]
-	public class ExpiringRepositoryDemo<S extends ExpiringSession> {
+	public class ExpiringRepositoryDemo<S extends Session> {
 		private SessionRepository<S> repository; // <1>

 		public void demo() {
 			S toSave = this.repository.createSession(); // <2>
 			// ...
-			toSave.setMaxInactiveIntervalInSeconds(30); // <3>
+			toSave.setMaxInactiveInterval(Duration.ofSeconds(30)); // <3>

 			this.repository.save(toSave); // <4>

-			S session = this.repository.getSession(toSave.getId()); // <5>
+			S session = this.repository.findById(toSave.getId()); // <5>
 			// ...
 		}

@@ -111,7 +113,7 @@ public class IndexDocTests {
 	public void newRedisOperationsSessionRepository() {
 		// tag::new-redisoperationssessionrepository[]
 		LettuceConnectionFactory factory = new LettuceConnectionFactory();
-		SessionRepository<? extends ExpiringSession> repository = new RedisOperationsSessionRepository(
+		SessionRepository<? extends Session> repository = new RedisOperationsSessionRepository(
 				factory);
 		// end::new-redisoperationssessionrepository[]
 	}
@@ -120,7 +122,8 @@ public class IndexDocTests {
 	@SuppressWarnings("unused")
 	public void mapRepository() {
 		// tag::new-mapsessionrepository[]
-		SessionRepository<? extends ExpiringSession> repository = new MapSessionRepository();
+		SessionRepository<? extends Session> repository = new MapSessionRepository(
+				new ConcurrentHashMap<>());
 		// end::new-mapsessionrepository[]
 	}

@@ -136,7 +139,7 @@ public class IndexDocTests {

 		// ... configure transactionManager ...

-		SessionRepository<? extends ExpiringSession> repository =
+		SessionRepository<? extends Session> repository =
 				new JdbcOperationsSessionRepository(jdbcTemplate, transactionManager);
 		// end::new-jdbcoperationssessionrepository[]
 	}
--- a/docs/src/test/java/docs/SpringHttpSessionConfig.java
+++ b/docs/src/test/java/docs/SpringHttpSessionConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@

 package docs;

+import java.util.concurrent.ConcurrentHashMap;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.session.MapSessionRepository;
@@ -27,7 +29,7 @@ import org.springframework.session.config.annotation.web.http.EnableSpringHttpSe
 public class SpringHttpSessionConfig {
 	@Bean
 	public MapSessionRepository sessionRepository() {
-		return new MapSessionRepository();
+		return new MapSessionRepository(new ConcurrentHashMap<>());
 	}
 }
 // end::class[]
--- a/docs/src/test/java/docs/http/AbstractHttpSessionListenerTests.java
+++ b/docs/src/test/java/docs/http/AbstractHttpSessionListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@

 package docs.http;

+import java.util.Properties;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;

@@ -31,11 +33,13 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;

 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;

 /**
 * @author Rob Winch
+ * @author Mark Paluch
 * @since 1.2
 */
@RunWith(SpringJUnit4ClassRunner.class)
@@ -63,6 +67,7 @@ public abstract class AbstractHttpSessionListenerTests {
 		RedisConnection connection = mock(RedisConnection.class);

 		given(factory.getConnection()).willReturn(connection);
+		given(connection.getConfig(anyString())).willReturn(new Properties());
 		return factory;
 	}

--- a/docs/src/test/java/docs/security/RememberMeSecurityConfiguration.java
+++ b/docs/src/test/java/docs/security/RememberMeSecurityConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@

 package docs.security;

+import java.util.concurrent.ConcurrentHashMap;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -73,7 +75,7 @@ public class RememberMeSecurityConfiguration extends WebSecurityConfigurerAdapte

 	@Bean
 	MapSessionRepository sessionRepository() {
-		return new MapSessionRepository();
+		return new MapSessionRepository(new ConcurrentHashMap<>());
 	}
 }
 // end::class[]
--- a/docs/src/test/java/docs/security/RememberMeSecurityConfigurationTests.java
+++ b/docs/src/test/java/docs/security/RememberMeSecurityConfigurationTests.java
@@ -16,8 +16,8 @@

 package docs.security;

+import java.time.Duration;
 import java.util.Base64;
-import java.util.concurrent.TimeUnit;

 import javax.servlet.http.Cookie;

@@ -26,7 +26,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;

 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.session.ExpiringSession;
+import org.springframework.session.Session;
 import org.springframework.session.SessionRepository;
 import org.springframework.session.web.http.SessionRepositoryFilter;
 import org.springframework.test.context.ContextConfiguration;
@@ -48,7 +48,7 @@ import static org.springframework.security.test.web.servlet.setup.SecurityMockMv
@ContextConfiguration(classes = RememberMeSecurityConfiguration.class)
@WebAppConfiguration
@SuppressWarnings("rawtypes")
-public class RememberMeSecurityConfigurationTests<T extends ExpiringSession> {
+public class RememberMeSecurityConfigurationTests<T extends Session> {
 	@Autowired
 	WebApplicationContext context;
 	@Autowired
@@ -81,9 +81,9 @@ public class RememberMeSecurityConfigurationTests<T extends ExpiringSession> {
 		Cookie cookie = result.getResponse().getCookie("SESSION");
 		assertThat(cookie.getMaxAge()).isEqualTo(Integer.MAX_VALUE);
 		T session = this.sessions
-				.getSession(new String(Base64.getDecoder().decode(cookie.getValue())));
-		assertThat(session.getMaxInactiveIntervalInSeconds())
-				.isEqualTo((int) TimeUnit.DAYS.toSeconds(30));
+				.findById(new String(Base64.getDecoder().decode(cookie.getValue())));
+		assertThat(session.getMaxInactiveInterval())
+				.isEqualTo(Duration.ofDays(30));

 	}
 }
--- a/docs/src/test/java/docs/security/RememberMeSecurityConfigurationXmlTests.java
+++ b/docs/src/test/java/docs/security/RememberMeSecurityConfigurationXmlTests.java
@@ -16,8 +16,8 @@

 package docs.security;

+import java.time.Duration;
 import java.util.Base64;
-import java.util.concurrent.TimeUnit;

 import javax.servlet.http.Cookie;

@@ -26,7 +26,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;

 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.session.ExpiringSession;
+import org.springframework.session.Session;
 import org.springframework.session.SessionRepository;
 import org.springframework.session.web.http.SessionRepositoryFilter;
 import org.springframework.test.context.ContextConfiguration;
@@ -48,7 +48,7 @@ import static org.springframework.security.test.web.servlet.setup.SecurityMockMv
@ContextConfiguration
@WebAppConfiguration
@SuppressWarnings("rawtypes")
-public class RememberMeSecurityConfigurationXmlTests<T extends ExpiringSession> {
+public class RememberMeSecurityConfigurationXmlTests<T extends Session> {
 	@Autowired
 	WebApplicationContext context;
 	@Autowired
@@ -81,9 +81,9 @@ public class RememberMeSecurityConfigurationXmlTests<T extends ExpiringSession>
 		Cookie cookie = result.getResponse().getCookie("SESSION");
 		assertThat(cookie.getMaxAge()).isEqualTo(Integer.MAX_VALUE);
 		T session = this.sessions
-				.getSession(new String(Base64.getDecoder().decode(cookie.getValue())));
-		assertThat(session.getMaxInactiveIntervalInSeconds())
-				.isEqualTo((int) TimeUnit.DAYS.toSeconds(30));
+				.findById(new String(Base64.getDecoder().decode(cookie.getValue())));
+		assertThat(session.getMaxInactiveInterval())
+				.isEqualTo(Duration.ofDays(30));

 	}
 }
--- a/docs/src/test/java/docs/security/SecurityConfiguration.java
+++ b/docs/src/test/java/docs/security/SecurityConfiguration.java
@@ -21,8 +21,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.session.ExpiringSession;
 import org.springframework.session.FindByIndexNameSessionRepository;
+import org.springframework.session.Session;
 import org.springframework.session.security.SpringSessionBackedSessionRegistry;

 /**
@@ -33,7 +33,7 @@ import org.springframework.session.security.SpringSessionBackedSessionRegistry;
 public class SecurityConfiguration extends WebSecurityConfigurerAdapter {

 	@Autowired
-	private FindByIndexNameSessionRepository<ExpiringSession> sessionRepository;
+	private FindByIndexNameSessionRepository<Session> sessionRepository;

 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
@@ -48,8 +48,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {

 	@Bean
 	SpringSessionBackedSessionRegistry sessionRegistry() {
-		return new SpringSessionBackedSessionRegistry<ExpiringSession>(
-				this.sessionRepository);
+		return new SpringSessionBackedSessionRegistry<>(this.sessionRepository);
 	}
 }
 // end::class[]
--- a/docs/src/test/resources/docs/security/RememberMeSecurityConfigurationXmlTests-context.xml
+++ b/docs/src/test/resources/docs/security/RememberMeSecurityConfigurationXmlTests-context.xml
@@ -24,5 +24,9 @@
 	</security:user-service>

 	<bean class="org.springframework.session.config.annotation.web.http.SpringHttpSessionConfiguration"/>
-	<bean id="springSessionRepository" class="org.springframework.session.MapSessionRepository"/>
+	<bean id="springSessionRepository" class="org.springframework.session.MapSessionRepository">
+		<constructor-arg>
+			<bean class="java.util.concurrent.ConcurrentHashMap"/>
+		</constructor-arg>
+	</bean>
 </beans>
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
--- a/config/checkstyle/header.txt
+++ b/config/checkstyle/header.txt
--- a/config/checkstyle/suppressions.xml
+++ b/config/checkstyle/suppressions.xml
@@ -4,6 +4,7 @@
 <suppressions>
 	<suppress files=".+Application\.java" checks="HideUtilityClassConstructor"/>
 	<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor"/>
+	<suppress files=".+SSEFluxWebConfig\.java" checks="RegexpHeader"/>

 	<suppress files="[\\/]src[\\/]test[\\/]java[\\/]" checks="Javadoc"/>
 	<suppress files="[\\/]src[\\/]integration-test[\\/]java[\\/]" checks="Javadoc"/>
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-springBootVersion=1.5.3.RELEASE
-version=2.0.0.M1
+springBootVersion=2.0.0.M3
+version=2.0.0.M4
--- a/gradle/bom.gradle
+++ b/gradle/bom.gradle
@@ -1,3 +0,0 @@
-sonarqube {
-	skipProject = true
-}
--- a/gradle/dependency-management.gradle
+++ b/gradle/dependency-management.gradle
@@ -1,177 +1,56 @@
-dependencyManagement {
-	dependencies {
-		dependency 'biz.paluch.redis:lettuce:4.3.1.Final'
-		dependency 'com.maxmind.geoip2:geoip2:2.3.1'
-		dependency 'edu.umd.cs.mtc:multithreadedtc:1.01'
-		dependency 'org.springframework.shell:spring-shell:1.1.0.RELEASE'
-		dependency 'org.webjars:bootstrap:2.3.2'
-		dependency 'org.webjars:html5shiv:3.7.3'
-		dependency 'org.webjars:knockout:2.3.0'
-		dependency 'org.webjars:sockjs-client:0.3.4'
-		dependency 'org.webjars:stomp-websocket:2.3.0'
-		dependency 'org.webjars:webjars-taglib:0.3'
-	}
-}
-
 dependencyManagement {
 	imports {
-		mavenBom 'org.springframework.data:spring-data-releasetrain:Kay-M3'
-		mavenBom 'org.springframework.security:spring-security-bom:5.0.0.M1'
-		mavenBom 'org.springframework:spring-framework-bom:5.0.0.RC1'
+		mavenBom 'io.projectreactor:reactor-bom:Bismuth-M4'
+		mavenBom 'org.springframework:spring-framework-bom:5.0.0.RC4'
+		mavenBom 'org.springframework.data:spring-data-releasetrain:Kay-RC3'
+		mavenBom 'org.springframework.security:spring-security-bom:5.0.0.M4'
 	}
+
 	dependencies {
-		dependency 'antlr:antlr:2.7.7'
-		dependency 'aopalliance:aopalliance:1.0'
-		dependency 'biz.paluch.redis:lettuce:4.3.1.Final'
-		dependency 'cglib:cglib-nodep:2.1_3'
-		dependency 'cglib:cglib-nodep:3.2.4'
-		dependency 'ch.qos.logback:logback-classic:1.1.11'
+		dependencySet(group: 'com.hazelcast', version: '3.8.3') {
+			entry 'hazelcast'
+			entry 'hazelcast-client'
+		}
+
+		dependencySet(group: 'org.testcontainers', version: '1.4.2') {
+			entry 'mysql'
+			entry 'postgresql'
+			entry 'testcontainers'
+		}
+
 		dependency 'ch.qos.logback:logback-classic:1.2.3'
-		dependency 'ch.qos.logback:logback-core:1.1.11'
-		dependency 'ch.qos.logback:logback-core:1.2.3'
-		dependency 'com.fasterxml.jackson.core:jackson-annotations:2.8.0'
-		dependency 'com.fasterxml.jackson.core:jackson-annotations:2.9.0.pr3'
-		dependency 'com.fasterxml.jackson.core:jackson-core:2.8.8'
-		dependency 'com.fasterxml.jackson.core:jackson-core:2.9.0.pr3'
-		dependency 'com.fasterxml.jackson.core:jackson-databind:2.8.8'
-		dependency 'com.fasterxml.jackson.core:jackson-databind:2.9.0.pr3'
-		dependency 'com.fasterxml:classmate:1.3.3'
-		dependency 'com.google.code.findbugs:jsr305:3.0.2'
-		dependency 'com.google.code.gson:gson:2.8.0'
-		dependency 'com.google.guava:guava:20.0'
-		dependency 'com.google.http-client:google-http-client:1.20.0'
-		dependency 'com.h2database:h2:1.4.195'
-		dependency 'com.hazelcast:hazelcast-client:3.8'
-		dependency 'com.hazelcast:hazelcast:3.8'
-		dependency 'com.jayway.jsonpath:json-path:2.2.0'
-		dependency 'com.maxmind.db:maxmind-db:1.0.0'
+		dependency 'com.fasterxml.jackson.core:jackson-databind:2.9.0.pr4'
+		dependency 'com.h2database:h2:1.4.196'
 		dependency 'com.maxmind.geoip2:geoip2:2.3.1'
-		dependency 'com.vaadin.external.google:android-json:0.0.20131108.vaadin1'
-		dependency 'commons-cli:commons-cli:1.3.1'
 		dependency 'commons-codec:commons-codec:1.10'
-		dependency 'commons-collections:commons-collections:3.2.2'
-		dependency 'commons-io:commons-io:2.5'
-		dependency 'dom4j:dom4j:1.6.1'
 		dependency 'edu.umd.cs.mtc:multithreadedtc:1.01'
-		dependency 'io.lettuce:lettuce-core:5.0.0.M2'
-		dependency 'io.netty:netty-buffer:4.1.10.Final'
-		dependency 'io.netty:netty-codec:4.1.10.Final'
-		dependency 'io.netty:netty-common:4.1.10.Final'
-		dependency 'io.netty:netty-handler:4.1.10.Final'
-		dependency 'io.netty:netty-resolver:4.1.10.Final'
-		dependency 'io.netty:netty-transport:4.1.10.Final'
-		dependency 'io.projectreactor:reactor-core:3.1.0.M1'
-		dependency 'io.reactivex:rxjava:1.3.0'
+		dependency 'io.lettuce:lettuce-core:5.0.0.RC2'
 		dependency 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1'
 		dependency 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02'
 		dependency 'javax.servlet:javax.servlet-api:3.1.0'
-		dependency 'javax.transaction:javax.transaction-api:1.2'
-		dependency 'javax.validation:validation-api:1.1.0.Final'
 		dependency 'junit:junit:4.12'
-		dependency 'net.bytebuddy:byte-buddy-agent:1.6.11'
-		dependency 'net.bytebuddy:byte-buddy:1.6.12'
-		dependency 'net.java.dev.jna:jna-platform:4.1.0'
-		dependency 'net.java.dev.jna:jna:4.2.2'
-		dependency 'net.minidev:accessors-smart:1.1'
-		dependency 'net.minidev:json-smart:2.2.1'
-		dependency 'net.sourceforge.cssparser:cssparser:0.9.18'
-		dependency 'net.sourceforge.cssparser:cssparser:0.9.22'
-		dependency 'net.sourceforge.htmlunit:htmlunit-core-js:2.17'
-		dependency 'net.sourceforge.htmlunit:htmlunit-core-js:2.26'
-		dependency 'net.sourceforge.htmlunit:htmlunit:2.21'
-		dependency 'net.sourceforge.htmlunit:htmlunit:2.26'
-		dependency 'net.sourceforge.htmlunit:neko-htmlunit:2.21'
-		dependency 'net.sourceforge.htmlunit:neko-htmlunit:2.25'
-		dependency 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:1.4.0'
-		dependency 'ognl:ognl:3.0.8'
-		dependency 'org.akhikhl.gretty:gretty-runner-tomcat8:1.4.2'
-		dependency 'org.akhikhl.gretty:gretty-runner-tomcat:1.4.2'
-		dependency 'org.akhikhl.gretty:gretty-runner:1.4.2'
-		dependency 'org.apache.commons:commons-compress:1.9'
-		dependency 'org.apache.commons:commons-exec:1.3'
-		dependency 'org.apache.commons:commons-lang3:3.5'
-		dependency 'org.apache.commons:commons-pool2:2.4.2'
+		dependency 'mysql:mysql-connector-java:5.1.43'
 		dependency 'org.apache.derby:derby:10.13.1.1'
 		dependency 'org.apache.httpcomponents:httpclient:4.5.3'
-		dependency 'org.apache.httpcomponents:httpcore:4.4.6'
-		dependency 'org.apache.httpcomponents:httpmime:4.5.3'
-		dependency 'org.apache.taglibs:taglibs-standard-impl:1.2.5'
 		dependency 'org.apache.taglibs:taglibs-standard-jstlel:1.2.5'
-		dependency 'org.apache.taglibs:taglibs-standard-spec:1.2.5'
-		dependency 'org.apache.tomcat.embed:tomcat-embed-core:8.5.14'
-		dependency 'org.apache.tomcat.embed:tomcat-embed-el:8.5.14'
-		dependency 'org.apache.tomcat.embed:tomcat-embed-jasper:8.5.14'
-		dependency 'org.apache.tomcat.embed:tomcat-embed-logging-log4j:8.0.33'
-		dependency 'org.apache.tomcat.embed:tomcat-embed-websocket:8.5.14'
-		dependency 'org.apache.tomcat:tomcat-jdbc:8.5.14'
-		dependency 'org.apache.tomcat:tomcat-juli:8.5.14'
-		dependency 'org.aspectj:aspectjweaver:1.8.10'
-		dependency 'org.assertj:assertj-core:3.6.2'
-		dependency 'org.codehaus.groovy:groovy-json:2.4.11'
-		dependency 'org.codehaus.groovy:groovy:2.4.10'
-		dependency 'org.codehaus.groovy:groovy:2.4.11'
-		dependency 'org.eclipse.jdt.core.compiler:ecj:4.6.1'
-		dependency 'org.eclipse.jetty.websocket:websocket-api:9.4.4.v20170414'
-		dependency 'org.eclipse.jetty.websocket:websocket-api:9.4.5.v20170502'
-		dependency 'org.eclipse.jetty.websocket:websocket-client:9.4.4.v20170414'
-		dependency 'org.eclipse.jetty.websocket:websocket-client:9.4.5.v20170502'
-		dependency 'org.eclipse.jetty.websocket:websocket-common:9.4.4.v20170414'
-		dependency 'org.eclipse.jetty.websocket:websocket-common:9.4.5.v20170502'
-		dependency 'org.eclipse.jetty:jetty-client:9.4.4.v20170414'
-		dependency 'org.eclipse.jetty:jetty-client:9.4.5.v20170502'
-		dependency 'org.eclipse.jetty:jetty-http:9.4.4.v20170414'
-		dependency 'org.eclipse.jetty:jetty-http:9.4.5.v20170502'
-		dependency 'org.eclipse.jetty:jetty-io:9.4.4.v20170414'
-		dependency 'org.eclipse.jetty:jetty-io:9.4.5.v20170502'
-		dependency 'org.eclipse.jetty:jetty-util:9.4.4.v20170414'
-		dependency 'org.eclipse.jetty:jetty-util:9.4.5.v20170502'
-		dependency 'org.hamcrest:hamcrest-core:1.3'
-		dependency 'org.hamcrest:hamcrest-library:1.3'
-		dependency 'org.hibernate.common:hibernate-commons-annotations:5.0.1.Final'
-		dependency 'org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final'
-		dependency 'org.hibernate:hibernate-core:5.0.12.Final'
-		dependency 'org.hibernate:hibernate-entitymanager:5.0.12.Final'
-		dependency 'org.hibernate:hibernate-validator:5.3.5.Final'
+		dependency 'org.assertj:assertj-core:3.8.0'
 		dependency 'org.hsqldb:hsqldb:2.4.0'
-		dependency 'org.javassist:javassist:3.21.0-GA'
-		dependency 'org.jboss.logging:jboss-logging:3.3.1.Final'
-		dependency 'org.jboss:jandex:2.0.0.Final'
-		dependency 'org.mockito:mockito-core:2.7.22'
-		dependency 'org.objenesis:objenesis:2.5.1'
-		dependency 'org.ow2.asm:asm:5.0.3'
-		dependency 'org.reactivestreams:reactive-streams:1.0.0'
-		dependency 'org.seleniumhq.selenium:htmlunit-driver:2.21'
-		dependency 'org.seleniumhq.selenium:htmlunit-driver:2.26'
-		dependency 'org.seleniumhq.selenium:selenium-api:2.53.1'
-		dependency 'org.seleniumhq.selenium:selenium-api:3.3.1'
-		dependency 'org.seleniumhq.selenium:selenium-remote-driver:2.53.1'
-		dependency 'org.seleniumhq.selenium:selenium-remote-driver:3.3.1'
-		dependency 'org.seleniumhq.selenium:selenium-support:2.53.1'
-		dependency 'org.seleniumhq.selenium:selenium-support:3.3.1'
-		dependency 'org.skyscreamer:jsonassert:1.4.0'
+		dependency 'org.mariadb.jdbc:mariadb-java-client:2.0.3'
+		dependency 'org.mockito:mockito-core:2.8.47'
+		dependency 'org.postgresql:postgresql:42.1.3'
+		dependency 'org.seleniumhq.selenium:htmlunit-driver:2.27'
 		dependency 'org.slf4j:jcl-over-slf4j:1.7.25'
-		dependency 'org.slf4j:jul-to-slf4j:1.7.25'
 		dependency 'org.slf4j:log4j-over-slf4j:1.7.25'
-		dependency 'org.slf4j:slf4j-api:1.7.25'
-		dependency 'org.thymeleaf:thymeleaf-spring4:2.1.5.RELEASE'
-		dependency 'org.thymeleaf:thymeleaf:2.1.5.RELEASE'
-		dependency 'org.unbescape:unbescape:1.1.0.RELEASE'
-		dependency 'org.w3c.css:sac:1.3'
+		dependency 'org.testcontainers:mariadb:1.3.0'
+		dependency 'org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.0.RELEASE'
+		dependency 'org.thymeleaf:thymeleaf-spring5:3.0.7.RC1'
 		dependency 'org.webjars:bootstrap:2.3.2'
 		dependency 'org.webjars:html5shiv:3.7.3'
 		dependency 'org.webjars:jquery:1.9.0'
 		dependency 'org.webjars:knockout:2.3.0'
 		dependency 'org.webjars:sockjs-client:0.3.4'
 		dependency 'org.webjars:stomp-websocket:2.3.0'
-		dependency 'org.webjars:webjars-locator-core:0.30'
-		dependency 'org.webjars:webjars-locator-core:0.32'
-		dependency 'org.webjars:webjars-locator:0.32-1'
 		dependency 'org.webjars:webjars-taglib:0.3'
-		dependency 'org.yaml:snakeyaml:1.17'
 		dependency 'redis.clients:jedis:2.9.0'
-		dependency 'xalan:serializer:2.7.2'
-		dependency 'xalan:xalan:2.7.2'
-		dependency 'xerces:xercesImpl:2.11.0'
-		dependency 'xml-apis:xml-apis:1.4.01'
 	}
 }
--- a/gradle/ide.gradle
+++ b/gradle/ide.gradle
@@ -1,60 +0,0 @@
-import org.gradle.plugins.ide.eclipse.model.ProjectDependency
-import org.gradle.plugins.ide.eclipse.model.SourceFolder
-
-
-apply plugin: "propdeps-eclipse"
-apply plugin: "propdeps-idea"
-
-eclipse {
-	jdt {
-		javaRuntimeName = "J2SE-1.5"
-	}
-}
-
-eclipse.project.buildCommand "net.sf.eclipsecs.core.CheckstyleBuilder"
-eclipse.project.natures "net.sf.eclipsecs.core.CheckstyleNature"
-
-// Include project specific settings
-task eclipseCheckstyle(type: Copy) {
-	from rootProject.files(
-		"eclipse/.checkstyle")
-	into project.projectDir
-	expand(configDir: rootProject.file('config/checkstyle').absolutePath)
-}
-
-task eclipseSettings(type: Copy) {
-	from rootProject.files(
-		"eclipse/org.eclipse.jdt.ui.prefs",
-		"eclipse/org.eclipse.wst.common.project.facet.core.xml")
-	into project.file('.settings/')
-	outputs.upToDateWhen { false }
-}
-
-task eclipseWstComponent(type: Copy) {
-	from rootProject.files(
-		"eclipse/org.eclipse.wst.common.component")
-	into project.file('.settings/')
-	expand(deployname: project.name)
-	outputs.upToDateWhen { false }
-}
-
-task eclipseJdtPrepare(type: Copy) {
-	from rootProject.file("eclipse/org.eclipse.jdt.core.prefs")
-	into project.file(".settings/")
-	outputs.upToDateWhen { false }
-}
-
-task cleanEclipseJdtUi(type: Delete) {
-	delete project.file(".settings/org.eclipse.jdt.core.prefs")
-	delete project.file(".settings/org.eclipse.jdt.ui.prefs")
-	delete project.file(".settings/org.eclipse.wst.common.component")
-	delete project.file(".settings/org.eclipse.wst.common.project.facet.core.xml")
-}
-
-task eclipseConfiguration(dependsOn: [eclipseCheckstyle, eclipseJdtPrepare, eclipseSettings, eclipseWstComponent]) {
-	group 'ide'
-}
-
-tasks["eclipseJdt"].dependsOn(eclipseJdtPrepare)
-tasks["cleanEclipse"].dependsOn(cleanEclipseJdtUi)
-tasks["eclipse"].dependsOn(eclipseConfiguration)
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -1,92 +0,0 @@
-apply plugin: 'java'
-apply plugin: 'groovy'
-apply plugin: 'javadocHotfix'
-apply plugin: 'eclipse-wtp'
-apply plugin: 'propdeps'
-apply plugin: 'propdeps-idea'
-apply plugin: 'propdeps-eclipse'
-apply plugin: 'com.github.ben-manes.versions'
-apply plugin: 'checkstyle'
-apply from: IDE_GRADLE
-
-group = 'org.springframework.session'
-
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
-ext.springIoVersion = project.hasProperty('platformVersion') ? platformVersion : 'Cairo-BUILD-SNAPSHOT'
-
-ext.seleniumDependencies = [
-		"org.seleniumhq.selenium:htmlunit-driver:$htmlUnitVersion",
-		"org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
-]
-
-ext.jstlDependencies = [
-		"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
-		"org.apache.taglibs:taglibs-standard-jstlel:1.2.1"
-]
-
-repositories {
-	mavenCentral()
-	maven { url 'https://repo.spring.io/libs-snapshot' }
-	maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
-}
-
-configurations.all {
-	resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-			if (details.requested.group == 'org.springframework') {
-				details.useVersion springVersion
-			}
-	}
-}
-// Integration test setup
-configurations {
-	integrationTestCompile {
-		extendsFrom testCompile, optional, provided
-	}
-	integrationTestRuntime {
-		extendsFrom integrationTestCompile, testRuntime
-	}
-}
-
-sourceSets {
-	integrationTest {
-		java.srcDir file('src/integration-test/java')
-		groovy.srcDirs file('src/integration-test/groovy')
-		resources.srcDir file('src/integration-test/resources')
-		compileClasspath = sourceSets.main.output + sourceSets.test.output + configurations.integrationTestCompile
-		runtimeClasspath = output + compileClasspath + configurations.integrationTestRuntime
-	}
-}
-
-task integrationTest(type: Test, dependsOn: jar) {
-	testClassesDir = sourceSets.integrationTest.output.classesDir
-	logging.captureStandardOutput(LogLevel.INFO)
-	classpath = sourceSets.integrationTest.runtimeClasspath
-	maxParallelForks = 1
-	reports {
-		html.destination = project.file("$project.buildDir/reports/integration-tests/")
-		junitXml.destination = project.file("$project.buildDir/integration-test-results/")
-	}
-}
-check.dependsOn integrationTest
-
-checkstyle {
-	configFile = rootProject.file('config/checkstyle/checkstyle.xml')
-	configProperties.configDir = configFile.parentFile
-	toolVersion = '6.16.1'
-}
-
-task checkstyle {
-	dependsOn project.tasks.findAll { task -> task.name.matches('checkstyle\\w+') }
-}
-
-eclipse {
-	classpath {
-		plusConfigurations += [ configurations.integrationTestCompile ]
-	}
-}
-
-project.idea.module {
-	scopes.TEST.plus += [project.configurations.integrationTestRuntime]
-}
--- a/gradle/publish-maven.gradle
+++ b/gradle/publish-maven.gradle
@@ -1,51 +0,0 @@
-apply plugin: 'propdeps-maven'
-
-install {
-	repositories.mavenInstaller {
-		customizePom(pom, project)
-	}
-}
-
-def customizePom(pom, gradleProject) {
-	pom.whenConfigured { generatedPom ->
-
-		// sort to make pom dependencies order consistent to ease comparison of older poms
-		generatedPom.dependencies = generatedPom.dependencies.sort { dep ->
-			"$dep.scope:$dep.groupId:$dep.artifactId"
-		}
-
-		// add all items necessary for maven central publication
-		generatedPom.project {
-			name = gradleProject.description
-			description = gradleProject.description
-			url = "https://github.com/spring-projects/spring-session"
-			organization {
-				name = "Spring IO"
-				url = "http://projects.spring.io/spring-session"
-			}
-			licenses {
-				license {
-					name "The Apache Software License, Version 2.0"
-					url "http://www.apache.org/licenses/LICENSE-2.0.txt"
-					distribution "repo"
-				}
-			}
-			scm {
-				url = "https://github.com/spring-projects/spring-session"
-				connection = "scm:git:git://github.com/spring-projects/spring-session"
-				developerConnection = "scm:git:git://github.com/spring-projects/spring-session"
-			}
-			developers {
-				developer {
-					id = "rwinch"
-					name = "Rob Winch"
-					email = "rwinch@pivotal.io"
-				}
-			}
-			issueManagement {
-				system = "GitHub"
-				url = "https://github.com/spring-projects/spring-session/issues"
-			}
-		}
-	}
-}
--- a/gradle/sample.gradle
+++ b/gradle/sample.gradle
@@ -1,4 +0,0 @@
-tasks.findByPath("artifactoryPublish")?.enabled = false
-sonarqube {
-	skipProject = true
-}
--- a/gradle/spring3.gradle
+++ b/gradle/spring3.gradle
@@ -1,36 +0,0 @@
-configurations {
-	spring3TestRuntime.extendsFrom testRuntime
-}
-
-configurations.spring3TestRuntime {
-	resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-		if (details.requested.group == 'org.springframework'
-				&& details.requested.name != 'spring-websocket'
-				&& details.requested.name != 'spring-messaging') {
-			details.useVersion '3.2.18.RELEASE'
-		}
-		if (details.requested.group == 'org.springframework.data') {
-			if (details.requested.name == 'spring-data-commons') {
-				details.useVersion '1.12.1.RELEASE'
-			}
-			if (details.requested.name == 'spring-data-keyvalue') {
-				details.useVersion '1.1.1.RELEASE'
-			}
-			if (details.requested.name == 'spring-data-redis') {
-				details.useVersion '1.7.1.RELEASE'
-			}
-		}
-	}
-}
-
-task spring3Test(type: Test) {
-	jvmArgs = ['-ea', '-Xmx500m', '-XX:MaxPermSize=128M']
-	classpath = sourceSets.test.output + sourceSets.main.output + configurations.spring3TestRuntime
-	exclude "org/springframework/session/web/socket/**"
-	reports {
-		html.destination = project.file("$buildDir/spring3-test-results/")
-		junitXml.destination = project.file("$buildDir/reports/spring3-tests/")
-	}
-}
-
-//check.dependsOn spring3Test
--- a/gradle/tomcat.gradle
+++ b/gradle/tomcat.gradle
@@ -1,61 +0,0 @@
-buildscript {
-	repositories {
-		maven { url "https://repo.spring.io/plugins-release" }
-	}
-	dependencies {
-		classpath("com.bmuschko:gradle-tomcat-plugin:2.2.5")
-	}
-}
-
-apply plugin: 'war'
-apply plugin: 'com.bmuschko.tomcat'
-
-[tomcatRun,tomcatRunWar]*.contextPath = '/'
-
-
-task integrationTomcatRun(type: com.bmuschko.gradle.tomcat.tasks.TomcatRun) {
-	onlyIf { !sourceSets.integrationTest.allSource.empty }
-	contextPath = tomcatRun.contextPath
-	daemon = true
-	tomcatClasspath = tomcatRun.tomcatClasspath
-	webAppClasspath = tomcatRun.webAppClasspath
-	webAppSourceDirectory = tomcatRun.webAppSourceDirectory
-	doFirst {
-		def mainOutputDir = project.sourceSets.main.output.classesDir
-		if(mainOutputDir) {
-			classesDirectory = mainOutputDir
-		}
-		// delay reserving ports to ensure they are still available
-		def ports = reservePorts(3)
-		httpPort = ports[0]
-		ajpPort = ports[1]
-		stopPort = ports[2]
-
-		System.setProperty('spring.session.redis.namespace',project.name)
-	}
-}
-
-task integrationTomcatStop(type: com.bmuschko.gradle.tomcat.tasks.TomcatStop) {
-	onlyIf { !sourceSets.integrationTest.allSource.empty }
-	doFirst {
-		stopPort = integrationTomcatRun.stopPort
-	}
-}
-
-integrationTest {
-	dependsOn integrationTomcatRun
-	doFirst {
-		systemProperties['tomcat.port'] = integrationTomcatRun.httpPort
-	}
-	finalizedBy integrationTomcatStop
-}
-
-def reservePorts(int count) {
-	def sockets = []
-	for(int i in 1..count) {
-		sockets << new ServerSocket(0)
-	}
-	def result = sockets*.localPort
-	sockets*.close()
-	result
-}
--- a/gradle/tomcat6.gradle
+++ b/gradle/tomcat6.gradle
@@ -1,8 +0,0 @@
-apply from: TOMCAT_GRADLE
-
-dependencies {
-	def tomcatVersion = '6.0.43'
-	tomcat "org.apache.tomcat:catalina:${tomcatVersion}",
-			"org.apache.tomcat:coyote:${tomcatVersion}",
-			"org.apache.tomcat:jasper:${tomcatVersion}"
-}
--- a/gradle/tomcat7.gradle
+++ b/gradle/tomcat7.gradle
@@ -1,8 +0,0 @@
-apply from: TOMCAT_GRADLE
-
-dependencies {
-	def tomcatVersion = '7.0.59'
-	tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
-			"org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}",
-			"org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}"
-}
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jan 11 10:54:44 CST 2017
+#Fri Jul 07 11:11:13 CDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip
--- a/19
+++ b/19
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh

 ##############################################################################
 ##
@@ -154,16 +154,19 @@ if $cygwin ; then
    esac
 fi

-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
  cd "$(dirname "$0")"
 fi

-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"
--- a/samples/boot/findbyusername/spring-session-sample-boot-findbyusername.gradle
+++ b/samples/boot/findbyusername/spring-session-sample-boot-findbyusername.gradle
@@ -1,9 +1,13 @@
 apply plugin: 'io.spring.convention.spring-sample-boot'

+ext['spring-data-releasetrain.version'] = 'Kay-RC3'
+
 dependencies {
 	compile project(':spring-session-data-redis')
+	compile "org.springframework.boot:spring-boot-starter-web"
 	compile "org.springframework.boot:spring-boot-starter-thymeleaf"
 	compile "org.springframework.boot:spring-boot-starter-security"
+	compile "org.springframework.boot:spring-boot-starter-data-redis"
 	compile "org.springframework.boot:spring-boot-devtools"
 	compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
 	compile "org.webjars:bootstrap"
@@ -16,12 +20,7 @@ dependencies {
 	testCompile "org.assertj:assertj-core"

 	integrationTestCompile seleniumDependencies
-}
-
-integrationTest {
-	doFirst {
-		systemProperties['spring.session.redis.namespace'] = project.name
-	}
+	integrationTestCompile "org.testcontainers:testcontainers"
 }

 integrationTest {
--- a/samples/boot/findbyusername/src/integration-test/java/sample/FindByUsernameTests.java
+++ b/samples/boot/findbyusername/src/integration-test/java/sample/FindByUsernameTests.java
@@ -18,9 +18,11 @@ package sample;

 import org.junit.After;
 import org.junit.Before;
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openqa.selenium.WebDriver;
+import org.testcontainers.containers.GenericContainer;
 import sample.pages.HomePage;
 import sample.pages.LoginPage;

@@ -28,6 +30,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDriverBuilder;
@@ -35,12 +41,20 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr
 /**
 * @author Eddú Meléndez
 * @author Rob Winch
+ * @author Vedran Pavic
 */
@RunWith(SpringRunner.class)
@AutoConfigureMockMvc
-@SpringBootTest(webEnvironment = WebEnvironment.MOCK)
+@SpringBootTest(classes = FindByUsernameApplication.class, webEnvironment = WebEnvironment.MOCK)
+@ContextConfiguration(initializers = FindByUsernameTests.Initializer.class)
 public class FindByUsernameTests {

+	private static final String DOCKER_IMAGE = "redis:3.2.9";
+
+	@ClassRule
+	public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)
+			.withExposedPorts(6379);
+
 	@Autowired
 	private MockMvc mockMvc;

@@ -72,4 +86,18 @@ public class FindByUsernameTests {
 		home.terminateButtonDisabled();
 	}

+	static class Initializer
+			implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+
+		@Override
+		public void initialize(
+				ConfigurableApplicationContext configurableApplicationContext) {
+			TestPropertyValues
+					.of("spring.redis.host=" + redisContainer.getContainerIpAddress(),
+							"spring.redis.port=" + redisContainer.getFirstMappedPort())
+					.applyTo(configurableApplicationContext.getEnvironment());
+		}
+
+	}
+
 }
--- a/samples/boot/findbyusername/src/main/java/sample/config/WebMvcConfig.java
+++ b/samples/boot/findbyusername/src/main/java/sample/config/WebMvcConfig.java
@@ -18,10 +18,10 @@ package sample.config;

 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

@Configuration
-public class WebMvcConfig extends WebMvcConfigurerAdapter {
+public class WebMvcConfig implements WebMvcConfigurer {

 	@Override
 	public void addViewControllers(ViewControllerRegistry registry) {
--- a/samples/boot/findbyusername/src/main/java/sample/mvc/IndexController.java
+++ b/samples/boot/findbyusername/src/main/java/sample/mvc/IndexController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import java.util.Collection;
 import java.util.Set;

 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.session.ExpiringSession;
 import org.springframework.session.FindByIndexNameSessionRepository;
+import org.springframework.session.Session;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -39,11 +39,11 @@ import org.springframework.web.bind.annotation.RequestMethod;
 public class IndexController {
 	// tag::findbyusername[]
 	@Autowired
-	FindByIndexNameSessionRepository<? extends ExpiringSession> sessions;
+	FindByIndexNameSessionRepository<? extends Session> sessions;

 	@RequestMapping("/")
 	public String index(Principal principal, Model model) {
-		Collection<? extends ExpiringSession> usersSessions = this.sessions
+		Collection<? extends Session> usersSessions = this.sessions
 				.findByIndexNameAndIndexValue(
 						FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME,
 						principal.getName())
@@ -60,7 +60,7 @@ public class IndexController {
 				FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME,
 				principal.getName()).keySet();
 		if (usersSessionIds.contains(sessionIdToDelete)) {
-			this.sessions.delete(sessionIdToDelete);
+			this.sessions.deleteById(sessionIdToDelete);
 		}

 		return "redirect:/";
--- a/samples/boot/findbyusername/src/main/resources/templates/index.html
+++ b/samples/boot/findbyusername/src/main/resources/templates/index.html
@@ -1,4 +1,4 @@
-<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layout">
+<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
 <head>
 	<title>Secured Content</title>
 </head>
@@ -21,8 +21,8 @@
 			<tr th:each="sessionElement : ${sessions}" th:with="details=${sessionElement.getAttribute('SESSION_DETAILS')}">
 				<td th:text="${sessionElement.id.substring(30)}"></td>
 				<td th:text="${details?.location}"></td>
-				<td th:text="${#dates.format(new java.util.Date(sessionElement.creationTime),'dd/MMM/yyyy HH:mm:ss')}"></td>
-				<td th:text="${#dates.format(new java.util.Date(sessionElement.lastAccessedTime),'dd/MMM/yyyy HH:mm:ss')}"></td>
+				<td th:text="${#temporals.format(sessionElement.creationTime.atZone(T(java.time.ZoneId).systemDefault()),'dd/MMM/yyyy HH:mm:ss')}"></td>
+				<td th:text="${#temporals.format(sessionElement.lastAccessedTime.atZone(T(java.time.ZoneId).systemDefault()),'dd/MMM/yyyy HH:mm:ss')}"></td>
 				<td th:text="${details?.accessType}"></td>
 				<td>
 					<form th:action="@{'/sessions/' + ${sessionElement.id}}" th:method="delete">
--- a/samples/boot/findbyusername/src/main/resources/templates/layout.html
+++ b/samples/boot/findbyusername/src/main/resources/templates/layout.html
@@ -3,7 +3,7 @@
 			xmlns:th="http://www.thymeleaf.org"
 			xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
 	<head>
-		<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
+		<title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
 		<link rel="icon" type="image/x-icon" th:href="@{/favicon.ico}" href="../static/favicon.ico"/>
 		<link th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" href="/webjars/bootstrap/css/bootstrap.min.css" rel="stylesheet"></link>
 		<style type="text/css">
--- a/samples/boot/findbyusername/src/main/resources/templates/login.html
+++ b/samples/boot/findbyusername/src/main/resources/templates/login.html
@@ -1,6 +1,6 @@
 <html xmlns:th="http://www.thymeleaf.org"
 	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-	layout:decorator="layout">
+	layout:decorate="~{layout}">
 <head>
 <title>Log In</title>
 </head>
@@ -44,4 +44,4 @@
 		</div>
 	</div>
 </body>
-</html>
+</html>
--- a/samples/boot/gradle/dependency-management.gradle
+++ b/samples/boot/gradle/dependency-management.gradle
@@ -1,152 +0,0 @@
-dependencyManagement {
-        dependencies {
-                dependency 'antlr:antlr:2.7.7'
-                dependency 'aopalliance:aopalliance:1.0'
-                dependency 'biz.paluch.redis:lettuce:4.3.1.Final'
-                dependency 'cglib:cglib-nodep:2.1_3'
-                dependency 'ch.qos.logback:logback-classic:1.1.11'
-                dependency 'ch.qos.logback:logback-core:1.1.11'
-                dependency 'com.fasterxml.jackson.core:jackson-annotations:2.8.0'
-                dependency 'com.fasterxml.jackson.core:jackson-core:2.8.8'
-                dependency 'com.fasterxml.jackson.core:jackson-databind:2.8.8'
-                dependency 'com.fasterxml:classmate:1.3.3'
-                dependency 'com.google.code.findbugs:jsr305:3.0.2'
-                dependency 'com.google.code.gson:gson:2.8.0'
-                dependency 'com.google.guava:guava:20.0'
-                dependency 'com.google.http-client:google-http-client:1.20.0'
-                dependency 'com.h2database:h2:1.4.194'
-                dependency 'com.jayway.jsonpath:json-path:2.2.0'
-                dependency 'com.maxmind.db:maxmind-db:1.0.0'
-                dependency 'com.maxmind.geoip2:geoip2:2.3.1'
-                dependency 'com.vaadin.external.google:android-json:0.0.20131108.vaadin1'
-                dependency 'commons-codec:commons-codec:1.10'
-                dependency 'commons-collections:commons-collections:3.2.2'
-                dependency 'commons-io:commons-io:2.5'
-                dependency 'dom4j:dom4j:1.6.1'
-                dependency 'io.netty:netty-buffer:4.1.10.Final'
-                dependency 'io.netty:netty-codec:4.1.10.Final'
-                dependency 'io.netty:netty-common:4.1.10.Final'
-                dependency 'io.netty:netty-handler:4.1.10.Final'
-                dependency 'io.netty:netty-resolver:4.1.10.Final'
-                dependency 'io.netty:netty-transport:4.1.10.Final'
-                dependency 'io.reactivex:rxjava:1.3.0'
-                dependency 'javax.transaction:javax.transaction-api:1.2'
-                dependency 'javax.validation:validation-api:1.1.0.Final'
-                dependency 'junit:junit:4.12'
-                dependency 'net.java.dev.jna:jna-platform:4.1.0'
-                dependency 'net.java.dev.jna:jna:4.2.2'
-                dependency 'net.minidev:accessors-smart:1.1'
-                dependency 'net.minidev:json-smart:2.2.1'
-                dependency 'net.sourceforge.cssparser:cssparser:0.9.18'
-                dependency 'net.sourceforge.htmlunit:htmlunit-core-js:2.17'
-                dependency 'net.sourceforge.htmlunit:htmlunit:2.21'
-                dependency 'net.sourceforge.htmlunit:neko-htmlunit:2.21'
-                dependency 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:1.4.0'
-                dependency 'ognl:ognl:3.0.8'
-                dependency 'org.apache.commons:commons-compress:1.9'
-                dependency 'org.apache.commons:commons-exec:1.3'
-                dependency 'org.apache.commons:commons-lang3:3.5'
-                dependency 'org.apache.commons:commons-pool2:2.4.2'
-                dependency 'org.apache.httpcomponents:httpclient:4.5.3'
-                dependency 'org.apache.httpcomponents:httpcore:4.4.6'
-                dependency 'org.apache.httpcomponents:httpmime:4.5.3'
-                dependency 'org.apache.tomcat.embed:tomcat-embed-core:8.5.14'
-                dependency 'org.apache.tomcat.embed:tomcat-embed-el:8.5.14'
-                dependency 'org.apache.tomcat.embed:tomcat-embed-websocket:8.5.14'
-                dependency 'org.apache.tomcat:tomcat-jdbc:8.5.14'
-                dependency 'org.apache.tomcat:tomcat-juli:8.5.14'
-                dependency 'org.aspectj:aspectjweaver:1.8.10'
-                dependency 'org.assertj:assertj-core:2.6.0'
-                dependency 'org.codehaus.groovy:groovy:2.4.10'
-                dependency 'org.eclipse.jetty.websocket:websocket-api:9.4.4.v20170414'
-                dependency 'org.eclipse.jetty.websocket:websocket-client:9.4.4.v20170414'
-                dependency 'org.eclipse.jetty.websocket:websocket-common:9.4.4.v20170414'
-                dependency 'org.eclipse.jetty:jetty-client:9.4.4.v20170414'
-                dependency 'org.eclipse.jetty:jetty-http:9.4.4.v20170414'
-                dependency 'org.eclipse.jetty:jetty-io:9.4.4.v20170414'
-                dependency 'org.eclipse.jetty:jetty-util:9.4.4.v20170414'
-                dependency 'org.hamcrest:hamcrest-core:1.3'
-                dependency 'org.hamcrest:hamcrest-library:1.3'
-                dependency 'org.hibernate.common:hibernate-commons-annotations:5.0.1.Final'
-                dependency 'org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final'
-                dependency 'org.hibernate:hibernate-core:5.0.12.Final'
-                dependency 'org.hibernate:hibernate-entitymanager:5.0.12.Final'
-                dependency 'org.hibernate:hibernate-validator:5.3.5.Final'
-                dependency 'org.javassist:javassist:3.21.0-GA'
-                dependency 'org.jboss.logging:jboss-logging:3.3.1.Final'
-                dependency 'org.jboss:jandex:2.0.0.Final'
-                dependency 'org.mockito:mockito-core:1.10.19'
-                dependency 'org.objenesis:objenesis:2.5.1'
-                dependency 'org.ow2.asm:asm:5.0.3'
-                dependency 'org.seleniumhq.selenium:htmlunit-driver:2.21'
-                dependency 'org.seleniumhq.selenium:selenium-api:2.53.1'
-                dependency 'org.seleniumhq.selenium:selenium-remote-driver:2.53.1'
-                dependency 'org.seleniumhq.selenium:selenium-support:2.53.1'
-                dependency 'org.skyscreamer:jsonassert:1.4.0'
-                dependency 'org.slf4j:jcl-over-slf4j:1.7.25'
-                dependency 'org.slf4j:jul-to-slf4j:1.7.25'
-                dependency 'org.slf4j:log4j-over-slf4j:1.7.25'
-                dependency 'org.slf4j:slf4j-api:1.7.25'
-                dependency 'org.springframework.boot:spring-boot-autoconfigure:1.5.3.RELEASE'
-                dependency 'org.springframework.boot:spring-boot-starter-aop:1.5.3.RELEASE'
-                dependency 'org.springframework.boot:spring-boot-starter-data-jpa:1.5.3.RELEASE'
-                dependency 'org.springframework.boot:spring-boot-starter-jdbc:1.5.3.RELEASE'
-                dependency 'org.springframework.boot:spring-boot-starter-logging:1.5.3.RELEASE'
-                dependency 'org.springframework.boot:spring-boot-starter-security:1.5.3.RELEASE'
-                dependency 'org.springframework.boot:spring-boot-starter-test:1.5.3.RELEASE'
-                dependency 'org.springframework.boot:spring-boot-starter-thymeleaf:1.5.3.RELEASE'
-                dependency 'org.springframework.boot:spring-boot-starter-tomcat:1.5.3.RELEASE'
-                dependency 'org.springframework.boot:spring-boot-starter-web:1.5.3.RELEASE'
-                dependency 'org.springframework.boot:spring-boot-starter-websocket:1.5.3.RELEASE'
-                dependency 'org.springframework.boot:spring-boot-starter:1.5.3.RELEASE'
-                dependency 'org.springframework.boot:spring-boot-test-autoconfigure:1.5.3.RELEASE'
-                dependency 'org.springframework.boot:spring-boot-test:1.5.3.RELEASE'
-                dependency 'org.springframework.boot:spring-boot:1.5.3.RELEASE'
-                dependency 'org.springframework.data:spring-data-commons:1.13.3.RELEASE'
-                dependency 'org.springframework.data:spring-data-jpa:1.11.3.RELEASE'
-                dependency 'org.springframework.data:spring-data-keyvalue:1.2.3.RELEASE'
-                dependency 'org.springframework.data:spring-data-redis:1.8.3.RELEASE'
-                dependency 'org.springframework.security:spring-security-config:4.2.2.RELEASE'
-                dependency 'org.springframework.security:spring-security-core:4.2.2.RELEASE'
-                dependency 'org.springframework.security:spring-security-data:4.2.2.RELEASE'
-                dependency 'org.springframework.security:spring-security-messaging:4.2.2.RELEASE'
-                dependency 'org.springframework.security:spring-security-test:4.2.2.RELEASE'
-                dependency 'org.springframework.security:spring-security-web:4.2.2.RELEASE'
-                dependency 'org.springframework:spring-aop:4.3.8.RELEASE'
-                dependency 'org.springframework:spring-aspects:4.3.8.RELEASE'
-                dependency 'org.springframework:spring-beans:4.3.8.RELEASE'
-                dependency 'org.springframework:spring-context-support:4.3.8.RELEASE'
-                dependency 'org.springframework:spring-context:4.3.8.RELEASE'
-                dependency 'org.springframework:spring-core:4.3.8.RELEASE'
-                dependency 'org.springframework:spring-expression:4.3.8.RELEASE'
-                dependency 'org.springframework:spring-jcl:5.0.0.RC1'
-                dependency 'org.springframework:spring-jdbc:4.3.8.RELEASE'
-                dependency 'org.springframework:spring-messaging:4.3.8.RELEASE'
-                dependency 'org.springframework:spring-orm:4.3.8.RELEASE'
-                dependency 'org.springframework:spring-oxm:4.3.8.RELEASE'
-                dependency 'org.springframework:spring-test:4.3.8.RELEASE'
-                dependency 'org.springframework:spring-tx:4.3.8.RELEASE'
-                dependency 'org.springframework:spring-web:4.3.8.RELEASE'
-                dependency 'org.springframework:spring-webmvc:4.3.8.RELEASE'
-                dependency 'org.springframework:spring-websocket:4.3.8.RELEASE'
-                dependency 'org.thymeleaf:thymeleaf-spring4:2.1.5.RELEASE'
-                dependency 'org.thymeleaf:thymeleaf:2.1.5.RELEASE'
-                dependency 'org.unbescape:unbescape:1.1.0.RELEASE'
-                dependency 'org.w3c.css:sac:1.3'
-                dependency 'org.webjars:bootstrap:2.3.2'
-                dependency 'org.webjars:html5shiv:3.7.3'
-                dependency 'org.webjars:jquery:1.9.0'
-                dependency 'org.webjars:knockout:2.3.0'
-                dependency 'org.webjars:sockjs-client:0.3.4'
-                dependency 'org.webjars:stomp-websocket:2.3.0'
-                dependency 'org.webjars:webjars-locator-core:0.32'
-                dependency 'org.webjars:webjars-locator:0.32-1'
-                dependency 'org.yaml:snakeyaml:1.17'
-                dependency 'redis.clients:jedis:2.9.0'
-                dependency 'xalan:serializer:2.7.2'
-                dependency 'xalan:xalan:2.7.2'
-                dependency 'xerces:xercesImpl:2.11.0'
-                dependency 'xml-apis:xml-apis:1.4.01'
-        }
-}
-
--- a/samples/boot/jdbc/spring-session-sample-boot-jdbc.gradle
+++ b/samples/boot/jdbc/spring-session-sample-boot-jdbc.gradle
@@ -2,6 +2,7 @@ apply plugin: 'io.spring.convention.spring-sample-boot'

 dependencies {
 	compile project(':spring-session-jdbc')
+	compile "org.springframework.boot:spring-boot-starter-web"
 	compile "org.springframework.boot:spring-boot-starter-thymeleaf"
 	compile "org.springframework.boot:spring-boot-starter-security"
 	compile "org.springframework.boot:spring-boot-devtools"
--- a/samples/boot/jdbc/src/main/java/sample/config/WebMvcConfig.java
+++ b/samples/boot/jdbc/src/main/java/sample/config/WebMvcConfig.java
@@ -18,10 +18,10 @@ package sample.config;

 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

@Configuration
-public class WebMvcConfig extends WebMvcConfigurerAdapter {
+public class WebMvcConfig implements WebMvcConfigurer {

 	@Override
 	public void addViewControllers(ViewControllerRegistry registry) {
--- a/samples/boot/jdbc/src/main/resources/templates/index.html
+++ b/samples/boot/jdbc/src/main/resources/templates/index.html
@@ -1,4 +1,4 @@
-<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layout">
+<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
 <head>
 	<title>Secured Content</title>
 </head>
--- a/samples/boot/jdbc/src/main/resources/templates/layout.html
+++ b/samples/boot/jdbc/src/main/resources/templates/layout.html
@@ -3,7 +3,7 @@
 			xmlns:th="http://www.thymeleaf.org"
 			xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
 	<head>
-		<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
+		<title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
 		<link rel="icon" type="image/x-icon" th:href="@{/favicon.ico}" href="../static/favicon.ico"/>
 		<link th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" href="/webjars/bootstrap/css/bootstrap.min.css" rel="stylesheet"></link>
 		<style type="text/css">
--- a/samples/boot/redis-json/spring-session-sample-boot-redis-json.gradle
+++ b/samples/boot/redis-json/spring-session-sample-boot-redis-json.gradle
@@ -1,18 +1,18 @@
 apply plugin: 'io.spring.convention.spring-sample-boot'

+ext['spring-data-releasetrain.version'] = 'Kay-RC3'
+
 dependencies {
-	compile(project(':spring-session-data-redis')) {
-		exclude module: 'jedis'
-		exclude module: 'commons-pool2'
-	}
+	compile project(':spring-session-data-redis')
+	compile "org.springframework.boot:spring-boot-starter-web"
 	compile "org.springframework.boot:spring-boot-starter-thymeleaf"
 	compile "org.springframework.boot:spring-boot-starter-security"
+	compile "org.springframework.boot:spring-boot-starter-data-redis"
 	compile "org.springframework.boot:spring-boot-devtools"
 	compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
 	compile "org.webjars:bootstrap"
 	compile "org.webjars:html5shiv"
 	compile "org.webjars:webjars-locator"
-	compile "biz.paluch.redis:lettuce"
 	compile "org.apache.httpcomponents:httpclient"

 	testCompile "org.springframework.boot:spring-boot-starter-test"
@@ -20,4 +20,5 @@ dependencies {
 	testCompile "org.skyscreamer:jsonassert"

 	integrationTestCompile seleniumDependencies
+	integrationTestCompile "org.testcontainers:testcontainers"
 }
--- a/samples/boot/redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java
+++ b/samples/boot/redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java
@@ -20,9 +20,11 @@ import java.util.List;

 import org.junit.After;
 import org.junit.Before;
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openqa.selenium.WebDriver;
+import org.testcontainers.containers.GenericContainer;
 import sample.pages.HomePage;
 import sample.pages.HomePage.Attribute;
 import sample.pages.LoginPage;
@@ -31,6 +33,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDriverBuilder;
@@ -39,12 +45,20 @@ import static org.assertj.core.api.Assertions.assertThat;

 /**
 * @author Eddú Meléndez
+ * @author Vedran Pavic
 */
@RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = WebEnvironment.MOCK)
+@SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.MOCK)
@AutoConfigureMockMvc
+@ContextConfiguration(initializers = HttpRedisJsonTest.Initializer.class)
 public class HttpRedisJsonTest {

+	private static final String DOCKER_IMAGE = "redis:3.2.9";
+
+	@ClassRule
+	public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)
+			.withExposedPorts(6379);
+
 	@Autowired
 	private MockMvc mockMvc;

@@ -96,4 +110,18 @@ public class HttpRedisJsonTest {
 		assertThat(attributes).extracting("attributeValue").contains("Demo Value");
 	}

+	static class Initializer
+			implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+
+		@Override
+		public void initialize(
+				ConfigurableApplicationContext configurableApplicationContext) {
+			TestPropertyValues
+					.of("spring.redis.host=" + redisContainer.getContainerIpAddress(),
+							"spring.redis.port=" + redisContainer.getFirstMappedPort())
+					.applyTo(configurableApplicationContext.getEnvironment());
+		}
+
+	}
+
 }
--- a/samples/boot/redis-json/src/integration-test/java/sample/RedisSerializerTest.java
+++ b/samples/boot/redis-json/src/integration-test/java/sample/RedisSerializerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -13,28 +13,43 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package sample;

+import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.testcontainers.containers.GenericContainer;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;

 import static org.assertj.core.api.Assertions.assertThat;

 /**
- * @author jitendra on 8/3/16.
+ * @author jitendra
+ * @author Vedran Pavic
 */
@RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(classes = Application.class)
+@ContextConfiguration(initializers = RedisSerializerTest.Initializer.class)
 public class RedisSerializerTest {

+	private static final String DOCKER_IMAGE = "redis:3.2.9";
+
+	@ClassRule
+	public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)
+			.withExposedPorts(6379);
+
 	@Autowired
-	RedisTemplate<Object, Object> sessionRedisTemplate;
+	private RedisTemplate<Object, Object> sessionRedisTemplate;

 	@Test
 	public void testRedisTemplate() {
@@ -43,4 +58,19 @@ public class RedisSerializerTest {
 		assertThat(this.sessionRedisTemplate.getDefaultSerializer())
 				.isInstanceOf(GenericJackson2JsonRedisSerializer.class);
 	}
+
+	static class Initializer
+			implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+
+		@Override
+		public void initialize(
+				ConfigurableApplicationContext configurableApplicationContext) {
+			TestPropertyValues
+					.of("spring.redis.host=" + redisContainer.getContainerIpAddress(),
+							"spring.redis.port=" + redisContainer.getFirstMappedPort())
+					.applyTo(configurableApplicationContext.getEnvironment());
+		}
+
+	}
+
 }
--- a/samples/boot/redis-json/src/main/java/sample/config/SessionConfig.java
+++ b/samples/boot/redis-json/src/main/java/sample/config/SessionConfig.java
@@ -20,7 +20,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.security.jackson2.SecurityJackson2Modules;
@@ -38,11 +37,6 @@ public class SessionConfig implements BeanClassLoaderAware {
 		return new GenericJackson2JsonRedisSerializer(objectMapper());
 	}

-	@Bean
-	public LettuceConnectionFactory connectionFactory() {
-		return new LettuceConnectionFactory();
-	}
-
 	/**
 	 * Customized {@link ObjectMapper} to add mix-in for class that doesn't have default
 	 * constructors
--- a/samples/boot/redis-json/src/main/java/sample/config/WebMvcConfig.java
+++ b/samples/boot/redis-json/src/main/java/sample/config/WebMvcConfig.java
@@ -18,10 +18,10 @@ package sample.config;

 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

@Configuration
-public class WebMvcConfig extends WebMvcConfigurerAdapter {
+public class WebMvcConfig implements WebMvcConfigurer {

 	@Override
 	public void addViewControllers(ViewControllerRegistry registry) {
--- a/samples/boot/redis-json/src/main/resources/templates/home.html
+++ b/samples/boot/redis-json/src/main/resources/templates/home.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layout">
+<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
 <head>
 	<title>Home</title>
 </head>
--- a/samples/boot/redis-json/src/main/resources/templates/layout.html
+++ b/samples/boot/redis-json/src/main/resources/templates/layout.html
@@ -3,7 +3,7 @@
 			xmlns:th="http://www.thymeleaf.org"
 			xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
 	<head>
-		<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
+		<title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
 		<link rel="icon" type="image/x-icon" th:href="@{/favicon.ico}" href="../static/favicon.ico"/>
 		<link th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" href="/webjars/bootstrap/css/bootstrap.min.css" rel="stylesheet"></link>
 		<style type="text/css">
--- a/samples/boot/redis-json/src/main/resources/templates/login.html
+++ b/samples/boot/redis-json/src/main/resources/templates/login.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layout">
+<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
 <head>
 	<title>Login</title>
 </head>
--- a/samples/boot/redis/spring-session-sample-boot-redis.gradle
+++ b/samples/boot/redis/spring-session-sample-boot-redis.gradle
@@ -1,9 +1,13 @@
 apply plugin: 'io.spring.convention.spring-sample-boot'

+ext['spring-data-releasetrain.version'] = 'Kay-RC3'
+
 dependencies {
 	compile project(':spring-session-data-redis')
+	compile "org.springframework.boot:spring-boot-starter-web"
 	compile "org.springframework.boot:spring-boot-starter-thymeleaf"
 	compile "org.springframework.boot:spring-boot-starter-security"
+	compile "org.springframework.boot:spring-boot-starter-data-redis"
 	compile "org.springframework.boot:spring-boot-devtools"
 	compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
 	compile "org.webjars:bootstrap"
@@ -13,4 +17,5 @@ dependencies {
 	testCompile "org.springframework.boot:spring-boot-starter-test"

 	integrationTestCompile seleniumDependencies
+	integrationTestCompile "org.testcontainers:testcontainers"
 }
--- a/samples/boot/redis/src/integration-test/java/sample/BootTests.java
+++ b/samples/boot/redis/src/integration-test/java/sample/BootTests.java
@@ -18,9 +18,11 @@ package sample;

 import org.junit.After;
 import org.junit.Before;
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openqa.selenium.WebDriver;
+import org.testcontainers.containers.GenericContainer;
 import sample.pages.HomePage;
 import sample.pages.LoginPage;

@@ -28,18 +30,30 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDriverBuilder;

 /**
 * @author Eddú Meléndez
+ * @author Vedran Pavic
 */
@RunWith(SpringRunner.class)
@AutoConfigureMockMvc
-@SpringBootTest(webEnvironment = WebEnvironment.MOCK)
+@SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.MOCK)
+@ContextConfiguration(initializers = BootTests.Initializer.class)
 public class BootTests {

+	private static final String DOCKER_IMAGE = "redis:3.2.9";
+
+	@ClassRule
+	public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)
+			.withExposedPorts(6379);
+
 	@Autowired
 	private MockMvc mockMvc;

@@ -78,4 +92,18 @@ public class BootTests {
 		login.assertAt();
 	}

+	static class Initializer
+			implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+
+		@Override
+		public void initialize(
+				ConfigurableApplicationContext configurableApplicationContext) {
+			TestPropertyValues
+					.of("spring.redis.host=" + redisContainer.getContainerIpAddress(),
+							"spring.redis.port=" + redisContainer.getFirstMappedPort())
+					.applyTo(configurableApplicationContext.getEnvironment());
+		}
+
+	}
+
 }
--- a/samples/boot/redis/src/main/java/sample/config/WebMvcConfig.java
+++ b/samples/boot/redis/src/main/java/sample/config/WebMvcConfig.java
@@ -18,10 +18,10 @@ package sample.config;

 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

@Configuration
-public class WebMvcConfig extends WebMvcConfigurerAdapter {
+public class WebMvcConfig implements WebMvcConfigurer {

 	@Override
 	public void addViewControllers(ViewControllerRegistry registry) {
--- a/samples/boot/redis/src/main/resources/templates/index.html
+++ b/samples/boot/redis/src/main/resources/templates/index.html
@@ -1,4 +1,4 @@
-<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layout">
+<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
 <head>
 	<title>Secured Content</title>
 </head>
--- a/samples/boot/redis/src/main/resources/templates/layout.html
+++ b/samples/boot/redis/src/main/resources/templates/layout.html
@@ -3,7 +3,7 @@
 			xmlns:th="http://www.thymeleaf.org"
 			xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
 	<head>
-		<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
+		<title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
 		<link rel="icon" type="image/x-icon" th:href="@{/favicon.ico}" href="../static/favicon.ico"/>
 		<link th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" href="/webjars/bootstrap/css/bootstrap.min.css" rel="stylesheet"></link>
 		<style type="text/css">
--- a/samples/boot/websocket/spring-session-sample-boot-websocket.gradle
+++ b/samples/boot/websocket/spring-session-sample-boot-websocket.gradle
@@ -1,13 +1,14 @@
 apply plugin: 'io.spring.convention.spring-sample-boot'

+ext['spring-data-releasetrain.version'] = 'Kay-RC3'
+
 dependencies {
-	compile(project(':spring-session-data-redis')) {
-		exclude module: 'jedis'
-		exclude module: 'commons-pool2'
-	}
+	compile project(':spring-session-data-redis')
+	compile "org.springframework.boot:spring-boot-starter-web"
 	compile "org.springframework.boot:spring-boot-starter-thymeleaf"
 	compile "org.springframework.boot:spring-boot-starter-security"
 	compile "org.springframework.boot:spring-boot-starter-data-jpa"
+	compile "org.springframework.boot:spring-boot-starter-data-redis"
 	compile "org.springframework.boot:spring-boot-starter-websocket"
 	compile "org.springframework.boot:spring-boot-devtools"
 	compile "org.springframework:spring-websocket"
@@ -20,9 +21,9 @@ dependencies {
 	compile "org.webjars:sockjs-client"
 	compile "org.webjars:stomp-websocket"
 	compile "org.webjars:webjars-locator"
-	compile "biz.paluch.redis:lettuce"
 	compile "com.h2database:h2"

 	testCompile "org.springframework.boot:spring-boot-starter-test"
 	testCompile "org.springframework.security:spring-security-test"
+	testCompile "org.testcontainers:testcontainers"
 }
--- a/samples/boot/websocket/src/main/java/sample/config/WebMvcConfig.java
+++ b/samples/boot/websocket/src/main/java/sample/config/WebMvcConfig.java
@@ -18,10 +18,10 @@ package sample.config;

 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

@Configuration
-public class WebMvcConfig extends WebMvcConfigurerAdapter {
+public class WebMvcConfig implements WebMvcConfigurer {

 	@Override
 	public void addViewControllers(ViewControllerRegistry registry) {
--- a/samples/boot/websocket/src/main/java/sample/config/WebSocketConfig.java
+++ b/samples/boot/websocket/src/main/java/sample/config/WebSocketConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package sample.config;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.simp.config.MessageBrokerRegistry;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.session.ExpiringSession;
+import org.springframework.session.Session;
 import org.springframework.session.web.socket.config.annotation.AbstractSessionWebSocketMessageBrokerConfigurer;
 import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
 import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
@@ -29,7 +29,7 @@ import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
@EnableScheduling
@EnableWebSocketMessageBroker
 public class WebSocketConfig
-		extends AbstractSessionWebSocketMessageBrokerConfigurer<ExpiringSession> { // <1>
+		extends AbstractSessionWebSocketMessageBrokerConfigurer<Session> { // <1>

 	protected void configureStompEndpoints(StompEndpointRegistry registry) { // <2>
 		registry.addEndpoint("/messages").withSockJS();
--- a/samples/boot/websocket/src/main/java/sample/config/WebSocketHandlersConfig.java
+++ b/samples/boot/websocket/src/main/java/sample/config/WebSocketHandlersConfig.java
@@ -23,7 +23,7 @@ import sample.websocket.WebSocketDisconnectHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.simp.SimpMessageSendingOperations;
-import org.springframework.session.ExpiringSession;
+import org.springframework.session.Session;

 /**
 * These handlers are separated from WebSocketConfig because they are specific to this
@@ -32,7 +32,7 @@ import org.springframework.session.ExpiringSession;
 * @author Rob Winch
 */
@Configuration
-public class WebSocketHandlersConfig<S extends ExpiringSession> {
+public class WebSocketHandlersConfig<S extends Session> {

 	@Bean
 	public WebSocketConnectHandler<S> webSocketConnectHandler(
--- a/samples/boot/websocket/src/main/java/sample/websocket/WebSocketDisconnectHandler.java
+++ b/samples/boot/websocket/src/main/java/sample/websocket/WebSocketDisconnectHandler.java
@@ -18,7 +18,6 @@ package sample.websocket;

 import java.util.Arrays;

-import sample.data.ActiveWebSocketUser;
 import sample.data.ActiveWebSocketUserRepository;

 import org.springframework.context.ApplicationListener;
@@ -42,14 +41,10 @@ public class WebSocketDisconnectHandler<S>
 		if (id == null) {
 			return;
 		}
-		ActiveWebSocketUser user = this.repository.findOne(id);
-		if (user == null) {
-			return;
-		}
-
-		this.repository.delete(id);
-		this.messagingTemplate.convertAndSend("/topic/friends/signout",
-				Arrays.asList(user.getUsername()));
-
+		this.repository.findById(id).ifPresent(user -> {
+			this.repository.deleteById(id);
+			this.messagingTemplate.convertAndSend("/topic/friends/signout",
+					Arrays.asList(user.getUsername()));
+		});
 	}
 }
--- a/samples/boot/websocket/src/main/resources/templates/index.html
+++ b/samples/boot/websocket/src/main/resources/templates/index.html
@@ -1,4 +1,4 @@
-<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layout">
+<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
 <head>
 	<title>View All</title>
 </head>
--- a/samples/boot/websocket/src/main/resources/templates/layout.html
+++ b/samples/boot/websocket/src/main/resources/templates/layout.html
@@ -3,7 +3,7 @@
 			xmlns:th="http://www.thymeleaf.org"
 			xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
 	<head>
-		<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
+		<title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
 		<link rel="icon" type="image/x-icon" th:href="@{/favicon.ico}" href="../static/favicon.ico"/>
 		<link th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" href="/webjars/bootstrap/css/bootstrap.min.css" rel="stylesheet"></link>
 		<style type="text/css">
--- a/samples/boot/websocket/src/test/java/sample/ApplicationTests.java
+++ b/samples/boot/websocket/src/test/java/sample/ApplicationTests.java
@@ -20,14 +20,21 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;

+import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
+import org.testcontainers.containers.GenericContainer;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.concurrent.ListenableFuture;
 import org.springframework.web.socket.TextMessage;
@@ -41,18 +48,27 @@ import org.springframework.web.socket.sockjs.client.WebSocketTransport;

 /**
 * @author Rob Winch
+ * @author Vedran Pavic
 */
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT)
+@ContextConfiguration(initializers = ApplicationTests.Initializer.class)
 public class ApplicationTests {
+
+	private static final String DOCKER_IMAGE = "redis:3.2.9";
+
+	@ClassRule
+	public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)
+			.withExposedPorts(6379);
+
 	@Rule
 	public final ExpectedException thrown = ExpectedException.none();

 	@Value("${local.server.port}")
-	String port;
+	private String port;

 	@Autowired
-	WebSocketHandler webSocketHandler;
+	private WebSocketHandler webSocketHandler;

 	@Test
 	public void run() throws Exception {
@@ -67,4 +83,19 @@ public class ApplicationTests {
 		this.thrown.expect(ExecutionException.class);
 		wsSession.get().sendMessage(new TextMessage("a"));
 	}
+
+	static class Initializer
+			implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+
+		@Override
+		public void initialize(
+				ConfigurableApplicationContext configurableApplicationContext) {
+			TestPropertyValues
+					.of("spring.redis.host=" + redisContainer.getContainerIpAddress(),
+							"spring.redis.port=" + redisContainer.getFirstMappedPort())
+					.applyTo(configurableApplicationContext.getEnvironment());
+		}
+
+	}
+
 }
--- a/samples/javaconfig/custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle
+++ b/samples/javaconfig/custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle
@@ -1,15 +1,14 @@
 apply plugin: 'io.spring.convention.spring-sample-war'

 dependencies {
-	compile(project(':spring-session-data-redis')) {
-		exclude module: 'jedis'
-	}
+	compile project(':spring-session-data-redis')
 	compile "org.springframework:spring-web"
 	compile "io.lettuce:lettuce-core"
 	compile "org.webjars:bootstrap"
 	compile "org.webjars:webjars-taglib"
 	compile jstlDependencies
 	compile slf4jDependencies
+	compile "org.testcontainers:testcontainers"

 	providedCompile "javax.servlet:javax.servlet-api"

@@ -18,3 +17,7 @@ dependencies {

 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	jvmArgs = ['-Dspring.profiles.active=embedded-redis']
+}
--- a/samples/javaconfig/custom-cookie/src/main/java/sample/Config.java
+++ b/samples/javaconfig/custom-cookie/src/main/java/sample/Config.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,11 +17,13 @@
 package sample;

 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.session.web.http.CookieSerializer;
 import org.springframework.session.web.http.DefaultCookieSerializer;

+@Import(EmbeddedRedisConfig.class)
@EnableRedisHttpSession
 public class Config {

--- a/samples/javaconfig/custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java
+++ b/samples/javaconfig/custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2014-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample;
+
+import java.io.IOException;
+
+import org.testcontainers.containers.GenericContainer;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+
+@Configuration
+@Profile("embedded-redis")
+public class EmbeddedRedisConfig {
+
+	private static final String REDIS_DOCKER_IMAGE = "redis:3.2.9";
+
+	@Bean(initMethod = "start")
+	public GenericContainer redisContainer() {
+		return new GenericContainer(REDIS_DOCKER_IMAGE) {
+
+			@Override
+			public void close() {
+				super.close();
+				try {
+					this.dockerClient.close();
+				}
+				catch (IOException ignored) {
+				}
+			}
+
+		}.withExposedPorts(6379);
+	}
+
+	@Bean
+	@Primary
+	public LettuceConnectionFactory redisConnectionFactory() {
+		return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+				redisContainer().getFirstMappedPort());
+	}
+
+}
--- a/samples/javaconfig/hazelcast/spring-session-sample-javaconfig-hazelcast.gradle
+++ b/samples/javaconfig/hazelcast/spring-session-sample-javaconfig-hazelcast.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'io.spring.convention.spring-sample-war'

 dependencies {
-	compile project(':spring-session')
+	compile project(':spring-session-hazelcast')
 	compile "org.springframework:spring-web"
 	compile "org.springframework.security:spring-security-config"
 	compile "org.springframework.security:spring-security-web"
--- a/samples/javaconfig/redis/spring-session-sample-javaconfig-redis.gradle
+++ b/samples/javaconfig/redis/spring-session-sample-javaconfig-redis.gradle
@@ -1,15 +1,14 @@
 apply plugin: 'io.spring.convention.spring-sample-war'

 dependencies {
-	compile(project(':spring-session-data-redis')) {
-		exclude module: 'jedis'
-	}
+	compile project(':spring-session-data-redis')
 	compile "org.springframework:spring-web"
 	compile "io.lettuce:lettuce-core"
 	compile "org.webjars:bootstrap"
 	compile "org.webjars:webjars-taglib"
 	compile jstlDependencies
 	compile slf4jDependencies
+	compile "org.testcontainers:testcontainers"

 	providedCompile "javax.servlet:javax.servlet-api"

@@ -18,3 +17,7 @@ dependencies {

 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	jvmArgs = ['-Dspring.profiles.active=embedded-redis']
+}
--- a/samples/javaconfig/redis/src/main/java/sample/Config.java
+++ b/samples/javaconfig/redis/src/main/java/sample/Config.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,9 +17,11 @@
 package sample;

 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;

+@Import(EmbeddedRedisConfig.class)
 // tag::class[]
@EnableRedisHttpSession // <1>
 public class Config {
--- a/samples/javaconfig/redis/src/main/java/sample/EmbeddedRedisConfig.java
+++ b/samples/javaconfig/redis/src/main/java/sample/EmbeddedRedisConfig.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2014-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample;
+
+import java.io.IOException;
+
+import org.testcontainers.containers.GenericContainer;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+
+@Configuration
+@Profile("embedded-redis")
+public class EmbeddedRedisConfig {
+
+	private static final String REDIS_DOCKER_IMAGE = "redis:3.2.9";
+
+	@Bean(initMethod = "start")
+	public GenericContainer redisContainer() {
+		return new GenericContainer(REDIS_DOCKER_IMAGE) {
+
+			@Override
+			public void close() {
+				super.close();
+				try {
+					this.dockerClient.close();
+				}
+				catch (IOException ignored) {
+				}
+			}
+
+		}.withExposedPorts(6379);
+	}
+
+	@Bean
+	@Primary
+	public LettuceConnectionFactory redisConnectionFactory() {
+		return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+				redisContainer().getFirstMappedPort());
+	}
+
+}
--- a/samples/javaconfig/rest/spring-session-sample-javaconfig-rest.gradle
+++ b/samples/javaconfig/rest/spring-session-sample-javaconfig-rest.gradle
@@ -1,9 +1,7 @@
 apply plugin: 'io.spring.convention.spring-sample-war'

 dependencies {
-	compile(project(':spring-session-data-redis')) {
-		exclude module: 'jedis'
-	}
+	compile project(':spring-session-data-redis')
 	compile "io.lettuce:lettuce-core"
 	compile "org.springframework:spring-webmvc"
 	compile "org.springframework.security:spring-security-config"
@@ -11,6 +9,7 @@ dependencies {
 	compile "com.fasterxml.jackson.core:jackson-databind"
 	compile jstlDependencies
 	compile slf4jDependencies
+	compile "org.testcontainers:testcontainers"

 	providedCompile "javax.servlet:javax.servlet-api"

@@ -19,4 +18,10 @@ dependencies {
 	testCompile "org.assertj:assertj-core"
 	testCompile "org.springframework:spring-test"
 	testCompile "commons-codec:commons-codec"
-}
+
+	integrationTestCompile "org.testcontainers:testcontainers"
+}
+
+gretty {
+	jvmArgs = ['-Dspring.profiles.active=embedded-redis']
+}
--- a/samples/javaconfig/rest/src/integration-test/java/rest/RestMockMvcTests.java
+++ b/samples/javaconfig/rest/src/integration-test/java/rest/RestMockMvcTests.java
@@ -17,16 +17,22 @@
 package rest;

 import org.junit.Before;
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
-import sample.HttpSessionConfig;
+import org.testcontainers.containers.GenericContainer;
 import sample.SecurityConfig;
 import sample.mvc.MvcConfig;

 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.security.test.context.support.WithMockUser;
-import org.springframework.session.ExpiringSession;
+import org.springframework.session.Session;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+import org.springframework.session.web.http.HeaderHttpSessionStrategy;
+import org.springframework.session.web.http.HttpSessionStrategy;
 import org.springframework.session.web.http.SessionRepositoryFilter;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -44,18 +50,24 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { HttpSessionConfig.class, SecurityConfig.class,
+@ContextConfiguration(classes = { RestMockMvcTests.Config.class, SecurityConfig.class,
 		MvcConfig.class })
@WebAppConfiguration
 public class RestMockMvcTests {

-	@Autowired
-	SessionRepositoryFilter<? extends ExpiringSession> sessionRepositoryFilter;
+	private static final String DOCKER_IMAGE = "redis:3.2.9";
+
+	@ClassRule
+	public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)
+			.withExposedPorts(6379);

 	@Autowired
-	WebApplicationContext context;
+	private SessionRepositoryFilter<? extends Session> sessionRepositoryFilter;

-	MockMvc mvc;
+	@Autowired
+	private WebApplicationContext context;
+
+	private MockMvc mvc;

 	@Before
 	public void setup() {
@@ -81,4 +93,21 @@ public class RestMockMvcTests {
 				.andExpect(content().string("{\"username\":\"user\"}"));
 	}

+	@Configuration
+	@EnableRedisHttpSession
+	static class Config {
+
+		@Bean
+		public LettuceConnectionFactory redisConnectionFactory() {
+			return new LettuceConnectionFactory(redisContainer.getContainerIpAddress(),
+					redisContainer.getFirstMappedPort());
+		}
+
+		@Bean
+		public HttpSessionStrategy httpSessionStrategy() {
+			return new HeaderHttpSessionStrategy();
+		}
+
+	}
+
 }
--- a/samples/javaconfig/rest/src/main/java/sample/EmbeddedRedisConfig.java
+++ b/samples/javaconfig/rest/src/main/java/sample/EmbeddedRedisConfig.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2014-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample;
+
+import java.io.IOException;
+
+import org.testcontainers.containers.GenericContainer;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+
+@Configuration
+@Profile("embedded-redis")
+public class EmbeddedRedisConfig {
+
+	private static final String REDIS_DOCKER_IMAGE = "redis:3.2.9";
+
+	@Bean(initMethod = "start")
+	public GenericContainer redisContainer() {
+		return new GenericContainer(REDIS_DOCKER_IMAGE) {
+
+			@Override
+			public void close() {
+				super.close();
+				try {
+					this.dockerClient.close();
+				}
+				catch (IOException ignored) {
+				}
+			}
+
+		}.withExposedPorts(6379);
+	}
+
+	@Bean
+	@Primary
+	public LettuceConnectionFactory redisConnectionFactory() {
+		return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+				redisContainer().getFirstMappedPort());
+	}
+
+}
--- a/samples/javaconfig/rest/src/main/java/sample/HttpSessionConfig.java
+++ b/samples/javaconfig/rest/src/main/java/sample/HttpSessionConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,11 +18,13 @@ package sample;

 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.session.web.http.HeaderHttpSessionStrategy;
 import org.springframework.session.web.http.HttpSessionStrategy;

+@Import(EmbeddedRedisConfig.class)
 // tag::class[]
@Configuration
@EnableRedisHttpSession // <1>
--- a/samples/javaconfig/security/spring-session-sample-javaconfig-security.gradle
+++ b/samples/javaconfig/security/spring-session-sample-javaconfig-security.gradle
@@ -1,9 +1,7 @@
 apply plugin: 'io.spring.convention.spring-sample-war'

 dependencies {
-	compile(project(':spring-session-data-redis')) {
-		exclude module: 'jedis'
-	}
+	compile project(':spring-session-data-redis')
 	compile "org.springframework:spring-web"
 	compile "org.springframework.security:spring-security-config"
 	compile "org.springframework.security:spring-security-web"
@@ -12,6 +10,7 @@ dependencies {
 	compile "org.webjars:webjars-taglib"
 	compile jstlDependencies
 	compile slf4jDependencies
+	compile "org.testcontainers:testcontainers"

 	providedCompile "javax.servlet:javax.servlet-api"
 	providedCompile "javax.servlet.jsp:javax.servlet.jsp-api"
@@ -22,3 +21,7 @@ dependencies {

 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	jvmArgs = ['-Dspring.profiles.active=embedded-redis']
+}
--- a/samples/javaconfig/security/src/main/java/sample/Config.java
+++ b/samples/javaconfig/security/src/main/java/sample/Config.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,9 +18,11 @@ package sample;

 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;

+@Import(EmbeddedRedisConfig.class)
 // tag::class[]
@Configuration
@EnableRedisHttpSession // <1>
--- a/samples/javaconfig/security/src/main/java/sample/EmbeddedRedisConfig.java
+++ b/samples/javaconfig/security/src/main/java/sample/EmbeddedRedisConfig.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2014-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample;
+
+import java.io.IOException;
+
+import org.testcontainers.containers.GenericContainer;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+
+@Configuration
+@Profile("embedded-redis")
+public class EmbeddedRedisConfig {
+
+	private static final String REDIS_DOCKER_IMAGE = "redis:3.2.9";
+
+	@Bean(initMethod = "start")
+	public GenericContainer redisContainer() {
+		return new GenericContainer(REDIS_DOCKER_IMAGE) {
+
+			@Override
+			public void close() {
+				super.close();
+				try {
+					this.dockerClient.close();
+				}
+				catch (IOException ignored) {
+				}
+			}
+
+		}.withExposedPorts(6379);
+	}
+
+	@Bean
+	@Primary
+	public LettuceConnectionFactory redisConnectionFactory() {
+		return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+				redisContainer().getFirstMappedPort());
+	}
+
+}
--- a/samples/javaconfig/users/spring-session-sample-javaconfig-users.gradle
+++ b/samples/javaconfig/users/spring-session-sample-javaconfig-users.gradle
@@ -1,15 +1,14 @@
 apply plugin: 'io.spring.convention.spring-sample-war'

 dependencies {
-	compile(project(':spring-session-data-redis')) {
-		exclude module: 'jedis'
-	}
+	compile project(':spring-session-data-redis')
 	compile "org.springframework:spring-web"
 	compile "io.lettuce:lettuce-core"
 	compile "org.webjars:bootstrap"
 	compile "org.webjars:webjars-taglib"
 	compile jstlDependencies
 	compile slf4jDependencies
+	compile "org.testcontainers:testcontainers"

 	providedCompile "javax.servlet:javax.servlet-api"

@@ -19,3 +18,7 @@ dependencies {

 	integrationTestCompile seleniumDependencies
 }
+
+gretty {
+	jvmArgs = ['-Dspring.profiles.active=embedded-redis']
+}
--- a/samples/javaconfig/users/src/main/java/sample/Config.java
+++ b/samples/javaconfig/users/src/main/java/sample/Config.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,13 +18,14 @@ package sample;

 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;

 /**
 * @author Rob Winch
 */
-
+@Import(EmbeddedRedisConfig.class)
 // tag::class[]
@Configuration
@EnableRedisHttpSession
--- a/samples/javaconfig/users/src/main/java/sample/EmbeddedRedisConfig.java
+++ b/samples/javaconfig/users/src/main/java/sample/EmbeddedRedisConfig.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2014-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample;
+
+import java.io.IOException;
+
+import org.testcontainers.containers.GenericContainer;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+
+@Configuration
+@Profile("embedded-redis")
+public class EmbeddedRedisConfig {
+
+	private static final String REDIS_DOCKER_IMAGE = "redis:3.2.9";
+
+	@Bean(initMethod = "start")
+	public GenericContainer redisContainer() {
+		return new GenericContainer(REDIS_DOCKER_IMAGE) {
+
+			@Override
+			public void close() {
+				super.close();
+				try {
+					this.dockerClient.close();
+				}
+				catch (IOException ignored) {
+				}
+			}
+
+		}.withExposedPorts(6379);
+	}
+
+	@Bean
+	@Primary
+	public LettuceConnectionFactory redisConnectionFactory() {
+		return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+				redisContainer().getFirstMappedPort());
+	}
+
+}
--- a/samples/javaconfig/users/src/main/java/sample/UserAccountsFilter.java
+++ b/samples/javaconfig/users/src/main/java/sample/UserAccountsFilter.java
@@ -61,7 +61,7 @@ public class UserAccountsFilter implements Filter {
 			String alias = entry.getKey();
 			String sessionId = entry.getValue();

-			Session session = repo.getSession(sessionId);
+			Session session = repo.findById(sessionId);
 			if (session == null) {
 				continue;
 			}
--- a/samples/javaconfig/webflux/spring-session-sample-javaconfig-webflux.gradle
+++ b/samples/javaconfig/webflux/spring-session-sample-javaconfig-webflux.gradle
@@ -0,0 +1,22 @@
+apply plugin: 'io.spring.convention.spring-sample'
+
+dependencies {
+	compile project(':spring-session-core')
+	compile 'io.lettuce:lettuce-core'
+	compile 'io.netty:netty-buffer'
+	compile 'io.projectreactor.ipc:reactor-netty'
+	compile 'org.springframework:spring-context'
+	compile 'org.springframework:spring-web'
+	compile 'org.springframework:spring-webflux'
+	compile 'org.thymeleaf.extras:thymeleaf-extras-java8time'
+	compile 'org.thymeleaf:thymeleaf-spring5'
+	compile 'org.webjars:bootstrap'
+	compile 'org.webjars:webjars-taglib'
+	compile jstlDependencies
+	compile slf4jDependencies
+
+	testCompile 'junit:junit'
+	testCompile 'org.assertj:assertj-core'
+
+	integrationTestCompile seleniumDependencies
+}
--- a/samples/javaconfig/webflux/src/integration-test/java/sample/AttributeTests.java
+++ b/samples/javaconfig/webflux/src/integration-test/java/sample/AttributeTests.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2014-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample;
+
+
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.htmlunit.HtmlUnitDriver;
+import sample.pages.HomePage;
+import sample.pages.HomePage.Attribute;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Eddú Meléndez
+ * @author Rob Winch
+ */
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = HelloWebfluxApplication.class)
+@TestPropertySource(properties = "server.port=0")
+public class AttributeTests {
+	@Value("#{@nettyContext.address().getPort()}")
+	int port;
+
+	private WebDriver driver;
+
+	@Before
+	public void setup() {
+		this.driver = new HtmlUnitDriver();
+	}
+
+	@After
+	public void tearDown() {
+		this.driver.quit();
+	}
+
+	@Test
+	public void home() {
+		HomePage home = HomePage.go(this.driver, this.port);
+		home.assertAt();
+	}
+
+	@Test
+	public void noAttributes() {
+		HomePage home = HomePage.go(this.driver, this.port);
+		assertThat(home.attributes()).isEmpty();
+	}
+
+	@Test
+	public void createAttribute() {
+		HomePage home = HomePage.go(this.driver, this.port);
+		// @formatter:off
+		home = home.form()
+				.attributeName("a")
+				.attributeValue("b")
+				.submit(HomePage.class);
+		// @formatter:on
+
+		List<Attribute> attributes = home.attributes();
+		assertThat(attributes).hasSize(1);
+		Attribute row = attributes.get(0);
+		assertThat(row.getAttributeName()).isEqualTo("a");
+		assertThat(row.getAttributeValue()).isEqualTo("b");
+	}
+
+}
--- a/samples/javaconfig/webflux/src/integration-test/java/sample/pages/HomePage.java
+++ b/samples/javaconfig/webflux/src/integration-test/java/sample/pages/HomePage.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2014-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.pages;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.openqa.selenium.SearchContext;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.PageFactory;
+import org.openqa.selenium.support.pagefactory.DefaultElementLocatorFactory;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Eddú Meléndez
+ * @author Rob Winch
+ */
+public class HomePage {
+
+	private WebDriver driver;
+
+	@FindBy(css = "form")
+	WebElement form;
+
+	@FindBy(css = "table tbody tr")
+	List<WebElement> trs;
+
+	List<Attribute> attributes;
+
+	public HomePage(WebDriver driver) {
+		this.driver = driver;
+		this.attributes = new ArrayList<>();
+	}
+
+	private static void get(WebDriver driver, int port, String get) {
+		String baseUrl = "http://localhost:" + port;
+		driver.get(baseUrl + get);
+	}
+
+	public static HomePage go(WebDriver driver, int port) {
+		get(driver, port, "/");
+		return PageFactory.initElements(driver, HomePage.class);
+	}
+
+	public void assertAt() {
+		assertThat(this.driver.getTitle()).isEqualTo("Session Attributes");
+	}
+
+	public List<Attribute> attributes() {
+		List<Attribute> rows = new ArrayList<>();
+		for (WebElement tr : this.trs) {
+			rows.add(new Attribute(tr));
+		}
+		this.attributes.addAll(rows);
+		return this.attributes;
+	}
+
+	public Form form() {
+		return new Form(this.form);
+	}
+
+	public class Form {
+		@FindBy(name = "attributeName")
+		WebElement attributeName;
+
+		@FindBy(name = "attributeValue")
+		WebElement attributeValue;
+
+		@FindBy(css = "input[type=\"submit\"]")
+		WebElement submit;
+
+		public Form(SearchContext context) {
+			PageFactory.initElements(new DefaultElementLocatorFactory(context), this);
+		}
+
+		public Form attributeName(String text) {
+			this.attributeName.sendKeys(text);
+			return this;
+		}
+
+		public Form attributeValue(String text) {
+			this.attributeValue.sendKeys(text);
+			return this;
+		}
+
+		public <T> T submit(Class<T> page) {
+			this.submit.click();
+			return PageFactory.initElements(HomePage.this.driver, page);
+		}
+	}
+
+	public static class Attribute {
+		@FindBy(xpath = ".//td[1]")
+		WebElement attributeName;
+
+		@FindBy(xpath = ".//td[2]")
+		WebElement attributeValue;
+
+		public Attribute(SearchContext context) {
+			PageFactory.initElements(new DefaultElementLocatorFactory(context), this);
+		}
+
+		/**
+		 * @return the attributeName
+		 */
+		public String getAttributeName() {
+			return this.attributeName.getText();
+		}
+
+		/**
+		 * @return the attributeValue
+		 */
+		public String getAttributeValue() {
+			return this.attributeValue.getText();
+		}
+	}
+
+}
--- a/samples/javaconfig/webflux/src/main/java/sample/HelloWebfluxApplication.java
+++ b/samples/javaconfig/webflux/src/main/java/sample/HelloWebfluxApplication.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2014-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample;
+
+import reactor.ipc.netty.NettyContext;
+import reactor.ipc.netty.http.server.HttpServer;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.http.server.reactive.HttpHandler;
+import org.springframework.http.server.reactive.ReactorHttpHandlerAdapter;
+import org.springframework.web.reactive.config.EnableWebFlux;
+import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
+
+/**
+ * @author Rob Winch
+ * @since 5.0
+ */
+@Configuration
+@EnableWebFlux
+@ComponentScan
+public class HelloWebfluxApplication {
+	@Value("${server.port:8080}")
+	private int port = 8080;
+
+	public static void main(String[] args) throws Exception {
+		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				HelloWebfluxApplication.class)) {
+			context.getBean(NettyContext.class).onClose().block();
+		}
+	}
+
+	@Profile("default")
+	@Bean
+	public NettyContext nettyContext(ApplicationContext context) {
+		HttpHandler handler = WebHttpHandlerBuilder.applicationContext(context).build();
+		ReactorHttpHandlerAdapter adapter = new ReactorHttpHandlerAdapter(handler);
+		HttpServer httpServer = HttpServer.create("localhost", this.port);
+		return httpServer.newHandler(adapter).block();
+	}
+}
--- a/samples/javaconfig/webflux/src/main/java/sample/HelloWebfluxSessionConfig.java
+++ b/samples/javaconfig/webflux/src/main/java/sample/HelloWebfluxSessionConfig.java
@@ -14,18 +14,24 @@
 * limitations under the License.
 */

-package sample.config;
+package sample;
+
+import java.util.concurrent.ConcurrentHashMap;

 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.session.EnableSpringWebSession;
+import org.springframework.session.MapReactorSessionRepository;

+
+// tag::class[]
@Configuration
-public class DataSourceConfig {
+@EnableSpringWebSession
+public class HelloWebfluxSessionConfig {

 	@Bean
-	public LettuceConnectionFactory connectionFactory() {
-		return new LettuceConnectionFactory();
+	public MapReactorSessionRepository reactorSessionRepository() {
+		return new MapReactorSessionRepository(new ConcurrentHashMap<>());
 	}
-
 }
+// end::class[]
--- a/samples/javaconfig/webflux/src/main/java/sample/SSEFluxWebConfig.java
+++ b/samples/javaconfig/webflux/src/main/java/sample/SSEFluxWebConfig.java
@@ -0,0 +1,91 @@
+/*
+ * =============================================================================
+ *
+ *   Copyright (c) 2011-2014, The THYMELEAF team (http://www.thymeleaf.org)
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ * =============================================================================
+ */
+package sample;
+
+import org.thymeleaf.spring5.ISpringWebFluxTemplateEngine;
+import org.thymeleaf.spring5.SpringWebFluxTemplateEngine;
+import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
+import org.thymeleaf.spring5.view.reactive.ThymeleafReactiveViewResolver;
+import org.thymeleaf.templatemode.TemplateMode;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class SSEFluxWebConfig {
+
+	// TODO * Once there is a Spring Boot starter for thymeleaf-spring5, there would be no
+	// need to have
+	// TODO that @EnableConfigurationProperties annotation or use it for declaring the
+	// beans down in the
+	// TODO "thymeleaf" section below.
+
+	private ApplicationContext applicationContext;
+
+	public SSEFluxWebConfig(final ApplicationContext applicationContext) {
+		super();
+		this.applicationContext = applicationContext;
+	}
+
+	/*
+	 * -------------------------------------- THYMELEAF CONFIGURATION
+	 * --------------------------------------
+	 */
+
+	// TODO * If there was a Spring Boot starter for thymeleaf-spring5 most probably some
+	// or all of these
+	// TODO resolver and engine beans would not need to be specifically declared here.
+
+	@Bean
+	public SpringResourceTemplateResolver thymeleafTemplateResolver() {
+
+		final SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver();
+		resolver.setApplicationContext(this.applicationContext);
+		resolver.setPrefix("classpath:/templates/");
+		resolver.setSuffix(".html");
+		resolver.setTemplateMode(TemplateMode.HTML);
+		resolver.setCacheable(false);
+		resolver.setCheckExistence(true);
+		return resolver;
+
+	}
+
+	@Bean
+	public ISpringWebFluxTemplateEngine thymeleafTemplateEngine() {
+		// We override here the SpringTemplateEngine instance that would otherwise be
+		// instantiated by
+		// Spring Boot because we want to apply the SpringWebFlux-specific context
+		// factory, link builder...
+		final SpringWebFluxTemplateEngine templateEngine = new SpringWebFluxTemplateEngine();
+		templateEngine.setTemplateResolver(thymeleafTemplateResolver());
+		return templateEngine;
+	}
+
+	@Bean
+	public ThymeleafReactiveViewResolver thymeleafChunkedAndDataDrivenViewResolver() {
+		final ThymeleafReactiveViewResolver viewResolver = new ThymeleafReactiveViewResolver();
+		viewResolver.setTemplateEngine(thymeleafTemplateEngine());
+		viewResolver.setOrder(1);
+		viewResolver.setResponseMaxChunkSizeBytes(8192); // OUTPUT BUFFER size limit
+		return viewResolver;
+	}
+
+}
--- a/samples/javaconfig/webflux/src/main/java/sample/SessionAttributeForm.java
+++ b/samples/javaconfig/webflux/src/main/java/sample/SessionAttributeForm.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample;
+
+/**
+ * @author Rob Winch
+ * @since 5.0
+ */
+public class SessionAttributeForm {
+	private String attributeName;
+
+	private String attributeValue;
+
+	public String getAttributeName() {
+		return this.attributeName;
+	}
+
+	public void setAttributeName(String attributeName) {
+		this.attributeName = attributeName;
+	}
+
+	public String getAttributeValue() {
+		return this.attributeValue;
+	}
+
+	public void setAttributeValue(String attributeValue) {
+		this.attributeValue = attributeValue;
+	}
+}
--- a/samples/javaconfig/webflux/src/main/java/sample/SessionController.java
+++ b/samples/javaconfig/webflux/src/main/java/sample/SessionController.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2014-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.server.WebSession;
+
+// tag::class[]
+@Controller
+public class SessionController {
+
+	@PostMapping("/session")
+	public String setAttribute(@ModelAttribute SessionAttributeForm sessionAttributeForm, WebSession session) {
+		session.getAttributes().put(sessionAttributeForm.getAttributeName(), sessionAttributeForm.getAttributeValue());
+		return "redirect:/";
+	}
+
+	@GetMapping("/")
+	public String index(Model model, WebSession webSession) {
+		model.addAttribute("webSession", webSession);
+		return "index";
+	}
+
+	private static final long serialVersionUID = 2878267318695777395L;
+}
+// tag::end[]
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rob Winch	c14fdb283d	Release 2.0.0.M4	2017-09-13 18:04:06 -05:00
Rob Winch	ee1ff3ed3b	Update Spring Security 5.0.0.M4	2017-09-13 18:03:33 -05:00
Vedran Pavic	eb7bcc5eeb	Harmonize `ReactorSessionRepository` API This commit renames the `ReactorSessionRepository#delete` to `deleteById` in order to make API consistent with `SessionRepository`.	2017-09-12 23:00:16 +02:00
Vedran Pavic	188e5ba4e0	Optimize JDBC session cleanup SQL statement This commit improves session cleanup handling in `JdbcOperationsSessionRepository#cleanUpExpiredSessions` by optimizing the used SQL statement. This is done by calculating the session expiry time when persisting the session, which in turn allows the cleanup SQL statement to be more index-friendly. Closes gh-847	2017-09-12 15:41:10 -05:00
Vedran Pavic	1e46630467	Remove `MapReactorSessionRepository` default constructor This commit removes the default `MapReactorSessionRepository` so that the users are required to explicitly supply the `Map` used to store the sessions.	2017-09-12 15:22:29 -05:00
Vedran Pavic	b72c600884	Upgrade dependencies to current milestones - Reactor Bismuth-M4 - Spring Framework 5.0.0.RC4 - Spring Data Kay-RC3 - Lettuce 5.0.0.RC2	2017-09-12 07:54:14 +02:00
Vedran Pavic	274aec1691	Fix Boot based samples	2017-09-11 13:57:38 +02:00
Rob Winch	52ea98b4ce	SpringWebSessionConfigurationTests close ApplicationContext	2017-09-07 20:12:45 -05:00
Rob Winch	5c294ae1d2	Polish	2017-09-07 20:12:45 -05:00
Greg Turnquist	1752928d96	Configure WebSessionManager's WebSessionIdResolver by bean definition Allow a WebSessionIdResolver registered as a Spring bean to be wired into the WebSessionManager.	2017-09-07 20:12:45 -05:00
Vedran Pavic	0cdee25405	Remove `MapSessionRepository` default constructor This commit removes the default `MapSessionRepository` constructor so that the users are required to explicitly supply the `Map` used to store the sessions.	2017-09-07 19:58:22 -05:00
Rob Winch	4a9f1700d5	Polish Reorder methods	2017-09-06 15:12:13 -05:00
Rob Winch	36ab358d24	Remove SpringSessionWebSessionManager Spring's DefaultWebSessionManager now supports all the functionality that is needed for Spring Session, so we only need to implement WebSessionStore	2017-09-06 14:50:48 -05:00
Vedran Pavic	8e3371aed9	Allow easier customization of cookie max age logic	2017-08-24 16:00:59 -05:00
mikemassa84	2161f966de	Update grails3.adoc Add a note about spring-session and grails flash scope, with link to stackoverflow answer.	2017-08-24 14:37:32 -05:00
Vedran Pavic	63b67a501d	Update guides for Redis based samples	2017-08-24 14:17:10 -05:00
Vedran Pavic	2b0431eae4	Use TestContainers for Gretty integration tests	2017-08-24 14:17:10 -05:00
Vedran Pavic	04ec086014	Use TestContainers for integration tests	2017-08-24 14:17:10 -05:00
Rob Winch	5697f49a71	Config->HelloWebfluxSessionConfig Use a more meaningful name	2017-08-24 13:54:21 -05:00
Rob Winch	dfce66383f	webflux sample uses @EnableSpringWebSession Issue gh-861	2017-08-24 13:52:52 -05:00
Rob Winch	a83e59bf52	Polish Fix checkstyle Issue gh-861	2017-08-24 13:52:24 -05:00
Greg Turnquist	8b233e84ef	Create @EnableSpringWebSession annotation.	2017-08-24 13:41:42 -05:00
Greg Turnquist	84e7fbace1	Fix MapReactorSessionRepository's delete().	2017-08-24 13:40:57 -05:00
Rob Winch	f455df3333	Add WebFlux sample Fixesh gh-857	2017-08-18 16:28:46 -05:00
Rob Winch	a7bb9d3b31	SpringSessionWebSessionManager writes on commit when the ServerHttpResonse is commited the cookie and the session are written Fixes gh-856	2017-08-18 16:28:46 -05:00
Kanjie Lu	5f0e4c3b85	fix typo change "they key" to "the key"	2017-08-05 20:39:08 -05:00
Vedran Pavic	23c6c7cf31	Upgrade Spring Boot to 2.0.0.M3 Closes gh-841	2017-07-27 14:08:48 +02:00
Vedran Pavic	c8c5fae678	Polish build	2017-07-26 08:49:45 +02:00
Vedran Pavic	f4a58622e4	Upgrade dependencies to latest snapshots - Reactor Bismuth-BUILD-SNAPSHOT - Spring Framework 5.0.0.BUILD-SNAPSHOT - Spring Data Kay-BUILD-SNAPSHOT - Spring Security 5.0.0.BUILD-SNAPSHOT	2017-07-26 08:47:23 +02:00
Joe Grandja	5384764021	Next development version	2017-07-25 10:12:45 -04:00
Joe Grandja	56033a9b68	Release version 2.0.0.M3	2017-07-25 09:31:12 -04:00
Vedran Pavic	99a2b079ac	Upgrade dependencies to current milestones - Spring Framework 5.0.0.RC3 - Spring Data Kay-RC1 - Spring Security 5.0.0.M3	2017-07-25 10:11:26 +02:00
Vedran Pavic	9120151692	Polish "Add WebFlux Support" Closes gh-683	2017-07-21 15:31:45 +02:00
Rob Winch	5abbe66b1d	Add WebFlux Support	2017-07-21 15:30:19 +02:00
Rob Winch	f00c196430	Update Dependencies to Prepare Release	2017-07-20 22:24:35 -05:00
Rob Winch	be2604ca69	Add Session.changeSessionId	2017-07-20 16:31:38 -05:00
Rob Winch	2aa71ffb6d	Update to lettuce 5.0.0.RC1	2017-07-20 09:54:53 -05:00
Rob Winch	8bdcba6e50	Spring Session 2.0.0.M2 w/ Boot Samples This is necessary because the current version of Spring Session is not compatible with Boot 2.0.0.M2 and we cannot release against the SNAPSHOTs Issue gh-833	2017-07-18 20:09:21 -05:00
Mark Paluch	8dd1a10f1b	Adapt to changes in Spring Data Redis API	2017-07-18 16:19:05 +02:00
Vedran Pavic	1d247aa96f	Align Checkstyle config with spring-build-conventions	2017-07-12 08:24:09 +02:00
Vedran Pavic	c00d6a7bf2	Apply correct convention plugin for modules	2017-07-10 09:10:33 +02:00
Vedran Pavic	c0df3bf28b	Fix deprecation warnings	2017-07-10 07:28:09 +02:00
Vedran Pavic	1b8c9838a4	Fix unchecked operations build warning	2017-07-10 07:27:27 +02:00
Vedran Pavic	8a1b454121	Fix javadoc build warning	2017-07-10 07:26:35 +02:00
Vedran Pavic	ef69c8169a	Polish dependencies This commit removes needless dependency exclusions. See gh-824	2017-07-10 07:20:35 +02:00
Rob Winch	40b3d07224	Revert "Add --debug to Jenkinsfile" This reverts commit `9c4e20f074`.	2017-07-07 11:23:54 -05:00
Rob Winch	8c726f2215	Use Gradle 3.5.1 This works around a bug in 4.0 where Gradle is hanging when trying to resolve a configuration.	2017-07-07 11:17:32 -05:00
Rob Winch	c2a86a27ce	Travis skip install	2017-07-07 10:16:13 -05:00
Rob Winch	6a08ef6f97	Polish travis build	2017-07-07 10:03:54 -05:00
Rob Winch	9c4e20f074	Add --debug to Jenkinsfile Try and troubleshoot why the build is hanging	2017-07-07 09:42:24 -05:00
Vedran Pavic	5845a9c46a	Improve dependency management This commit improves dependency management with the following changes: - `spring-session-core`: move `javax.servlet-api` from `provided` to `optional` configuration due to introduction of reactive support - `spring-session-data-redis`: remove Redis driver from `compile` configuration - Boot samples: delegate Redis driver choice to `spring-boot-starter-data-redis` - polish `test` configuration dependencies	2017-07-06 17:05:01 -05:00
Rob Winch	7c6693a268	Remove Sonar to see if it fixes build	2017-07-06 08:49:21 -05:00
Vedran Pavic	05a3f59813	Simplify Hazelcast sample	2017-07-05 16:00:28 -05:00
Vedran Pavic	47a7a35aa4	Remove use of `Assert#notNull` from core components Fixes gh-820	2017-07-05 17:04:03 +02:00
Vedran Pavic	04b4fe3e3b	Fix Checkstyle violations	2017-07-01 00:04:46 +02:00
Rob Winch	36bb65e4b5	Add default methods to Session Fixes gh-819	2017-06-30 10:25:14 -05:00
Rob Winch	8ef36e4f3e	Session Optional<T> getAttribute -> T getAttribute Issue gh-819	2017-06-30 10:24:59 -05:00
Rob Winch	ab3e280993	Update to latest SNAPSHOTs	2017-06-29 22:20:26 -05:00
Rob Winch	30562b5749	Use Spring IO Cairo-BUILD-SNAPSHOT	2017-06-27 16:37:13 -05:00
Rob Winch	d42a7b65ea	Add MapReactorSessionRepository Fixes gh-815	2017-06-27 16:32:51 -05:00
Rob Winch	db9807d12b	Add ReactorSessionRepository Fixes gh-814	2017-06-27 16:32:51 -05:00
Rob Winch	db09fa8168	Use SPRING_SESSION_TEAM_EMAILS	2017-06-26 10:52:17 -05:00
Vedran Pavic	031541bc05	Fix Checkstyle violations	2017-06-26 08:45:20 +02:00
Vedran Pavic	084e3428fb	Move `SessionEventRegistry` back to integration-test sources Fixes gh-810	2017-06-23 19:03:46 +02:00
Vedran Pavic	b321ff02f0	Revert "SessionRepository.save returns S" See gh-809	2017-06-23 18:48:30 +02:00
Rob Winch	c6c6beb40c	Session.delete -> deleteById Fixes gh-809	2017-06-22 21:30:14 -05:00
Rob Winch	0127ef9f9b	SessionRepository.getSession(String) -> findById(String) Issue gh-809	2017-06-22 21:29:34 -05:00
Rob Winch	cd8686ae9c	SessionRepository.save returns S Issue gh-809	2017-06-22 21:27:25 -05:00
Rob Winch	233d179bfa	Revert "Allow Publishing When Spring IO Fails" This reverts commit `fca411996a`.	2017-06-22 13:20:23 -05:00
Rob Winch	4e8ae8d9d4	Revert "Deploy Without Checks for Spring IO" This reverts commit `8c6810c6dd`.	2017-06-22 13:20:21 -05:00
Rob Winch	8c6810c6dd	Deploy Without Checks for Spring IO	2017-06-22 13:18:01 -05:00
Rob Winch	fca411996a	Allow Publishing When Spring IO Fails This is necessary to solve the problem of chicken and the Egg. See https://github.com/spring-io/platform/issues/622#issuecomment-310452646	2017-06-22 13:00:12 -05:00
Rob Winch	79b8296e1c	Work Around spring-projects/spring-boot#9573 Issue gh-806	2017-06-22 09:04:23 -05:00
Rob Winch	043cb42149	Extract spring-session-jdbc Issue gh-806	2017-06-22 09:04:09 -05:00
Rob Winch	c28f047eb5	Extract spring-session-data-hazelcast Issue gh-806	2017-06-22 09:03:50 -05:00
Rob Winch	972cf66d7e	Extract spring-session-data-redis Issue gh-806	2017-06-22 09:03:25 -05:00
Rob Winch	f1319483ee	Move spring-session to spring-session-core Issue gh-806	2017-06-22 09:02:44 -05:00
Rob Winch	6ad5006280	Update to Gradle 4.0	2017-06-16 13:40:43 -05:00
Vedran Pavic	f7e07b7f6b	Improve `Session` API to use Java 8	2017-06-16 11:44:19 -05:00
Vedran Pavic	4cf26d9c36	Move `ExpiringSession` API into `Session`	2017-06-16 11:44:19 -05:00
Vedran Pavic	a848df1235	Replace explicit type arguments with diamond operator	2017-06-16 11:44:19 -05:00
Rob Winch	f8292ba512	Update to Spring Boot 2.0.0.M2 Fixes gh-801	2017-06-16 10:29:30 -05:00
Rob Winch	21bcc6e8d7	Next Development Version	2017-06-15 20:35:20 -05:00
Rob Winch	905a77a3a8	Release 2.0.0.M2	2017-06-15 20:08:29 -05:00
Rob Winch	295f9f78c3	Update to latest Releases - Spring Framework 5.0.0.RC2 - Spring Security 5.0.0.M2 - Spring Data Kay-M4	2017-06-15 20:08:15 -05:00
Rob Winch	04ecc82d09	Polish Artifactory Publish	2017-06-15 11:40:04 -05:00
Rob Winch	2ddd9e58a3	Update to spring-build-conventions 0.0.2.RELEASE	2017-06-15 11:39:21 -05:00
Vedran Pavic	3c52298c47	Add support for configuring default `CookieSerializer` using `SessionCookieConfig` Fixes gh-87	2017-06-13 22:01:15 +02:00
Rob Winch	7b385c7d33	Exclude check on artifactoryPublish	2017-06-08 16:54:16 -05:00
Rob Winch	87d51c54c9	Add Artifactory Deploy	2017-06-08 16:42:55 -05:00
Rob Winch	210e8eebc5	Update to spring-build-conventions 0.0.2.BUILD-SNAPSHOT	2017-06-08 16:38:39 -05:00
Vedran Pavic	7d52c87173	Improve Spring Boot based samples Starting with 2.0.0.M1, Boot provides auto-config support for Lettuce. See gh-790	2017-06-07 22:48:46 +02:00
Vedran Pavic	e3c6fb67f2	Replace `StringBuffer` usages with `StringBuilder` Fixes gh-718	2017-05-30 22:40:28 +02:00
Vedran Pavic	79f187ddd6	Upgrade samples to Boot 2.0.0.M1 Fixes gh-782	2017-05-30 22:37:36 +02:00
Vedran Pavic	22f4b0bc9d	Update minimum requirements	2017-05-25 23:59:49 +02:00
Vedran Pavic	c5ea626d03	Improve layout of community extensions doc section Fixes gh-786	2017-05-17 11:49:49 +02:00
Vedran Pavic	d067cd1e66	Remove obsolete .gradle files Fixes gh-785	2017-05-17 11:45:56 +02:00
Rob Winch	76a6be572a	Next development version	2017-05-10 13:47:17 -05:00