Release 2.6.2

Closes gh-2029

.github/workflows/antora-generate.yml

@@ -1,7 +1,6 @@
 name: Generate Antora Files and Request Build
 
 on:
-  workflow_dispatch:  # Manual trigger
   push:
     branches-ignore:
       - 'gh-pages'

RELEASE.adoc

@@ -1,110 +0,0 @@
-== 1. Update Dependencies
-
-Dependencies are declared in `gradle/dependency-management.gradle`.
-Update Spring Framework, Spring Security and Spring Data at a minimum.
-
-Run all the checks:
-
-[source,bash]
-----
-$ ./gradlew check
-----
-
-Create separate issues for each dependency update, aside from test dependencies which can be combined into a single commit.
-
-== 2. Check All Issues are Closed
-
-You can manually check at https://github.com/spring-projects/spring-session/milestones
-
-== 3. Update Release Version
-
-Update the version number in `gradle.properties` for the release, for example `2.7.0-M1`, `2.7.0-RC1`, `2.7.3`
-
-== 4. Update Antora Version
-
-You will need to update the antora.yml version.
-
-For milestone / release candidate releases you should follow this format:
-----
-version: '2.7.0-RC1'
-prerelease: 'true'
-display_version: '2.7.0-RC1'
-----
-
-== 5. Build Locally
-
-Run the build using
-
-[source,bash]
-----
-$ ./gradlew check
-----
-
-== 6. Push the Release Commit
-
-Push the commit and GitHub actions will build and deploy the artifacts.
-Wait for the artifact to appear in https://repo1.maven.org/maven2/org/springframework/session/spring-session-core/
-
-== 7. Tag the release
-
-Tag the release and then push the tag
-
-....
-git tag 2.7.0-RC1
-git push origin 2.7.0-RC1
-....
-
-== 8. Update to Next Development Version
-
-Update `gradle.properties` version to next `+SNAPSHOT+` version, update antora.yml and then push
-
-== 9. Update version on project pages
-
-Update the versions on https://spring.io/projects for Spring Session Core, Spring Session Data Redis, Spring Session JDBC, Spring Session Hazelcast, and Spring Session MongoDB.
-
-== 10. Update Release Notes on GitHub
-
-Download
-https://github.com/spring-io/github-changelog-generator/releases/latest[the
-GitHub release notes generator]
-
-* Generate the release notes
-
-....
-java -jar github-changelog-generator.jar \
-    --changelog.repository=spring-projects/spring-session \
-    $MILESTONE release-notes
-....
-
-Note 1: `+$MILESTONE+` is something like `+2.7.1+` or `+2.7.0-M1+`. +
-Note 2: This will create a file on your filesystem
-called `+release-notes+`.
-
-* Copy the release notes to your clipboard (your mileage may vary with
-the following command)
-
-....
-cat release-notes | xclip -selection clipboard
-....
-
-* Create the
-https://github.com/spring-projects/spring-session/releases[release on
-GitHub], associate it with the tag, and paste the generated notes.
-
-== 11. Close / Create Milestone
-
-* In
-https://github.com/spring-projects/spring-session/milestones[GitHub
-Milestones], create a new milestone for the next release version.
-* Move any open issues from the existing milestone you just released to
-the new milestone.
-* Close the milestone for the release.
-
-Note: Spring Session typically releases only one milestone (M1) and one release candidate (RC1).
-
-== 12. Announce the release
-
-* Announce via Slack on https://pivotal.slack.com/messages/spring-session[#spring-session], and tag any downstream Spring Session projects (e.g Spring Session for Apache Geode).
-
-Note: Do not post on #spring-release or create a blog post. Those steps happen after the Spring Session BOM is released.
-

build.gradle

@@ -4,7 +4,7 @@ buildscript {
 		snapshotBuild = version.endsWith('SNAPSHOT')
 		milestoneBuild = !(releaseBuild || snapshotBuild)
 
-		springBootVersion = '2.7.0-M3'
+		springBootVersion = '2.5.6'
 	}
 
 	repositories {

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.7.0-SNAPSHOT
+version=2.6.2

gradle/dependency-management.gradle

@@ -1,12 +1,12 @@
 dependencyManagement {
 	imports {
-		mavenBom 'io.projectreactor:reactor-bom:2020.0.18'
-		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.2.20220328'
+		mavenBom 'io.projectreactor:reactor-bom:2020.0.16'
+		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.1'
 		mavenBom 'org.junit:junit-bom:5.8.2'
-		mavenBom 'org.springframework:spring-framework-bom:5.3.19'
-		mavenBom 'org.springframework.data:spring-data-bom:2021.2.0-RC1'
-		mavenBom 'org.springframework.security:spring-security-bom:5.7.0-RC1'
-		mavenBom 'org.testcontainers:testcontainers-bom:1.17.1'
+		mavenBom 'org.springframework:spring-framework-bom:5.3.16'
+		mavenBom 'org.springframework.data:spring-data-bom:2021.1.2'
+		mavenBom 'org.springframework.security:spring-security-bom:5.6.2'
+		mavenBom 'org.testcontainers:testcontainers-bom:1.16.2'
 	}
 
 	dependencies {
@@ -15,35 +15,35 @@ dependencyManagement {
 			entry 'hazelcast-client'
 		}
 
-		dependency 'org.aspectj:aspectjweaver:1.9.9.1'
-		dependency 'ch.qos.logback:logback-core:1.2.11'
+		dependency 'org.aspectj:aspectjweaver:1.9.8'
+		dependency 'ch.qos.logback:logback-core:1.2.10'
 		dependency 'com.google.code.findbugs:jsr305:3.0.2'
 		dependency 'com.h2database:h2:1.4.200'
 		dependency 'com.ibm.db2:jcc:11.5.7.0'
 		dependency 'com.microsoft.sqlserver:mssql-jdbc:9.4.1.jre8'
-		dependency 'com.oracle.database.jdbc:ojdbc8:21.5.0.0'
+		dependency 'com.oracle.database.jdbc:ojdbc8:21.3.0.0'
 		dependency 'com.zaxxer:HikariCP:3.4.5'
 		dependency 'edu.umd.cs.mtc:multithreadedtc:1.01'
-		dependency 'io.lettuce:lettuce-core:6.1.8.RELEASE'
+		dependency 'io.lettuce:lettuce-core:6.1.6.RELEASE'
 		dependency 'jakarta.annotation:jakarta.annotation-api:1.3.5'
 		dependency 'jakarta.servlet:jakarta.servlet-api:4.0.4'
 		dependency 'mysql:mysql-connector-java:8.0.28'
 		dependency 'org.apache.derby:derby:10.14.2.0'
-		dependency 'org.assertj:assertj-core:3.22.0'
-		dependency 'org.hamcrest:hamcrest:2.2'
+		dependency 'org.assertj:assertj-core:3.21.0'
+		dependency 'org.hamcrest:hamcrest:2.1'
 		dependency 'org.hsqldb:hsqldb:2.5.2'
-		dependency 'org.mariadb.jdbc:mariadb-java-client:2.7.5'
-		dependencySet(group: 'org.mockito', version: '4.4.0') {
+		dependency 'org.mariadb.jdbc:mariadb-java-client:2.7.4'
+		dependencySet(group: 'org.mockito', version: '4.0.0') {
         	entry 'mockito-core'
 			entry 'mockito-junit-jupiter'
 		}
 
-		dependencySet(group: 'org.mongodb', version: '4.5.1') {
+		dependencySet(group: 'org.mongodb', version: '4.4.2') {
 			entry 'mongodb-driver-core'
 			entry 'mongodb-driver-sync'
 			entry 'mongodb-driver-reactivestreams'
 		}
-		dependency 'org.postgresql:postgresql:42.3.4'
+		dependency 'org.postgresql:postgresql:42.3.3'
 	}
 }
 

settings.gradle

@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id "com.gradle.enterprise" version "3.9"
+    id "com.gradle.enterprise" version "3.5.1"
     id "io.spring.ge.conventions" version "0.0.7"
 }
 

spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java

@@ -389,7 +389,7 @@ public abstract class AbstractMongoRepositoryITest extends AbstractITest {
 
 	protected static class BaseConfig {
 
-		private static final String DOCKER_IMAGE = "mongo:4.4.1";
+		private static final String DOCKER_IMAGE = "mongo:4.0.10";
 
 		@Bean(initMethod = "start", destroyMethod = "stop")
 		public MongoDBContainer mongoContainer() {

spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbDeleteJacksonSessionVerificationTest.java

@@ -175,7 +175,7 @@ public class MongoDbDeleteJacksonSessionVerificationTest {
 	@EnableMongoWebSession
 	static class Config {
 
-		private static final String DOCKER_IMAGE = "mongo:4.4.1";
+		private static final String DOCKER_IMAGE = "mongo:4.0.10";
 
 		@Bean(initMethod = "start", destroyMethod = "stop")
 		MongoDBContainer mongoContainer() {

spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbLogoutVerificationTest.java

@@ -170,7 +170,7 @@ public class MongoDbLogoutVerificationTest {
 	@EnableMongoWebSession
 	static class Config {
 
-		private static final String DOCKER_IMAGE = "mongo:4.4.1";
+		private static final String DOCKER_IMAGE = "mongo:4.0.10";
 
 		@Bean(initMethod = "start", destroyMethod = "stop")
 		MongoDBContainer mongoContainer() {

spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/MongoSession.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * 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.
@@ -39,17 +39,10 @@ import org.springframework.session.Session;
 public class MongoSession implements Session {
 
 	/**
-	 * Mongo doesn't support {@literal dot} in field names. We replace it with a unicode
-	 * character from the Private Use Area.
-	 * <p>
-	 * NOTE: This was originally stored in unicode format. Delomboking the code caused it
-	 * to get converted to another encoding, which isn't supported on all systems, so we
-	 * migrated back to unicode. The same character is being represented ensuring binary
-	 * compatibility.
-	 *
-	 * See https://www.compart.com/en/unicode/U+F607
+	 * Mongo doesn't support {@literal dot} in field names. We replace it with a very
+	 * rarely used character
 	 */
-	private static final char DOT_COVER_CHAR = '\uF607';
+	private static final char DOT_COVER_CHAR = '';
 
 	private String id;
 

spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/AbstractRedisITests.java

@@ -29,7 +29,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
  */
 public abstract class AbstractRedisITests {
 
-	private static final String DOCKER_IMAGE = "redis:5.0.14";
+	private static final String DOCKER_IMAGE = "redis:5.0.10";
 
 	protected static class BaseConfig {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2020 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.
@@ -42,10 +42,7 @@ import org.springframework.util.Assert;
  */
 public class RedisSessionRepository implements SessionRepository<RedisSessionRepository.RedisSession> {
 
-	/**
-	 * The default namespace for each key and channel in Redis used by Spring Session.
-	 */
-	public static final String DEFAULT_KEY_NAMESPACE = "spring:session";
+	private static final String DEFAULT_KEY_NAMESPACE = "spring:session";
 
 	private final RedisOperations<String, Object> sessionRedisOperations;
 

spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationClassPathXmlApplicationContextTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -23,14 +23,11 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.SubscriptionListener;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.willAnswer;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -53,15 +50,6 @@ public class RedisHttpSessionConfigurationClassPathXmlApplicationContextTests {
 		given(factory.getConnection()).willReturn(connection);
 		given(connection.getConfig(anyString())).willReturn(new Properties());
 
-		willAnswer((it) -> {
-			SubscriptionListener listener = it.getArgument(0);
-			listener.onPatternSubscribed(it.getArgument(1), 0);
-			listener.onChannelSubscribed("__keyevent@0__:del".getBytes(), 0);
-			listener.onChannelSubscribed("__keyevent@0__:expired".getBytes(), 0);
-
-			return null;
-		}).given(connection).pSubscribe(any(), any());
-
 		return factory;
 	}
 

spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationNoOpConfigureRedisActionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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,17 +21,12 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.SubscriptionListener;
 import org.springframework.session.data.redis.config.ConfigureRedisAction;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.willAnswer;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -57,20 +52,7 @@ class RedisHttpSessionConfigurationNoOpConfigureRedisActionTests {
 
 		@Bean
 		RedisConnectionFactory redisConnectionFactory() {
-			RedisConnectionFactory redisConnectionFactory = mock(RedisConnectionFactory.class);
-			RedisConnection connection = mock(RedisConnection.class);
-			given(redisConnectionFactory.getConnection()).willReturn(connection);
-
-			willAnswer((it) -> {
-				SubscriptionListener listener = it.getArgument(0);
-				listener.onPatternSubscribed(it.getArgument(1), 0);
-				listener.onChannelSubscribed("__keyevent@0__:del".getBytes(), 0);
-				listener.onChannelSubscribed("__keyevent@0__:expired".getBytes(), 0);
-
-				return null;
-			}).given(connection).pSubscribe(any(), any());
-
-			return redisConnectionFactory;
+			return mock(RedisConnectionFactory.class);
 		}
 
 	}

spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationOverrideDefaultSerializerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -26,7 +26,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.SubscriptionListener;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.session.data.redis.config.annotation.SpringSessionRedisOperations;
@@ -35,10 +34,8 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.willAnswer;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -79,15 +76,6 @@ class RedisHttpSessionConfigurationOverrideDefaultSerializerTests {
 			given(factory.getConnection()).willReturn(connection);
 			given(connection.getConfig(anyString())).willReturn(new Properties());
 
-			willAnswer((it) -> {
-				SubscriptionListener listener = it.getArgument(0);
-				listener.onPatternSubscribed(it.getArgument(1), 0);
-				listener.onChannelSubscribed("__keyevent@0__:del".getBytes(), 0);
-				listener.onChannelSubscribed("__keyevent@0__:expired".getBytes(), 0);
-
-				return null;
-			}).given(connection).pSubscribe(any(), any());
-
 			return factory;
 		}
 

spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationOverrideSessionTaskExecutor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -27,8 +27,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.SubscriptionListener;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.scheduling.SchedulingAwareRunnable;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -36,7 +36,6 @@ import org.springframework.test.context.web.WebAppConfiguration;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.willAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -58,7 +57,7 @@ class RedisHttpSessionConfigurationOverrideSessionTaskExecutor {
 
 	@Test
 	void overrideSessionTaskExecutor() {
-		verify(this.springSessionRedisTaskExecutor, times(1)).execute(any(Runnable.class));
+		verify(this.springSessionRedisTaskExecutor, times(1)).execute(any(SchedulingAwareRunnable.class));
 	}
 
 	@EnableRedisHttpSession
@@ -67,13 +66,7 @@ class RedisHttpSessionConfigurationOverrideSessionTaskExecutor {
 
 		@Bean
 		Executor springSessionRedisTaskExecutor() {
-			Executor executor = mock(Executor.class);
-			willAnswer((it) -> {
-				Runnable r = it.getArgument(0);
-				new Thread(r).start();
-				return null;
-			}).given(executor).execute(any());
-			return executor;
+			return mock(Executor.class);
 		}
 
 		@Bean
@@ -83,15 +76,6 @@ class RedisHttpSessionConfigurationOverrideSessionTaskExecutor {
 			given(factory.getConnection()).willReturn(connection);
 			given(connection.getConfig(anyString())).willReturn(new Properties());
 
-			willAnswer((it) -> {
-				SubscriptionListener listener = it.getArgument(0);
-				listener.onPatternSubscribed(it.getArgument(1), 0);
-				listener.onChannelSubscribed("__keyevent@0__:del".getBytes(), 0);
-				listener.onChannelSubscribed("__keyevent@0__:expired".getBytes(), 0);
-
-				return null;
-			}).given(connection).pSubscribe(any(), any());
-
 			return factory;
 		}
 

spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationOverrideSessionTaskExecutors.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -27,8 +27,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.SubscriptionListener;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.scheduling.SchedulingAwareRunnable;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -36,7 +36,6 @@ import org.springframework.test.context.web.WebAppConfiguration;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.willAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -63,7 +62,7 @@ class RedisHttpSessionConfigurationOverrideSessionTaskExecutors {
 
 	@Test
 	void overrideSessionTaskExecutors() {
-		verify(this.springSessionRedisSubscriptionExecutor, times(1)).execute(any(Runnable.class));
+		verify(this.springSessionRedisSubscriptionExecutor, times(1)).execute(any(SchedulingAwareRunnable.class));
 		verify(this.springSessionRedisTaskExecutor, never()).execute(any(Runnable.class));
 	}
 
@@ -73,24 +72,12 @@ class RedisHttpSessionConfigurationOverrideSessionTaskExecutors {
 
 		@Bean
 		Executor springSessionRedisTaskExecutor() {
-			Executor executor = mock(Executor.class);
-			willAnswer((it) -> {
-				Runnable r = it.getArgument(0);
-				new Thread(r).start();
-				return null;
-			}).given(executor).execute(any());
-			return executor;
+			return mock(Executor.class);
 		}
 
 		@Bean
 		Executor springSessionRedisSubscriptionExecutor() {
-			Executor executor = mock(Executor.class);
-			willAnswer((it) -> {
-				Runnable r = it.getArgument(0);
-				new Thread(r).start();
-				return null;
-			}).given(executor).execute(any());
-			return executor;
+			return mock(Executor.class);
 		}
 
 		@Bean
@@ -100,15 +87,6 @@ class RedisHttpSessionConfigurationOverrideSessionTaskExecutors {
 			given(factory.getConnection()).willReturn(connection);
 			given(connection.getConfig(anyString())).willReturn(new Properties());
 
-			willAnswer((it) -> {
-				SubscriptionListener listener = it.getArgument(0);
-				listener.onPatternSubscribed(it.getArgument(1), 0);
-				listener.onChannelSubscribed("__keyevent@0__:del".getBytes(), 0);
-				listener.onChannelSubscribed("__keyevent@0__:expired".getBytes(), 0);
-
-				return null;
-			}).given(connection).pSubscribe(any(), any());
-
 			return factory;
 		}
 

spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -32,7 +32,6 @@ import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.annotation.Order;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.SubscriptionListener;
 import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.mock.env.MockEnvironment;
@@ -48,9 +47,8 @@ import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.willAnswer;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -266,24 +264,11 @@ class RedisHttpSessionConfigurationTests {
 	}
 
 	private static RedisConnectionFactory mockRedisConnectionFactory() {
-		RedisConnectionFactory connectionFactoryMock = mock(RedisConnectionFactory.class);
-		RedisConnection connectionMock = mock(RedisConnection.class);
-		given(connectionFactoryMock.getConnection()).willReturn(connectionMock);
-
-		Properties keyspaceEventsConfig = new Properties();
-		keyspaceEventsConfig.put("notify-keyspace-events", "KEA");
-		given(connectionMock.getConfig("notify-keyspace-events")).willReturn(keyspaceEventsConfig);
-
-		willAnswer((it) -> {
-			SubscriptionListener listener = it.getArgument(0);
-			listener.onPatternSubscribed(it.getArgument(1), 0);
-			listener.onChannelSubscribed("__keyevent@0__:del".getBytes(), 0);
-			listener.onChannelSubscribed("__keyevent@0__:expired".getBytes(), 0);
-
-			return null;
-		}).given(connectionMock).pSubscribe(any(), any());
-
-		return connectionFactoryMock;
+		RedisConnectionFactory connectionFactory = mock(RedisConnectionFactory.class);
+		RedisConnection connection = mock(RedisConnection.class);
+		given(connectionFactory.getConnection()).willReturn(connection);
+		given(connection.getConfig(anyString())).willReturn(new Properties());
+		return connectionFactory;
 	}
 
 	@Configuration
@@ -460,7 +445,7 @@ class RedisHttpSessionConfigurationTests {
 
 		@Bean
 		RedisMessageListenerContainer redisMessageListenerContainer() {
-			return mock(RedisMessageListenerContainer.class);
+			return new RedisMessageListenerContainer();
 		}
 
 	}

spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationXmlCustomExpireTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -23,15 +23,12 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.SubscriptionListener;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.willAnswer;
 import static org.mockito.Mockito.mock;
 
 @ExtendWith(SpringExtension.class)
@@ -49,15 +46,6 @@ public class RedisHttpSessionConfigurationXmlCustomExpireTests {
 		given(factory.getConnection()).willReturn(connection);
 		given(connection.getConfig(anyString())).willReturn(new Properties());
 
-		willAnswer((it) -> {
-			SubscriptionListener listener = it.getArgument(0);
-			listener.onPatternSubscribed(it.getArgument(1), 0);
-			listener.onChannelSubscribed("__keyevent@0__:del".getBytes(), 0);
-			listener.onChannelSubscribed("__keyevent@0__:expired".getBytes(), 0);
-
-			return null;
-		}).given(connection).pSubscribe(any(), any());
-
 		return factory;
 	}
 

spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationXmlTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -23,15 +23,12 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.SubscriptionListener;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.willAnswer;
 import static org.mockito.Mockito.mock;
 
 @ExtendWith(SpringExtension.class)
@@ -49,15 +46,6 @@ public class RedisHttpSessionConfigurationXmlTests {
 		given(factory.getConnection()).willReturn(connection);
 		given(connection.getConfig(anyString())).willReturn(new Properties());
 
-		willAnswer((it) -> {
-			SubscriptionListener listener = it.getArgument(0);
-			listener.onPatternSubscribed(it.getArgument(1), 0);
-			listener.onChannelSubscribed("__keyevent@0__:del".getBytes(), 0);
-			listener.onChannelSubscribed("__keyevent@0__:expired".getBytes(), 0);
-
-			return null;
-		}).given(connection).pSubscribe(any(), any());
-
 		return factory;
 	}
 

spring-session-data-redis/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/gh109/Gh109Tests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -26,7 +26,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.SubscriptionListener;
 import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.session.data.redis.RedisIndexedSessionRepository;
 import org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration;
@@ -34,10 +33,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.willAnswer;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -78,14 +75,6 @@ class Gh109Tests {
 			RedisConnection connection = mock(RedisConnection.class);
 			given(factory.getConnection()).willReturn(connection);
 			given(connection.getConfig(anyString())).willReturn(new Properties());
-			willAnswer((it) -> {
-				SubscriptionListener listener = it.getArgument(0);
-				listener.onPatternSubscribed(it.getArgument(1), 0);
-				listener.onChannelSubscribed("__keyevent@0__:del".getBytes(), 0);
-				listener.onChannelSubscribed("__keyevent@0__:expired".getBytes(), 0);
-
-				return null;
-			}).given(connection).pSubscribe(any(), any());
 			return factory;
 		}
 

spring-session-docs/antora-playbook.yml

@@ -9,8 +9,8 @@ content:
     - url: https://github.com/spring-io/spring-generated-docs
       branches: [spring-projects/spring-session/*]
     - url: https://github.com/spring-projects/spring-session
-      branches: [main,3.0.x,2.6.x]
-      tags: [ '3.0.*', '2.7.*', '2.6.*','!2.6.0-M*','!2.6.0-RC*','!2.7.0-M1','!3.0.0-M1']
+      branches: [main,3.0.x]
+      tags: ['2.6.*','!2.6.0-M*','!2.6.0-RC*']
       start_path: spring-session-docs
 urls:
   latest_version_segment_strategy: redirect:to
@@ -21,7 +21,7 @@ ui:
     url: https://github.com/spring-io/antora-ui-spring/releases/download/latest/ui-bundle.zip
     snapshot: true
 
-antora:
+pipeline:
   extensions:
-    - require: ./antora/extensions/version-fix.js
     - require: ./antora/extensions/major-minor-segment.js
+    - require: ./antora/extensions/root-component-name.js

spring-session-docs/antora.yml

@@ -1,3 +1,3 @@
 name: ROOT
-version: '2.7.0'
+version: '2.6.2'
 prerelease: '-SNAPSHOT'

spring-session-docs/antora/extensions/major-minor-segment.js

@@ -3,8 +3,8 @@
 
 const { posix: path } = require('path')
 
-module.exports.register = function({ config }) {
-    this.on('contentClassified', ({ contentCatalog }) => {
+module.exports.register = (pipeline, { config }) => {
+    pipeline.on('contentClassified', ({ contentCatalog }) => {
         contentCatalog.getComponents().forEach(component => {
             const componentName = component.name;
             const generationToVersion = new Map();
@@ -91,7 +91,6 @@ function createSymbolicVersionAlias (component, version, symbolicVersionSegment,
 
 function computeOut (src, family, version, htmlUrlExtensionStyle) {
     let { component, module: module_, basename, extname, relative, stem } = src
-    if (component === 'ROOT') component = ''
     if (module_ === 'ROOT') module_ = ''
     let indexifyPathSegment = ''
     let familyPathSegment = ''
@@ -121,11 +120,8 @@ function computePub (src, out, family, version, htmlUrlExtensionStyle) {
     const pub = {}
     let url
     if (family === 'nav') {
-        const component = src.component || 'ROOT'
-        const urlSegments = component === 'ROOT' ? [] : [component]
-        if (version) urlSegments.push(version)
-        const module_ = src.module || 'ROOT'
-        if (module_ !== 'ROOT') urlSegments.push(module_)
+        const urlSegments = version ? [src.component, version] : [src.component]
+        if (src.module && src.module !== 'ROOT') urlSegments.push(src.module)
         // an artificial URL used for resolving page references in navigation model
         url = '/' + urlSegments.join('/') + '/'
         pub.moduleRootPath = '.'
@@ -201,4 +197,4 @@ function no_data(key, value) {
         return value ? "__data__" : value;
     }
     return value;
-}
+}

spring-session-docs/antora/extensions/root-component-name.js

@@ -0,0 +1,40 @@
+// https://gitlab.com/antora/antora/-/issues/132#note_712132072
+'use strict'
+
+const { posix: path } = require('path')
+
+module.exports.register = (pipeline, { config }) => {
+    pipeline.on('contentClassified', ({ contentCatalog }) => {
+        const rootComponentName = config.rootComponentName || 'ROOT'
+        const rootComponentNameLength = rootComponentName.length
+        contentCatalog.findBy({ component: rootComponentName }).forEach((file) => {
+            if (file.out) {
+                file.out.dirname = file.out.dirname.substr(rootComponentNameLength)
+                file.out.path = file.out.path.substr(rootComponentNameLength + 1)
+                file.out.rootPath = fixPath(file.out.rootPath)
+            }
+            if (file.pub) {
+                file.pub.url = file.pub.url.substr(rootComponentNameLength + 1)
+                if (file.pub.rootPath) {
+                    file.pub.rootPath = fixPath(file.pub.rootPath)
+                }
+            }
+            if (file.rel) {
+                if (file.rel.pub) {
+                    file.rel.pub.url = file.rel.pub.url.substr(rootComponentNameLength + 1)
+                    file.rel.pub.rootPath = fixPath(file.rel.pub.rootPath);
+                }
+            }
+        })
+        const rootComponent = contentCatalog.getComponent(rootComponentName)
+        rootComponent?.versions?.forEach((version) => {
+            version.url = version.url.substr(rootComponentName.length + 1)
+        })
+        // const siteStartPage = contentCatalog.getById({ component: '', version: '', module: '', family: 'alias', relative: 'index.adoc' })
+        // if (siteStartPage) delete siteStartPage.out
+    })
+
+    function fixPath(path) {
+        return path.split('/').slice(1).join('/') || '.'
+    }
+}

spring-session-docs/antora/extensions/version-fix.js

@@ -1,15 +0,0 @@
-'use strict'
-
-module.exports.register = function({ config }) {
-
-    this.on('contentAggregated', ({ contentAggregate }) => {
-        contentAggregate.forEach(aggregate => {
-            if (aggregate.version === "2.6.2" &&
-                aggregate.prerelease == "-SNAPSHOT") {
-                aggregate.version = "2.6.2"
-                aggregate.displayVersion = `${aggregate.version}`
-                delete aggregate.prerelease
-            }
-        })
-    })
-}

spring-session-docs/local-antora-playbook.yml

@@ -20,7 +20,7 @@ ui:
     url: https://github.com/spring-io/antora-ui-spring/releases/download/latest/ui-bundle.zip
     snapshot: true
 
-antora:
+pipeline:
   extensions:
-    - require: ./antora/extensions/version-fix.js
     - require: ./antora/extensions/major-minor-segment.js
+    - require: ./antora/extensions/root-component-name.js

spring-session-docs/modules/ROOT/examples/java/docs/HttpSessionConfigurationNoOpConfigureRedisActionXmlTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -20,9 +20,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.SubscriptionListener;
 import org.springframework.session.Session;
 import org.springframework.session.web.http.SessionRepositoryFilter;
 import org.springframework.test.context.ContextConfiguration;
@@ -30,9 +28,6 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.willAnswer;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -52,20 +47,7 @@ public class HttpSessionConfigurationNoOpConfigureRedisActionXmlTests {
 	}
 
 	static RedisConnectionFactory connectionFactory() {
-		RedisConnectionFactory connectionFactoryMock = mock(RedisConnectionFactory.class);
-		RedisConnection connectionMock = mock(RedisConnection.class);
-		given(connectionFactoryMock.getConnection()).willReturn(connectionMock);
-
-		willAnswer((it) -> {
-			SubscriptionListener listener = it.getArgument(0);
-			listener.onPatternSubscribed(it.getArgument(1), 0);
-			listener.onChannelSubscribed("__keyevent@0__:del".getBytes(), 0);
-			listener.onChannelSubscribed("__keyevent@0__:expired".getBytes(), 0);
-
-			return null;
-		}).given(connectionMock).pSubscribe(any(), any());
-
-		return connectionFactoryMock;
+		return mock(RedisConnectionFactory.class);
 	}
 
 }

spring-session-docs/modules/ROOT/examples/java/docs/RedisHttpSessionConfigurationNoOpConfigureRedisActionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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,18 +21,13 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.SubscriptionListener;
 import org.springframework.session.data.redis.config.ConfigureRedisAction;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.willAnswer;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -60,20 +55,7 @@ class RedisHttpSessionConfigurationNoOpConfigureRedisActionTests {
 
 		@Bean
 		RedisConnectionFactory redisConnectionFactory() {
-			RedisConnectionFactory connectionFactoryMock = mock(RedisConnectionFactory.class);
-			RedisConnection connectionMock = mock(RedisConnection.class);
-			given(connectionFactoryMock.getConnection()).willReturn(connectionMock);
-
-			willAnswer((it) -> {
-				SubscriptionListener listener = it.getArgument(0);
-				listener.onPatternSubscribed(it.getArgument(1), 0);
-				listener.onChannelSubscribed("__keyevent@0__:del".getBytes(), 0);
-				listener.onChannelSubscribed("__keyevent@0__:expired".getBytes(), 0);
-
-				return null;
-			}).given(connectionMock).pSubscribe(any(), any());
-
-			return connectionFactoryMock;
+			return mock(RedisConnectionFactory.class);
 		}
 
 	}

spring-session-docs/modules/ROOT/examples/java/docs/http/AbstractHttpSessionListenerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -26,7 +26,6 @@ import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationListener;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.SubscriptionListener;
 import org.springframework.security.core.session.SessionDestroyedEvent;
 import org.springframework.session.MapSession;
 import org.springframework.session.Session;
@@ -34,10 +33,8 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.willAnswer;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -70,15 +67,6 @@ public abstract class AbstractHttpSessionListenerTests {
 
 		given(factory.getConnection()).willReturn(connection);
 		given(connection.getConfig(anyString())).willReturn(new Properties());
-
-		willAnswer((it) -> {
-			SubscriptionListener listener = it.getArgument(0);
-			listener.onPatternSubscribed(it.getArgument(1), 0);
-			listener.onChannelSubscribed("__keyevent@0__:del".getBytes(), 0);
-			listener.onChannelSubscribed("__keyevent@0__:expired".getBytes(), 0);
-
-			return null;
-		}).given(connection).pSubscribe(any(), any());
 		return factory;
 	}
 

spring-session-docs/modules/ROOT/pages/index.adoc

@@ -55,10 +55,7 @@ Spring Session is Open Source software released under the https://www.apache.org
 | Name | Location
 
 | Spring Session Infinispan
-| https://infinispan.org/docs/stable/titles/spring/spring.html
-
-| Spring Session Caffeine
-| https://github.com/gotson/spring-session-caffeine
+| https://infinispan.org/infinispan-spring-boot/master/spring_boot_starter.html#_enabling_spring_session_support
 
 |===
 

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

@@ -28,7 +28,7 @@ dependencies {
 }
 
 antora {
-    antoraVersion = "3.0.1"
+    antoraVersion = "3.0.0-alpha.8"
     arguments = ["--fetch"]
 }
 

spring-session-hazelcast/hazelcast4/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcast4IndexedSessionRepositoryITests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2021 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.

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java

@@ -42,11 +42,11 @@ final class DatabaseContainers {
 	}
 
 	static MariaDBContainer<?> mariaDb() {
-		return new MariaDBContainer<>("mariadb:10.7.3");
+		return new MariaDBContainer<>("mariadb:10.6.4");
 	}
 
 	static MySQLContainer<?> mySql() {
-		return new MySQLContainer<>("mysql:8.0.28");
+		return new MySQLContainer<>("mysql:8.0.27");
 	}
 
 	static OracleContainer oracle() {
@@ -68,7 +68,7 @@ final class DatabaseContainers {
 	}
 
 	static PostgreSQLContainer<?> postgreSql() {
-		return new PostgreSQLContainer<>("postgres:14.2");
+		return new PostgreSQLContainer<>("postgres:14.0");
 	}
 
 	static MSSQLServerContainer<?> sqlServer() {

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

@@ -728,8 +728,7 @@ public class JdbcIndexedSessionRepository
 			T attributeValue = supplier.get();
 			if (attributeValue != null
 					&& JdbcIndexedSessionRepository.this.saveMode.equals(SaveMode.ON_GET_ATTRIBUTE)) {
-				this.delta.merge(attributeName, DeltaValue.UPDATED, (oldDeltaValue,
-						deltaValue) -> (oldDeltaValue == DeltaValue.ADDED) ? oldDeltaValue : deltaValue);
+				this.delta.put(attributeName, DeltaValue.UPDATED);
 			}
 			return attributeValue;
 		}

spring-session-jdbc/src/test/java/org/springframework/session/jdbc/JdbcIndexedSessionRepositoryTests.java

@@ -655,20 +655,6 @@ class JdbcIndexedSessionRepositoryTests {
 		verifyNoMoreInteractions(this.jdbcOperations);
 	}
 
-	@Test
-	void saveWithSaveModeOnGetAttributeAndNewAttributeSetAndGet() {
-		this.repository.setSaveMode(SaveMode.ON_GET_ATTRIBUTE);
-		MapSession delegate = new MapSession();
-		delegate.setAttribute("attribute1", (Supplier<String>) () -> "value1");
-		JdbcSession session = this.repository.new JdbcSession(delegate, UUID.randomUUID().toString(), false);
-		session.setAttribute("attribute2", "value2");
-		session.getAttribute("attribute2");
-		this.repository.save(session);
-		verify(this.jdbcOperations, times(1)).update(startsWith("INSERT INTO SPRING_SESSION_ATTRIBUTES ("),
-				isA(PreparedStatementSetter.class));
-		verifyNoMoreInteractions(this.jdbcOperations);
-	}
-
 	@Test
 	void saveWithSaveModeAlways() {
 		this.repository.setSaveMode(SaveMode.ALWAYS);

spring-session-samples/gradle/dependency-management.gradle

@@ -1,15 +1,15 @@
 dependencyManagement {
 	imports {
-		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.2.20220328'
+		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.1'
 	}
 
 	dependencies {
-		dependency 'ch.qos.logback:logback-classic:1.2.11'
-		dependency 'com.maxmind.geoip2:geoip2:2.16.1'
+		dependency 'ch.qos.logback:logback-classic:1.2.10'
+		dependency 'com.maxmind.geoip2:geoip2:2.15.0'
 		dependency 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.2'
 		dependency 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.3'
 		dependency 'org.apache.taglibs:taglibs-standard-jstlel:1.2.5'
-		dependency 'org.seleniumhq.selenium:htmlunit-driver:3.60.0'
+		dependency 'org.seleniumhq.selenium:htmlunit-driver:2.52.0'
 		dependency 'org.slf4j:jcl-over-slf4j:1.7.36'
 		dependency 'org.slf4j:log4j-over-slf4j:1.7.36'
 		dependency 'org.webjars:bootstrap:2.3.2'

spring-session-samples/spring-session-sample-boot-findbyusername/src/integration-test/java/sample/FindByUsernameTests.java

@@ -46,7 +46,7 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr
 @SpringBootTest(webEnvironment = WebEnvironment.MOCK)
 class FindByUsernameTests {
 
-	private static final String DOCKER_IMAGE = "redis:5.0.14";
+	private static final String DOCKER_IMAGE = "redis:5.0.10";
 
 	@Autowired
 	private MockMvc mockMvc;

spring-session-samples/spring-session-sample-boot-mongodb-reactive/spring-session-sample-boot-mongodb-reactive.gradle

@@ -5,7 +5,7 @@ dependencies {
 	implementation  "org.springframework.boot:spring-boot-starter-webflux"
 	implementation  "org.springframework.boot:spring-boot-starter-thymeleaf"
 	implementation  "org.springframework.boot:spring-boot-starter-data-mongodb-reactive"
-    implementation  "org.testcontainers:mongodb"
+	implementation  "de.flapdoodle.embed:de.flapdoodle.embed.mongo"
 
 	testImplementation "org.springframework.boot:spring-boot-starter-test"
 	testImplementation "org.seleniumhq.selenium:htmlunit-driver"

spring-session-samples/spring-session-sample-boot-mongodb-reactive/src/main/java/org/springframework/session/mongodb/examples/SpringSessionMongoReactiveApplication.java

@@ -18,16 +18,7 @@ package org.springframework.session.mongodb.examples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MapPropertySource;
 import org.springframework.session.data.mongo.config.annotation.web.reactive.EnableMongoWebSession;
-import org.testcontainers.containers.MongoDBContainer;
-import org.testcontainers.utility.DockerImageName;
-
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * Pure Spring-based application (using Spring Boot for dependency management), hence no
@@ -40,35 +31,8 @@ import java.util.Map;
 @EnableMongoWebSession
 public class SpringSessionMongoReactiveApplication {
 
-	/**
-	 * Use Testcontainers to managed MongoDB through Docker.
-	 * <p>
-	 * @see https://bsideup.github.io/posts/local_development_with_testcontainers/
-	 */
-	static class Initializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
-
-		static MongoDBContainer mongo = new MongoDBContainer(DockerImageName.parse("mongo:5.0"));
-
-		public static Map<String, String> getProperties() {
-			mongo.start();
-
-			HashMap<String, String> properties = new HashMap<>();
-			properties.put("spring.data.mongodb.host", mongo.getHost());
-			properties.put("spring.data.mongodb.port", mongo.getFirstMappedPort() + "");
-			return properties;
-		}
-
-		@Override
-		public void initialize(ConfigurableApplicationContext context) {
-			ConfigurableEnvironment env = context.getEnvironment();
-			env.getPropertySources().addFirst(new MapPropertySource("testcontainers", (Map) getProperties()));
-		}
-	}
-
-
 	public static void main(String[] args) {
-		SpringApplication application = new SpringApplication(SpringSessionMongoReactiveApplication.class);
-		application.addInitializers(new Initializer());
-		application.run(args);
+		SpringApplication.run(SpringSessionMongoReactiveApplication.class);
 	}
+
 }

spring-session-samples/spring-session-sample-boot-mongodb-reactive/src/main/resources/application.properties

@@ -1,2 +0,0 @@
-logging.level.org.springframework.data.mongodb=DEBUG
-logging.level.org.springframework.session=DEBUG

spring-session-samples/spring-session-sample-boot-mongodb-reactive/src/main/resources/application.yml

@@ -0,0 +1,4 @@
+logging:
+  level:
+    org.springframework.data.mongodb: DEBUG
+    org.springframework.session: DEBUG

spring-session-samples/spring-session-sample-boot-mongodb-reactive/src/test/java/org/springframework/session/mongodb/examples/AttributeTests.java

@@ -16,21 +16,21 @@
 
 package org.springframework.session.mongodb.examples;
 
+import java.util.List;
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
+
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.session.mongodb.examples.pages.HomePage;
 import org.springframework.session.mongodb.examples.pages.HomePage.Attribute;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import java.util.List;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -39,7 +39,6 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ContextConfiguration(initializers = SpringSessionMongoReactiveApplication.Initializer.class)
 public class AttributeTests {
 
 	@LocalServerPort

spring-session-samples/spring-session-sample-boot-mongodb-traditional/spring-session-sample-boot-mongodb-traditional.gradle

@@ -8,8 +8,7 @@ dependencies {
     implementation  "org.thymeleaf.extras:thymeleaf-extras-springsecurity5"
     implementation "org.springframework.boot:spring-boot-starter-data-mongodb"
     implementation "org.springframework.boot:spring-boot-starter-security"
-    implementation "org.testcontainers:mongodb"
-
+    implementation "de.flapdoodle.embed:de.flapdoodle.embed.mongo"
 
     testImplementation "org.springframework.boot:spring-boot-starter-test"
     testImplementation "org.seleniumhq.selenium:htmlunit-driver"

spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/java/org/springframework/session/mongodb/examples/EmbeddedMongoPortLogger.java

@@ -0,0 +1,46 @@
+/*
+ * 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
+ *
+ *      https://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 org.springframework.session.mongodb.examples;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+@Component
+class EmbeddedMongoPortLogger implements ApplicationRunner, EnvironmentAware {
+
+	private static final Log logger = LogFactory.getLog(EmbeddedMongoPortLogger.class);
+
+	private Environment environment;
+
+	@Override
+	public void run(ApplicationArguments args) throws Exception {
+		String port = this.environment.getProperty("local.mongo.port");
+		logger.info("Embedded Mongo started on port " + port + ", use 'mongo --port " + port + "' command to connect");
+	}
+
+	@Override
+	public void setEnvironment(Environment environment) {
+		this.environment = environment;
+	}
+
+}

spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/java/org/springframework/session/mongodb/examples/SpringSessionMongoTraditionalBoot.java

@@ -18,15 +18,6 @@ package org.springframework.session.mongodb.examples;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MapPropertySource;
-import org.testcontainers.containers.MongoDBContainer;
-import org.testcontainers.utility.DockerImageName;
-
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @author Rob Winch
@@ -34,34 +25,8 @@ import java.util.Map;
 @SpringBootApplication
 public class SpringSessionMongoTraditionalBoot {
 
-	/**
-	 * Use Testcontainers to managed MongoDB through Docker.
-	 * <p>
-	 * @see https://bsideup.github.io/posts/local_development_with_testcontainers/
-	 */
-	static class Initializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
-
-		static MongoDBContainer mongo = new MongoDBContainer(DockerImageName.parse("mongo:5.0"));
-
-		public static Map<String, String> getProperties() {
-			mongo.start();
-
-			HashMap<String, String> properties = new HashMap<>();
-			properties.put("spring.data.mongodb.host", mongo.getHost());
-			properties.put("spring.data.mongodb.port", mongo.getFirstMappedPort() + "");
-			return properties;
-		}
-
-		@Override
-		public void initialize(ConfigurableApplicationContext context) {
-			ConfigurableEnvironment env = context.getEnvironment();
-			env.getPropertySources().addFirst(new MapPropertySource("testcontainers", (Map) getProperties()));
-		}
-	}
-
 	public static void main(String[] args) {
-		SpringApplication application = new SpringApplication(SpringSessionMongoTraditionalBoot.class);
-		application.addInitializers(new Initializer());
-		application.run(args);
+		SpringApplication.run(SpringSessionMongoTraditionalBoot.class, args);
 	}
+
 }

spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/application.properties

@@ -1,5 +1,3 @@
 spring.thymeleaf.cache=false
 spring.template.cache=false
-
-logging.level.org.springframework.data.mongodb=DEBUG
-logging.level.org.springframework.session=DEBUG
+spring.data.mongodb.port=0

spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/templates/index.html

@@ -1,4 +1,4 @@
-<html xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect" layout:decorate="layout">
+<html xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect" layout:decorator="layout">
 <head>
 	<title>Secured Content</title>
 </head>

spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/templates/layout.html

@@ -3,7 +3,7 @@
 			xmlns:th="https://www.thymeleaf.org"
 			xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect">
 	<head>
-		<title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
+		<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
 		<link rel="icon" type="image/x-icon" th:href="@{/resources/img/favicon.ico}" href="../static/img/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">

spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/test/java/org/springframework/session/mongodb/examples/BootTests.java

@@ -33,7 +33,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.session.mongodb.examples.pages.HomePage;
 import org.springframework.session.mongodb.examples.pages.LoginPage;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDriverBuilder;
@@ -46,7 +45,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 @ExtendWith(SpringExtension.class)
 @AutoConfigureMockMvc
 @SpringBootTest(webEnvironment = WebEnvironment.MOCK)
-@ContextConfiguration(initializers = SpringSessionMongoTraditionalBoot.Initializer.class)
 public class BootTests {
 
 	@Autowired

spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java

@@ -50,7 +50,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @AutoConfigureMockMvc
 class HttpRedisJsonTest {
 
-	private static final String DOCKER_IMAGE = "redis:5.0.14";
+	private static final String DOCKER_IMAGE = "redis:5.0.10";
 
 	@Autowired
 	private MockMvc mockMvc;

spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/RedisSerializerTest.java

@@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @SpringBootTest
 class RedisSerializerTest {
 
-	private static final String DOCKER_IMAGE = "redis:5.0.14";
+	private static final String DOCKER_IMAGE = "redis:5.0.10";
 
 	@SpringSessionRedisOperations
 	private RedisTemplate<Object, Object> sessionRedisTemplate;

spring-session-samples/spring-session-sample-boot-redis-simple/src/integration-test/java/sample/BootTests.java

@@ -41,7 +41,7 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr
 @SpringBootTest(webEnvironment = WebEnvironment.MOCK)
 class BootTests {
 
-	private static final String DOCKER_IMAGE = "redis:5.0.14";
+	private static final String DOCKER_IMAGE = "redis:5.0.10";
 
 	@Autowired
 	private MockMvc mockMvc;

spring-session-samples/spring-session-sample-boot-redis/src/integration-test/java/sample/BootTests.java

@@ -45,7 +45,7 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr
 @SpringBootTest(webEnvironment = WebEnvironment.MOCK)
 class BootTests {
 
-	private static final String DOCKER_IMAGE = "redis:5.0.14";
+	private static final String DOCKER_IMAGE = "redis:5.0.10";
 
 	@Autowired
 	private MockMvc mockMvc;

spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/integration-test/java/sample/AttributeTests.java

@@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 class AttributeTests {
 
-	private static final String DOCKER_IMAGE = "redis:5.0.14";
+	private static final String DOCKER_IMAGE = "redis:5.0.9";
 
 	@LocalServerPort
 	private int port;

spring-session-samples/spring-session-sample-boot-webflux/src/integration-test/java/sample/AttributeTests.java

@@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 class AttributeTests {
 
-	private static final String DOCKER_IMAGE = "redis:5.0.14";
+	private static final String DOCKER_IMAGE = "redis:5.0.10";
 
 	@LocalServerPort
 	private int port;

spring-session-samples/spring-session-sample-boot-websocket/src/integration-test/java/sample/ApplicationTests.java

@@ -52,7 +52,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 class ApplicationTests {
 
-	private static final String DOCKER_IMAGE = "redis:5.0.14";
+	private static final String DOCKER_IMAGE = "redis:5.0.10";
 
 	@Value("${local.server.port}")
 	private String port;

spring-session-samples/spring-session-sample-boot-websocket/src/main/java/sample/data/User.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -38,7 +38,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
  *
  * @author Rob Winch
  */
-@Entity(name = "custom_user")
+@Entity
 public class User implements Serializable {
 
 	@Id

spring-session-samples/spring-session-sample-boot-websocket/src/main/resources/data.sql

@@ -1,5 +1,5 @@
-insert into custom_user(id,email,password,first_name,last_name) values (0,'rob','password','Rob','Winch');
-insert into custom_user(id,email,password,first_name,last_name) values (1,'luke','password','Luke','Taylor');
-insert into custom_user(id,email,password,first_name,last_name) values (2,'eve','password','Luke','Taylor');
+insert into user(id,email,password,first_name,last_name) values (0,'rob','password','Rob','Winch');
+insert into user(id,email,password,first_name,last_name) values (1,'luke','password','Luke','Taylor');
+insert into user(id,email,password,first_name,last_name) values (2,'eve','password','Luke','Taylor');
 
-update custom_user set password = '$2a$10$FBAKClV1zBIOOC9XMXf3AO8RoGXYVYsfvUdoLxGkd/BnXEn4tqT3u';
+update user set password = '$2a$10$FBAKClV1zBIOOC9XMXf3AO8RoGXYVYsfvUdoLxGkd/BnXEn4tqT3u';

spring-session-samples/spring-session-sample-javaconfig-custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java

@@ -28,7 +28,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
 @Profile("embedded-redis")
 public class EmbeddedRedisConfig {
 
-	private static final String DOCKER_IMAGE = "redis:5.0.14";
+	private static final String DOCKER_IMAGE = "redis:5.0.10";
 
 	@Bean
 	public GenericContainer redisContainer() {

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

@@ -28,7 +28,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
 @Profile("embedded-redis")
 public class EmbeddedRedisConfig {
 
-	private static final String DOCKER_IMAGE = "redis:5.0.14";
+	private static final String DOCKER_IMAGE = "redis:5.0.10";
 
 	@Bean
 	public GenericContainer redisContainer() {

spring-session-samples/spring-session-sample-javaconfig-rest/src/integration-test/java/rest/RestMockMvcTests.java

@@ -53,7 +53,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @WebAppConfiguration
 class RestMockMvcTests {
 
-	private static final String DOCKER_IMAGE = "redis:5.0.14";
+	private static final String DOCKER_IMAGE = "redis:5.0.10";
 
 	@Autowired
 	private SessionRepositoryFilter<? extends Session> sessionRepositoryFilter;

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

@@ -28,7 +28,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
 @Profile("embedded-redis")
 public class EmbeddedRedisConfig {
 
-	private static final String DOCKER_IMAGE = "redis:5.0.14";
+	private static final String DOCKER_IMAGE = "redis:5.0.10";
 
 	@Bean
 	public GenericContainer redisContainer() {

spring-session-samples/spring-session-sample-javaconfig-security/src/main/java/sample/EmbeddedRedisConfig.java

@@ -28,7 +28,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
 @Profile("embedded-redis")
 public class EmbeddedRedisConfig {
 
-	private static final String DOCKER_IMAGE = "redis:5.0.14";
+	private static final String DOCKER_IMAGE = "redis:5.0.10";
 
 	@Bean
 	public GenericContainer redisContainer() {

spring-session-samples/spring-session-sample-xml-redis/src/main/java/sample/EmbeddedRedisConfig.java

@@ -28,7 +28,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
 @Profile("embedded-redis")
 public class EmbeddedRedisConfig {
 
-	private static final String DOCKER_IMAGE = "redis:5.0.14";
+	private static final String DOCKER_IMAGE = "redis:5.0.10";
 
 	@Bean
 	public GenericContainer redisContainer() {