Switch to unicode.

See #2053.

.sdkmanrc

@@ -1,6 +0,0 @@
-# Use sdkman to run "sdk env" to initialize with correct JDK version
-# Enable auto-env through the sdkman_auto_env config
-# See https://sdkman.io/usage#config
-# A summary is to add the following to ~/.sdkman/etc/config
-# sdkman_auto_env=true
-java=8.0.332-zulu

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
+version=2.7.0-SNAPSHOT

gradle/dependency-management.gradle

@@ -1,12 +1,12 @@
 dependencyManagement {
 	imports {
-		mavenBom 'io.projectreactor:reactor-bom:2020.0.19'
-		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.2.20220328'
+		mavenBom 'io.projectreactor:reactor-bom:2020.0.15'
+		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.20'
-		mavenBom 'org.springframework.data:spring-data-bom:2021.2.0'
-		mavenBom 'org.springframework.security:spring-security-bom:5.7.0'
-		mavenBom 'org.testcontainers:testcontainers-bom:1.17.1'
+		mavenBom 'org.springframework:spring-framework-bom:5.3.15'
+		mavenBom 'org.springframework.data:spring-data-bom:2021.2.0-M2'
+		mavenBom 'org.springframework.security:spring-security-bom:5.7.0-M1'
+		mavenBom 'org.testcontainers:testcontainers-bom:1.16.2'
 	}
 
 	dependencies {
@@ -15,25 +15,25 @@ 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.7'
+		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.ibm.db2:jcc:11.5.6.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.4.0.0.1'
 		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 'mysql:mysql-connector-java:8.0.27'
 		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.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.2.0') {
         	entry 'mockito-core'
 			entry 'mockito-junit-jupiter'
 		}
@@ -43,7 +43,7 @@ dependencyManagement {
 			entry 'mongodb-driver-sync'
 			entry 'mongodb-driver-reactivestreams'
 		}
-		dependency 'org.postgresql:postgresql:42.3.4'
+		dependency 'org.postgresql:postgresql:42.3.1'
 	}
 }
 

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.
@@ -16,19 +16,14 @@
 
 package org.springframework.session.data.mongo;
 
-import java.time.Duration;
-import java.time.Instant;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
 import org.springframework.lang.Nullable;
 import org.springframework.session.Session;
 
+import java.time.Duration;
+import java.time.Instant;
+import java.util.*;
+import java.util.stream.Collectors;
+
 /**
  * Session object providing additional information about the datetime of expiration.
  *
@@ -39,17 +34,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';
+	static final char DOT_COVER_CHAR = '';
 
 	private String id;
 
@@ -113,8 +101,7 @@ public class MongoSession implements Session {
 
 		if (attributeValue == null) {
 			removeAttribute(coverDot(attributeName));
-		}
-		else {
+		} else {
 			this.attrs.put(coverDot(attributeName), attributeValue);
 		}
 	}

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

@@ -39,4 +39,14 @@ public class MongoSessionTest {
 		assertThat(session.isExpired()).isFalse();
 	}
 
+	@Test
+	void delombokedDotCoverCharMatchesOriginalUnicodeDotCoverChar() {
+
+		char originalDotCoverChar = '\uF607';
+		char delombokedDotCoverChar = '';
+
+		assertThat(MongoSession.DOT_COVER_CHAR).isEqualTo(delombokedDotCoverChar);
+		assertThat(MongoSession.DOT_COVER_CHAR).isEqualTo(originalDotCoverChar);
+	}
+
 }

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/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.yml

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

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-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-samples/gradle/dependency-management.gradle

@@ -1,17 +1,17 @@
 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.slf4j:jcl-over-slf4j:1.7.36'
-		dependency 'org.slf4j:log4j-over-slf4j:1.7.36'
+		dependency 'org.seleniumhq.selenium:htmlunit-driver:3.56.0'
+		dependency 'org.slf4j:jcl-over-slf4j:1.7.33'
+		dependency 'org.slf4j:log4j-over-slf4j:1.7.33'
 		dependency 'org.webjars:bootstrap:2.3.2'
 		dependency 'org.webjars:html5shiv:3.7.3-1'
 		dependency 'org.webjars:jquery:3.6.0'

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-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-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() {