Release 2.2.2.RELEASE

Resolves #1596

build.gradle

@@ -13,7 +13,7 @@ buildscript {
 	}
 
 	dependencies {
-		classpath 'io.spring.gradle:spring-build-conventions:0.0.28.RELEASE'
+		classpath 'io.spring.gradle:spring-build-conventions:0.0.27.RELEASE'
 		classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
 	}
 }

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true
-version=2.3.0.RC1
+version=2.2.2.RELEASE

gradle/dependency-management.gradle

@@ -1,35 +1,35 @@
 dependencyManagement {
 	imports {
 		mavenBom 'io.projectreactor:reactor-bom:Dysprosium-SR5'
-		mavenBom 'org.junit:junit-bom:5.6.0'
+		mavenBom 'org.junit:junit-bom:5.5.2'
 		mavenBom 'org.springframework:spring-framework-bom:5.2.4.RELEASE'
-		mavenBom 'org.springframework.data:spring-data-releasetrain:Neumann-M3'
-		mavenBom 'org.springframework.security:spring-security-bom:5.3.0.RC1'
+		mavenBom 'org.springframework.data:spring-data-releasetrain:Moore-SR5'
+		mavenBom 'org.springframework.security:spring-security-bom:5.2.2.RELEASE'
 		mavenBom 'org.testcontainers:testcontainers-bom:1.12.2'
 	}
 
 	dependencies {
-		dependencySet(group: 'com.hazelcast', version: '3.12.6') {
+		dependencySet(group: 'com.hazelcast', version: '3.12.5') {
 			entry 'hazelcast'
 			entry 'hazelcast-client'
 		}
 
-		dependency 'com.h2database:h2:1.4.200'
+		dependency 'com.h2database:h2:1.4.199'
 		dependency 'com.ibm.db2:jcc:11.5.0.0'
 		dependency 'com.microsoft.sqlserver:mssql-jdbc:7.4.1.jre8'
 		dependency 'com.oracle.ojdbc:ojdbc8:19.3.0.0'
 		dependency 'com.zaxxer:HikariCP:3.4.1'
 		dependency 'edu.umd.cs.mtc:multithreadedtc:1.01'
-		dependency 'io.lettuce:lettuce-core:5.2.2.RELEASE'
+		dependency 'io.lettuce:lettuce-core:5.2.0.RELEASE'
 		dependency 'javax.annotation:javax.annotation-api:1.3.2'
 		dependency 'javax.servlet:javax.servlet-api:4.0.1'
-		dependency 'junit:junit:4.13'
-		dependency 'mysql:mysql-connector-java:8.0.19'
+		dependency 'junit:junit:4.12'
+		dependency 'mysql:mysql-connector-java:8.0.17'
 		dependency 'org.apache.derby:derby:10.14.2.0'
-		dependency 'org.assertj:assertj-core:3.15.0'
+		dependency 'org.assertj:assertj-core:3.13.2'
 		dependency 'org.hsqldb:hsqldb:2.5.0'
 		dependency 'org.mariadb.jdbc:mariadb-java-client:2.4.4'
-		dependency 'org.mockito:mockito-core:3.3.0'
-		dependency 'org.postgresql:postgresql:42.2.10'
+		dependency 'org.mockito:mockito-core:3.0.0'
+		dependency 'org.postgresql:postgresql:42.2.8'
 	}
 }

spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSession.java

@@ -40,7 +40,7 @@ import org.springframework.session.events.SessionDestroyedEvent;
  *
  *     {@literal @Bean}
  *     public MapSessionRepository sessionRepository() {
- *         return new MapSessionRepository(new ConcurrentHashMap<>());
+ *         return new MapSessionRepository();
  *     }
  *
  * }

spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java

@@ -58,7 +58,7 @@ import org.springframework.util.ObjectUtils;
  *
  *     {@literal @Bean}
  *     public MapSessionRepository sessionRepository() {
- *         return new MapSessionRepository(new ConcurrentHashMap<>());
+ *         return new MapSessionRepository();
  *     }
  *
  * }

spring-session-core/src/main/java/org/springframework/session/config/annotation/web/server/EnableSpringWebSession.java

@@ -36,7 +36,7 @@ import org.springframework.context.annotation.Import;
  *
  *     {@literal @Bean}
  *     public ReactiveSessionRepository sessionRepository() {
- *         return new ReactiveMapSessionRepository(new ConcurrentHashMap<>());
+ *         return new ReactiveMapSessionRepository();
  *     }
  *
  * }

spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisIndexedSessionRepository.java

@@ -142,7 +142,7 @@ import org.springframework.util.Assert;
  * <p>
  * When a session is created an event is sent to Redis with the channel of
  * "spring:session:channel:created:33fdd1b6-b496-4b33-9f7d-df96679d32fe" such that
- * "33fdd1b6-b496-4b33-9f7d-df96679d32fe" is the session id. The body of the event will be
+ * "33fdd1b6-b496-4b33-9f7d-df96679d32fe" is the sesion id. The body of the event will be
  * the session that was created.
  * </p>
  *

spring-session-docs/spring-session-docs.gradle

@@ -46,7 +46,5 @@ asciidoctor {
 			'spring-session-version': project.version,
 			'version-milestone': milestoneBuild,
 			'version-release': releaseBuild,
-			'version-snapshot': snapshotBuild,
-			'highlightjsdir@': "js/highlight",
-			'docinfodir@': "."
+			'version-snapshot': snapshotBuild
 }

spring-session-docs/src/docs/asciidoc/guides/boot-findbyusername.adoc

@@ -1,16 +1,11 @@
 = Spring Session - find by username
 Rob Winch
-:toc: left
-:stylesdir: ../
-:highlightjsdir: ../js/highlight
-:docinfodir: guides
+:toc:
 
 This guide describes how to use Spring Session to find sessions by username.
 
 NOTE: You can find the completed guide in the <<findbyusername-sample, findbyusername application>>.
 
-[#index-link]
-link:../index.html[Index]
 
 [[findbyusername-assumptions]]
 == Assumptions

spring-session-docs/src/docs/asciidoc/guides/boot-jdbc.adoc

@@ -1,17 +1,11 @@
 = Spring Session - Spring Boot
 Rob Winch, Vedran Pavić
-:toc: left
-:stylesdir: ../
-:highlightjsdir: ../js/highlight
-:docinfodir: guides
+:toc:
 
 This guide describes how to use Spring Session to transparently leverage a relational database to back a web application's `HttpSession` when you use Spring Boot.
 
 NOTE: You can find the completed guide in the <<httpsession-jdbc-boot-sample, httpsession-jdbc-boot sample application>>.
 
-[#index-link]
-link:../index.html[Index]
-
 == Updating Dependencies
 
 Before you use Spring Session, you must update your dependencies.

spring-session-docs/src/docs/asciidoc/guides/boot-redis.adoc

@@ -1,17 +1,11 @@
 = Spring Session - Spring Boot
 Rob Winch, Vedran Pavić
-:toc: left
-:stylesdir: ../
-:highlightjsdir: ../js/highlight
-:docinfodir: guides
+:toc:
 
 This guide describes how to use Spring Session to transparently leverage Redis to back a web application's `HttpSession` when you use Spring Boot.
 
 NOTE: You can find the completed guide in the <<boot-sample, boot sample application>>.
 
-[#index-link]
-link:../index.html[Index]
-
 == Updating Dependencies
 
 Before you use Spring Session, you must ensure your dependencies.
@@ -157,6 +151,6 @@ To do so, enter the following into your terminal, being sure to replace `7e8383a
 ----
 	$ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
 ----
-====
+=====
 
 Now you can visit the application at http://localhost:8080/ and observe that we are no longer authenticated.

spring-session-docs/src/docs/asciidoc/guides/boot-websocket.adoc

@@ -1,10 +1,7 @@
 = Spring Session - WebSocket
 Rob Winch
-:toc: left
+:toc:
 :websocketdoc-test-dir: {docs-test-dir}docs/websocket/
-:stylesdir: ../
-:highlightjsdir: ../js/highlight
-:docinfodir: guides
 
 This guide describes how to use Spring Session to ensure that WebSocket messages keep your HttpSession alive.
 
@@ -15,9 +12,6 @@ Specifically,it does not work with using https://www.jcp.org/en/jsr/detail?id=35
 
 // end::disclaimer[]
 
-[#index-link]
-link:../index.html[Index]
-
 == HttpSession Setup
 
 The first step is to integrate Spring Session with the HttpSession. These steps are already outlined in the link:httpsession.html[HttpSession Guide].

spring-session-docs/src/docs/asciidoc/guides/docinfo-footer.html

@@ -1,2 +0,0 @@
-<script type="text/javascript" src="../js/tocbot/tocbot.min.js"></script>
-<script type="text/javascript" src="../js/toc.js"></script>

spring-session-docs/src/docs/asciidoc/guides/java-custom-cookie.adoc

@@ -1,18 +1,12 @@
 = Spring Session - Custom Cookie
 Rob Winch; Eleftheria Stein-Kousathana
-:toc: left
-:stylesdir: ../
-:highlightjsdir: ../js/highlight
-:docinfodir: guides
+:toc:
 
 This guide describes how to configure Spring Session to use custom cookies with Java Configuration.
 The guide assumes you have already link:./httpsession.html[set up Spring Session in your project].
 
 NOTE: You can find the completed guide in the <<custom-cookie-sample, Custom Cookie sample application>>.
 
-[#index-link]
-link:../index.html[Index]
-
 [[custom-cookie-spring-configuration]]
 == Spring Java Configuration
 

spring-session-docs/src/docs/asciidoc/guides/java-hazelcast.adoc

@@ -1,18 +1,12 @@
 = Spring Session and Spring Security with Hazelcast
 Tommy Ludwig; Rob Winch
-:toc: left
-:stylesdir: ../
-:highlightjsdir: ../js/highlight
-:docinfodir: guides
+:toc:
 
 This guide describes how to use Spring Session along with Spring Security when you use Hazelcast as your data store.
 It assumes that you have already applied Spring Security to your application.
 
 NOTE: You cand find the completed guide in the <<hazelcast-spring-security-sample, Hazelcast Spring Security sample application>>.
 
-[#index-link]
-link:../index.html[Index]
-
 == Updating Dependencies
 
 Before you use Spring Session, you must update your dependencies.

spring-session-docs/src/docs/asciidoc/guides/java-jdbc.adoc

@@ -1,17 +1,11 @@
 = Spring Session - HttpSession (Quick Start)
 Rob Winch, Vedran Pavić
-:toc: left
-:stylesdir: ../
-:highlightjsdir: ../js/highlight
-:docinfodir: guides
+:toc:
 
 This guide describes how to use Spring Session to transparently leverage a relational database to back a web application's `HttpSession` with Java Configuration.
 
 NOTE: You can find the completed guide in the <<httpsession-jdbc-sample, httpsession-jdbc sample application>>.
 
-[#index-link]
-link:../index.html[Index]
-
 == Updating Dependencies
 
 Before you use Spring Session, you must update your dependencies.
@@ -105,7 +99,7 @@ For additional information on how to configure data access related concerns, see
 
 == Java Servlet Container Initialization
 
-Our <<httpsession-jdbc-spring-configuration,Spring Configuration>> created a Spring bean named `springSessionRepositoryFilter` that implements `Filter`.
+Our <<httpsession-spring-configuration,Spring Configuration>> created a Spring bean named `springSessionRepositoryFilter` that implements `Filter`.
 The `springSessionRepositoryFilter` bean is responsible for replacing the `HttpSession` with a custom implementation that is backed by Spring Session.
 
 In order for our `Filter` to do its magic, Spring needs to load our `Config` class.

spring-session-docs/src/docs/asciidoc/guides/java-redis.adoc

@@ -1,18 +1,12 @@
 = Spring Session - HttpSession (Quick Start)
 Rob Winch
-:toc: left
+:toc:
 :version-snapshot: true
-:stylesdir: ../
-:highlightjsdir: ../js/highlight
-:docinfodir: guides
 
 This guide describes how to use Spring Session to transparently leverage Redis to back a web application's `HttpSession` with Java Configuration.
 
 NOTE: You can find the completed guide in the <<httpsession-sample, httpsession sample application>>.
 
-[#index-link]
-link:../index.html[Index]
-
 == Updating Dependencies
 Before you use Spring Session, you must update your dependencies.
 If you are using Maven, you must add the following dependencies:

spring-session-docs/src/docs/asciidoc/guides/java-rest.adoc

@@ -1,17 +1,11 @@
 = Spring Session - REST
 Rob Winch
-:toc: left
-:stylesdir: ../
-:highlightjsdir: ../js/highlight
-:docinfodir: guides
+:toc:
 
 This guide describes how to use Spring Session to transparently leverage Redis to back a web application's `HttpSession` when you use REST endpoints.
 
 NOTE: You can find the completed guide in the <<rest-sample, rest sample application>>.
 
-[#index-link]
-link:../index.html[Index]
-
 == Updating Dependencies
 
 Before you use Spring Session, you must update your dependencies.
@@ -247,7 +241,7 @@ $ curl -v http://localhost:8080/ -u user:password
 
 In the output, you should notice the following:
 
-====
+===
 ----
 HTTP/1.1 200 OK
 ...

spring-session-docs/src/docs/asciidoc/guides/java-security.adoc

@@ -1,18 +1,12 @@
 = Spring Session and Spring Security
 Rob Winch
-:toc: left
-:stylesdir: ../
-:highlightjsdir: ../js/highlight
-:docinfodir: guides
+:toc:
 
 This guide describes how to use Spring Session along with Spring Security.
 It assumes you have already applied Spring Security to your application.
 
 NOTE: You can find the completed guide in the <<security-sample, security sample application>>.
 
-[#index-link]
-link:../index.html[Index]
-
 == Updating Dependencies
 Before you use Spring Session, you must update your dependencies.
 If you use Maven, you must add the following dependencies:

spring-session-docs/src/docs/asciidoc/guides/xml-jdbc.adoc

@@ -1,17 +1,11 @@
 = Spring Session - HttpSession (Quick Start)
 Rob Winch, Vedran Pavić
-:toc: left
-:stylesdir: ../
-:highlightjsdir: ../js/highlight
-:docinfodir: guides
+:toc:
 
 This guide describes how to use Spring Session to transparently leverage a relational to back a web application's `HttpSession` with XML based configuration.
 
 NOTE: You can find the completed guide in the <<httpsession-jdbc-xml-sample, httpsession-jdbc-xml sample application>>.
 
-[#index-link]
-link:../index.html[Index]
-
 == Updating Dependencies
 
 Before you use Spring Session, you must update your dependencies.
@@ -74,8 +68,8 @@ You must have the following in your pom.xml:
 	<url>https://repo.spring.io/libs-milestone</url>
 </repository>
 ----
-====
 endif::[]
+====
 
 // tag::config[]
 

spring-session-docs/src/docs/asciidoc/guides/xml-redis.adoc

@@ -1,17 +1,11 @@
 = Spring Session - HttpSession (Quick Start)
 Rob Winch
-:toc: left
-:stylesdir: ../
-:highlightjsdir: ../js/highlight
-:docinfodir: guides
+:toc:
 
 This guide describes how to use Spring Session to transparently leverage Redis to back a web application's `HttpSession` with XML-based configuration.
 
 NOTE: You can find the completed guide in the <<httpsession-xml-sample, httpsession-xml sample application>>.
 
-[#index-link]
-link:../index.html[Index]
-
 == Updating Dependencies
 Before you use Spring Session, you must update your dependencies.
 If you use Maven, you must add the following dependencies:

spring-session-docs/src/test/java/docs/security/RememberMeSecurityConfiguration.java

@@ -19,7 +19,6 @@ package docs.security;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.springframework.context.annotation.Bean;
-import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -42,16 +41,14 @@ public class RememberMeSecurityConfiguration extends WebSecurityConfigurerAdapte
 	protected void configure(HttpSecurity http) throws Exception {
 		http
 			// ... additional configuration ...
-			.rememberMe((rememberMe) -> rememberMe
-				.rememberMeServices(rememberMeServices())
-			);
+			.rememberMe()
+				.rememberMeServices(rememberMeServices());
 		// end::http-rememberme[]
 
 		http
-			.formLogin(Customizer.withDefaults())
-			.authorizeRequests((authorize) -> authorize
-				.anyRequest().authenticated()
-			);
+			.formLogin().and()
+			.authorizeRequests()
+				.anyRequest().authenticated();
 	}
 
 	// tag::rememberme-bean[]

spring-session-docs/src/test/java/docs/security/SecurityConfiguration.java

@@ -40,10 +40,9 @@ public class SecurityConfiguration<S extends Session> extends WebSecurityConfigu
 		// @formatter:off
 		http
 			// other config goes here...
-			.sessionManagement((sessionManagement) -> sessionManagement
+			.sessionManagement()
 				.maximumSessions(2)
-				.sessionRegistry(sessionRegistry())
-			);
+				.sessionRegistry(sessionRegistry());
 		// @formatter:on
 	}
 

spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcIndexedSessionRepository.java

@@ -103,7 +103,7 @@ import org.springframework.util.StringUtils;
  * );
  *
  * CREATE UNIQUE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (SESSION_ID);
- * CREATE INDEX SPRING_SESSION_IX2 ON SPRING_SESSION (EXPIRY_TIME);
+ * CREATE INDEX SPRING_SESSION_IX1 ON SPRING_SESSION (EXPIRY_TIME);
  * CREATE INDEX SPRING_SESSION_IX3 ON SPRING_SESSION (PRINCIPAL_NAME);
  *
  * CREATE TABLE SPRING_SESSION_ATTRIBUTES (

spring-session-samples/spring-session-sample-boot-findbyusername/src/main/java/sample/config/SecurityConfig.java

@@ -35,14 +35,13 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
 		http
-			.authorizeRequests((authorize) -> authorize
+			.authorizeRequests()
 				.requestMatchers(PathRequest.toStaticResources().atCommonLocations()).permitAll()
 				.anyRequest().authenticated()
-			)
-			.formLogin((formLogin) -> formLogin
+				.and()
+			.formLogin()
 				.loginPage("/login")
-				.permitAll()
-			);
+				.permitAll();
 	}
 	// end::config[]
 	// @formatter:on

spring-session-samples/spring-session-sample-boot-jdbc/src/main/java/sample/config/SecurityConfig.java

@@ -44,13 +44,12 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
 		http
-			.authorizeRequests((authorize) -> authorize
+			.authorizeRequests()
 				.requestMatchers(PathRequest.toStaticResources().atCommonLocations()).permitAll()
 				.anyRequest().authenticated()
-			)
-			.formLogin((formLogin) -> formLogin
-				.permitAll()
-			);
+				.and()
+			.formLogin()
+				.permitAll();
 	}
 	// end::config[]
 	// @formatter:on

spring-session-samples/spring-session-sample-boot-redis-json/src/main/java/sample/config/SecurityConfig.java

@@ -34,14 +34,13 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
 		http
-			.authorizeRequests((authorize) -> authorize
+			.authorizeRequests()
 				.requestMatchers(PathRequest.toStaticResources().atCommonLocations()).permitAll()
 				.anyRequest().authenticated()
-			)
-			.formLogin((formLogin) -> formLogin
+				.and()
+			.formLogin()
 				.loginPage("/login")
-				.permitAll()
-			);
+				.permitAll();
 	}
 	// @formatter:on
 

spring-session-samples/spring-session-sample-boot-redis-simple/src/main/java/sample/config/SecurityConfig.java

@@ -28,13 +28,12 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
 		http
-			.authorizeRequests((authorize) -> authorize
+			.authorizeRequests()
 				.requestMatchers(PathRequest.toStaticResources().atCommonLocations()).permitAll()
 				.anyRequest().authenticated()
-			)
-			.formLogin((formLogin) -> formLogin
-				.permitAll()
-			);
+				.and()
+			.formLogin()
+				.permitAll();
 	}
 	// @formatter:on
 

spring-session-samples/spring-session-sample-boot-redis/src/main/java/sample/config/SecurityConfig.java

@@ -35,13 +35,12 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
 		http
-			.authorizeRequests((authorize) -> authorize
+			.authorizeRequests()
 				.requestMatchers(PathRequest.toStaticResources().atCommonLocations()).permitAll()
 				.anyRequest().authenticated()
-			)
-			.formLogin((formLogin) -> formLogin
-				.permitAll()
-			);
+				.and()
+			.formLogin()
+				.permitAll();
 	}
 	// end::config[]
 	// @formatter:on

spring-session-samples/spring-session-sample-boot-websocket/src/main/java/sample/config/WebSecurityConfig.java

@@ -53,13 +53,12 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
 		http
-			.authorizeRequests((authorize) -> authorize
+			.authorizeRequests()
 				.requestMatchers(PathRequest.toStaticResources().atCommonLocations()).permitAll()
 				.anyRequest().authenticated()
-			)
-			.formLogin((formLogin) -> formLogin
-				.permitAll()
-			);
+				.and()
+			.formLogin()
+				.permitAll();
 	}
 	// @formatter:on
 

spring-session-samples/spring-session-sample-javaconfig-jdbc/src/main/java/sample/SessionServlet.java

@@ -37,4 +37,4 @@ public class SessionServlet extends HttpServlet {
 	private static final long serialVersionUID = 2878267318695777395L;
 
 }
-// end::class[]
+// tag::end[]

spring-session-samples/spring-session-sample-javaconfig-redis/src/main/java/sample/SessionServlet.java

@@ -38,4 +38,4 @@ public class SessionServlet extends HttpServlet {
 	private static final long serialVersionUID = 2878267318695777395L;
 
 }
-// end::class[]
+// tag::end[]

spring-session-samples/spring-session-sample-javaconfig-rest/src/main/java/sample/SecurityConfig.java

@@ -17,7 +17,6 @@
 package sample;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -32,13 +31,13 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
 		http
-			.authorizeRequests((authorize) -> authorize
+			.authorizeRequests()
 				.anyRequest().authenticated()
-			)
-			.requestCache((requestCache) -> requestCache
+				.and()
+			.requestCache()
 				.requestCache(new NullRequestCache())
-			)
-			.httpBasic(Customizer.withDefaults());
+				.and()
+			.httpBasic();
 	}
 	// @formatter:on