Replace Flapdoodle with Testcontainers for MongoDB support.

For more details on this usage of Testcontainers, see https://bsideup.github.io/posts/local_development_with_testcontainers/

Related issues: https://github.com/spring-projects/spring-boot/issues/30863

gradle/dependency-management.gradle

@@ -1,12 +1,12 @@
 dependencyManagement {
 	imports {
-		mavenBom 'io.projectreactor:reactor-bom:2020.0.15'
-		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.1'
+		mavenBom 'io.projectreactor:reactor-bom:2020.0.18'
+		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.2.20220328'
 		mavenBom 'org.junit:junit-bom:5.8.2'
-		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'
+		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'
 	}
 
 	dependencies {
@@ -15,25 +15,25 @@ dependencyManagement {
 			entry 'hazelcast-client'
 		}
 
-		dependency 'org.aspectj:aspectjweaver:1.9.7'
-		dependency 'ch.qos.logback:logback-core:1.2.10'
+		dependency 'org.aspectj:aspectjweaver:1.9.9.1'
+		dependency 'ch.qos.logback:logback-core:1.2.11'
 		dependency 'com.google.code.findbugs:jsr305:3.0.2'
 		dependency 'com.h2database:h2:1.4.200'
-		dependency 'com.ibm.db2:jcc:11.5.6.0'
+		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.4.0.0.1'
+		dependency 'com.oracle.database.jdbc:ojdbc8:21.5.0.0'
 		dependency 'com.zaxxer:HikariCP:3.4.5'
 		dependency 'edu.umd.cs.mtc:multithreadedtc:1.01'
-		dependency 'io.lettuce:lettuce-core:6.1.6.RELEASE'
+		dependency 'io.lettuce:lettuce-core:6.1.8.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.27'
+		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.1'
+		dependency 'org.hamcrest:hamcrest:2.2'
 		dependency 'org.hsqldb:hsqldb:2.5.2'
-		dependency 'org.mariadb.jdbc:mariadb-java-client:2.7.4'
-		dependencySet(group: 'org.mockito', version: '4.2.0') {
+		dependency 'org.mariadb.jdbc:mariadb-java-client:2.7.5'
+		dependencySet(group: 'org.mockito', version: '4.4.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.1'
+		dependency 'org.postgresql:postgresql:42.3.4'
 	}
 }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2022 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,10 +39,17 @@ import org.springframework.session.Session;
 public class MongoSession implements Session {
 
 	/**
-	 * Mongo doesn't support {@literal dot} in field names. We replace it with a very
-	 * rarely used character
+	 * 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
 	 */
-	private static final char DOT_COVER_CHAR = '';
+	private static final char DOT_COVER_CHAR = '\uF607';
 
 	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.10";
+	private static final String DOCKER_IMAGE = "redis:5.0.14";
 
 	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-2019 the original author or authors.
+ * Copyright 2014-2022 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,11 +23,14 @@ 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;
 
 /**
@@ -50,6 +53,15 @@ 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-2019 the original author or authors.
+ * Copyright 2014-2022 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,12 +21,17 @@ 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;
 
 /**
@@ -52,7 +57,20 @@ class RedisHttpSessionConfigurationNoOpConfigureRedisActionTests {
 
 		@Bean
 		RedisConnectionFactory redisConnectionFactory() {
-			return mock(RedisConnectionFactory.class);
+			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;
 		}
 
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 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,6 +26,7 @@ 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;
@@ -34,8 +35,10 @@ 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;
 
 /**
@@ -76,6 +79,15 @@ 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-2019 the original author or authors.
+ * Copyright 2014-2022 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,6 +36,7 @@ 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;
@@ -57,7 +58,7 @@ class RedisHttpSessionConfigurationOverrideSessionTaskExecutor {
 
 	@Test
 	void overrideSessionTaskExecutor() {
-		verify(this.springSessionRedisTaskExecutor, times(1)).execute(any(SchedulingAwareRunnable.class));
+		verify(this.springSessionRedisTaskExecutor, times(1)).execute(any(Runnable.class));
 	}
 
 	@EnableRedisHttpSession
@@ -66,7 +67,13 @@ class RedisHttpSessionConfigurationOverrideSessionTaskExecutor {
 
 		@Bean
 		Executor springSessionRedisTaskExecutor() {
-			return mock(Executor.class);
+			Executor executor = mock(Executor.class);
+			willAnswer((it) -> {
+				Runnable r = it.getArgument(0);
+				new Thread(r).start();
+				return null;
+			}).given(executor).execute(any());
+			return executor;
 		}
 
 		@Bean
@@ -76,6 +83,15 @@ 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-2019 the original author or authors.
+ * Copyright 2014-2022 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,6 +36,7 @@ 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;
@@ -62,7 +63,7 @@ class RedisHttpSessionConfigurationOverrideSessionTaskExecutors {
 
 	@Test
 	void overrideSessionTaskExecutors() {
-		verify(this.springSessionRedisSubscriptionExecutor, times(1)).execute(any(SchedulingAwareRunnable.class));
+		verify(this.springSessionRedisSubscriptionExecutor, times(1)).execute(any(Runnable.class));
 		verify(this.springSessionRedisTaskExecutor, never()).execute(any(Runnable.class));
 	}
 
@@ -72,12 +73,24 @@ class RedisHttpSessionConfigurationOverrideSessionTaskExecutors {
 
 		@Bean
 		Executor springSessionRedisTaskExecutor() {
-			return mock(Executor.class);
+			Executor executor = mock(Executor.class);
+			willAnswer((it) -> {
+				Runnable r = it.getArgument(0);
+				new Thread(r).start();
+				return null;
+			}).given(executor).execute(any());
+			return executor;
 		}
 
 		@Bean
 		Executor springSessionRedisSubscriptionExecutor() {
-			return mock(Executor.class);
+			Executor executor = mock(Executor.class);
+			willAnswer((it) -> {
+				Runnable r = it.getArgument(0);
+				new Thread(r).start();
+				return null;
+			}).given(executor).execute(any());
+			return executor;
 		}
 
 		@Bean
@@ -87,6 +100,15 @@ 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-2019 the original author or authors.
+ * Copyright 2014-2022 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,6 +32,7 @@ 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;
@@ -47,8 +48,9 @@ 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.anyString;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.willAnswer;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -264,11 +266,24 @@ class RedisHttpSessionConfigurationTests {
 	}
 
 	private static RedisConnectionFactory mockRedisConnectionFactory() {
-		RedisConnectionFactory connectionFactory = mock(RedisConnectionFactory.class);
-		RedisConnection connection = mock(RedisConnection.class);
-		given(connectionFactory.getConnection()).willReturn(connection);
-		given(connection.getConfig(anyString())).willReturn(new Properties());
-		return connectionFactory;
+		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;
 	}
 
 	@Configuration
@@ -445,7 +460,7 @@ class RedisHttpSessionConfigurationTests {
 
 		@Bean
 		RedisMessageListenerContainer redisMessageListenerContainer() {
-			return new RedisMessageListenerContainer();
+			return mock(RedisMessageListenerContainer.class);
 		}
 
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 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,12 +23,15 @@ 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)
@@ -46,6 +49,15 @@ 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-2019 the original author or authors.
+ * Copyright 2014-2022 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,12 +23,15 @@ 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)
@@ -46,6 +49,15 @@ 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-2019 the original author or authors.
+ * Copyright 2014-2022 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,6 +26,7 @@ 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;
@@ -33,8 +34,10 @@ 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;
 
 /**
@@ -75,6 +78,14 @@ 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/modules/ROOT/examples/java/docs/HttpSessionConfigurationNoOpConfigureRedisActionXmlTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 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,7 +20,9 @@ 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;
@@ -28,6 +30,9 @@ 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;
 
 /**
@@ -47,7 +52,20 @@ public class HttpSessionConfigurationNoOpConfigureRedisActionXmlTests {
 	}
 
 	static RedisConnectionFactory connectionFactory() {
-		return mock(RedisConnectionFactory.class);
+		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;
 	}
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 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,13 +21,18 @@ 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;
 
 /**
@@ -55,7 +60,20 @@ class RedisHttpSessionConfigurationNoOpConfigureRedisActionTests {
 
 		@Bean
 		RedisConnectionFactory redisConnectionFactory() {
-			return mock(RedisConnectionFactory.class);
+			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;
 		}
 
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 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,6 +26,7 @@ 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;
@@ -33,8 +34,10 @@ 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;
 
 /**
@@ -67,6 +70,15 @@ 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,7 +55,10 @@ Spring Session is Open Source software released under the https://www.apache.org
 | Name | Location
 
 | Spring Session Infinispan
-| https://infinispan.org/infinispan-spring-boot/master/spring_boot_starter.html#_enabling_spring_session_support
+| https://infinispan.org/docs/stable/titles/spring/spring.html
+
+| Spring Session Caffeine
+| https://github.com/gotson/spring-session-caffeine
 
 |===
 

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.6.4");
+		return new MariaDBContainer<>("mariadb:10.7.3");
 	}
 
 	static MySQLContainer<?> mySql() {
-		return new MySQLContainer<>("mysql:8.0.27");
+		return new MySQLContainer<>("mysql:8.0.28");
 	}
 
 	static OracleContainer oracle() {
@@ -68,7 +68,7 @@ final class DatabaseContainers {
 	}
 
 	static PostgreSQLContainer<?> postgreSql() {
-		return new PostgreSQLContainer<>("postgres:14.0");
+		return new PostgreSQLContainer<>("postgres:14.2");
 	}
 
 	static MSSQLServerContainer<?> sqlServer() {

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

@@ -1,17 +1,17 @@
 dependencyManagement {
 	imports {
-		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.1'
+		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.2.20220328'
 	}
 
 	dependencies {
-		dependency 'ch.qos.logback:logback-classic:1.2.10'
-		dependency 'com.maxmind.geoip2:geoip2:2.15.0'
+		dependency 'ch.qos.logback:logback-classic:1.2.11'
+		dependency 'com.maxmind.geoip2:geoip2:2.16.1'
 		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.56.0'
-		dependency 'org.slf4j:jcl-over-slf4j:1.7.33'
-		dependency 'org.slf4j:log4j-over-slf4j:1.7.33'
+		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.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.10";
+	private static final String DOCKER_IMAGE = "redis:5.0.14";
 
 	@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  "de.flapdoodle.embed:de.flapdoodle.embed.mongo"
+    implementation  "org.testcontainers:mongodb"
 
 	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,7 +18,16 @@ 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
@@ -31,8 +40,35 @@ import org.springframework.session.data.mongo.config.annotation.web.reactive.Ena
 @EnableMongoWebSession
 public class SpringSessionMongoReactiveApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(SpringSessionMongoReactiveApplication.class);
+	/**
+	 * 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);
+	}
 }

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

@@ -0,0 +1,2 @@
+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

@@ -1,8 +0,0 @@
-logging:
-  level:
-    org.springframework.data.mongodb: DEBUG
-    org.springframework.session: DEBUG
-spring:
-  mongodb:
-    embedded:
-      version: 3.4.3

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,6 +39,7 @@ 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,7 +8,8 @@ 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 "de.flapdoodle.embed:de.flapdoodle.embed.mongo"
+    implementation "org.testcontainers:mongodb"
+
 
     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

@@ -1,46 +0,0 @@
-/*
- * 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,6 +18,15 @@ 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
@@ -25,8 +34,34 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @SpringBootApplication
 public class SpringSessionMongoTraditionalBoot {
 
-	public static void main(String[] args) {
-		SpringApplication.run(SpringSessionMongoTraditionalBoot.class, args);
+	/**
+	 * 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);
+	}
 }

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

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

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

@@ -33,6 +33,7 @@ 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;
@@ -45,6 +46,7 @@ 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.10";
+	private static final String DOCKER_IMAGE = "redis:5.0.14";
 
 	@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.10";
+	private static final String DOCKER_IMAGE = "redis:5.0.14";
 
 	@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.10";
+	private static final String DOCKER_IMAGE = "redis:5.0.14";
 
 	@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.10";
+	private static final String DOCKER_IMAGE = "redis:5.0.14";
 
 	@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.9";
+	private static final String DOCKER_IMAGE = "redis:5.0.14";
 
 	@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.10";
+	private static final String DOCKER_IMAGE = "redis:5.0.14";
 
 	@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.10";
+	private static final String DOCKER_IMAGE = "redis:5.0.14";
 
 	@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.10";
+	private static final String DOCKER_IMAGE = "redis:5.0.14";
 
 	@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.10";
+	private static final String DOCKER_IMAGE = "redis:5.0.14";
 
 	@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.10";
+	private static final String DOCKER_IMAGE = "redis:5.0.14";
 
 	@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.10";
+	private static final String DOCKER_IMAGE = "redis:5.0.14";
 
 	@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.10";
+	private static final String DOCKER_IMAGE = "redis:5.0.14";
 
 	@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.10";
+	private static final String DOCKER_IMAGE = "redis:5.0.14";
 
 	@Bean
 	public GenericContainer redisContainer() {