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

CONTRIBUTING.adoc

@@ -25,13 +25,6 @@ If you are reporting a bug, please help to speed up problem diagnosis by providi
 information as possible. Ideally, that would include a small sample project that
 reproduces the problem.
 
-== Create your branch from the oldest maintenance branch
-
-Create your topic branch to be submitted as a pull request from the oldest impacted and supported maintenance branch.
-You can find the supported versions by looking at the https://github.com/spring-projects/spring-session/milestones[milestones page].
-Switch to a branch named `<major>.<minor>.x` from the smallest milestone in the format of `<major>.<minor>.<patch>(-<prerelease>)`.
-The spring team will ensure the code gets merged forward into additional branches.
-
 
 == Sign the Contributor License Agreement
 If you have not previously done so, please fill out and

README.adoc

@@ -25,7 +25,7 @@ Additional Spring Session modules can be found in the https://github.com/spring-
 
 == Getting Started
 
-We recommend you visit the https://docs.spring.io/spring-session/reference/index.html[Spring Session Reference] and look through the "Samples and Guides" section to see which one best suits your needs.
+We recommend you visit the https://docs.spring.io/spring-session/docs/current/reference/html5/#samples[Spring Session Reference] and look through the "Samples and Guides" section to see which one best suits your needs.
 
 == Samples
 

build.gradle

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

buildSrc/build.gradle

@@ -66,7 +66,7 @@ dependencies {
     implementation 'io.spring.nohttp:nohttp-gradle:0.0.9'
     implementation 'net.sourceforge.htmlunit:htmlunit:2.55.0'
     implementation 'org.hidetake:gradle-ssh-plugin:2.10.1'
-    implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.29.0'
+    implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.24.20'
     implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1'
 
     testImplementation platform('org.junit:junit-bom:5.8.1')

buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy

@@ -18,7 +18,6 @@ package io.spring.gradle.convention
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
 
 class ArtifactoryPlugin implements Plugin<Project> {
 
@@ -38,14 +37,8 @@ class ArtifactoryPlugin implements Plugin<Project> {
 						password = artifactoryPassword
 					}
 				}
-			}
-		}
-		project.plugins.withType(MavenPublishPlugin) {
-			project.artifactory {
-				publish {
-					defaults {
-						publications('mavenJava')
-					}
+				defaults {
+					publications('mavenJava')
 				}
 			}
 		}

buildSrc/src/main/groovy/io/spring/gradle/convention/RootProjectPlugin.groovy

@@ -32,7 +32,6 @@ class RootProjectPlugin implements Plugin<Project> {
 		pluginManager.apply(SchemaPlugin)
 		pluginManager.apply(NoHttpPlugin)
 		pluginManager.apply(SpringNexusPublishPlugin)
-		pluginManager.apply(ArtifactoryPlugin)
 		pluginManager.apply("org.sonarqube")
 
 		project.repositories.mavenCentral()

git/hooks/forward-merge

@@ -1,135 +0,0 @@
-#!/usr/bin/ruby
-require 'json'
-require 'net/http'
-require 'yaml'
-require 'logger'
-
-$log = Logger.new(STDOUT)
-$log.level = Logger::WARN
-
-class ForwardMerge
-  attr_reader :issue, :milestone, :message, :line
-  def initialize(issue, milestone, message, line)
-    @issue = issue
-    @milestone = milestone
-    @message = message
-    @line = line
-  end
-end
-
-def find_forward_merges(message_file)
-  $log.debug "Searching for forward merge"
-  rev=`git rev-parse -q --verify MERGE_HEAD`.strip
-  $log.debug "Found #{rev} from git rev-parse"
-  return nil unless rev
-  message = File.read(message_file)
-  forward_merges = []
-  message.each_line do |line|
-    $log.debug "Checking #{line} for message"
-    match = /^(?:Fixes|Closes) gh-(\d+) in (\d\.\d\.[\dx](?:[\.\-](?:M|RC)\d)?)$/.match(line)
-    if match then
-      issue = match[1]
-      milestone = match[2]
-      $log.debug "Matched reference to issue #{issue} in milestone #{milestone}"
-      forward_merges << ForwardMerge.new(issue, milestone, message, line)
-    end
-  end
-  $log.debug "No match in merge message" unless forward_merges
-  return forward_merges
-end
-
-def get_issue(username, password, repository, number)
-  $log.debug "Getting issue #{number} from GitHub repository #{repository}"
-  uri = URI("https://api.github.com/repos/#{repository}/issues/#{number}")
-  http = Net::HTTP.new(uri.host, uri.port)
-  http.use_ssl=true
-  request = Net::HTTP::Get.new(uri.path)
-  request.basic_auth(username, password)
-  response = http.request(request)
-  $log.debug "Get HTTP response #{response.code}"
-  return JSON.parse(response.body) unless response.code != '200'
-  puts "Failed to retrieve issue #{number}: #{response.message}"
-  exit 1
-end
-
-def find_milestone(username, password, repository, title)
-  $log.debug "Finding milestone #{title} from GitHub repository #{repository}"
-  uri = URI("https://api.github.com/repos/#{repository}/milestones")
-  http = Net::HTTP.new(uri.host, uri.port)
-  http.use_ssl=true
-  request = Net::HTTP::Get.new(uri.path)
-  request.basic_auth(username, password)
-  response = http.request(request)
-  milestones = JSON.parse(response.body)
-  if title.end_with?(".x")
-    prefix = title.delete_suffix('.x')
-    $log.debug "Finding nearest milestone from candidates starting with #{prefix}"
-    titles = milestones.map { |milestone| milestone['title'] }
-    titles = titles.select{ |title| title.start_with?(prefix) unless title.end_with?('.x')}
-    titles = titles.sort_by { |v| Gem::Version.new(v) }
-    $log.debug "Considering candidates #{titles}"
-    if(titles.empty?)
-      puts "Cannot find nearest milestone for prefix #{title}"
-      exit 1
-    end
-    title = titles.first
-    $log.debug "Found nearest milestone #{title}"
-  end
-  milestones.each do |milestone|
-    $log.debug "Considering #{milestone['title']}"
-    return milestone['number'] if milestone['title'] == title
-  end
-  puts "Milestone #{title} not found in #{repository}"
-  exit 1
-end
-
-def create_issue(username, password, repository, original, title, labels, milestone, milestone_name, dry_run)
-  $log.debug "Finding forward-merge issue in GitHub repository #{repository} for '#{title}'"
-  uri = URI("https://api.github.com/repos/#{repository}/issues")
-  http = Net::HTTP.new(uri.host, uri.port)
-  http.use_ssl=true
-  request = Net::HTTP::Post.new(uri.path, 'Content-Type' => 'application/json')
-  request.basic_auth(username, password)
-  request.body = {
-    title: title,
-    labels: labels,
-    milestone: milestone.to_i,
-    body: "Forward port of issue ##{original} to #{milestone_name}."
-  }.to_json
-  if dry_run then
-    puts "Dry run"
-    puts "POSTing to #{uri} with body #{request.body}"
-    return "dry-run"
-  end
-  response = JSON.parse(http.request(request).body)
-  $log.debug "Created new issue #{response['number']}"
-  return response['number']
-end
-
-$log.debug "Running forward-merge hook script"
-message_file=ARGV[0]
-
-forward_merges = find_forward_merges(message_file)
-exit 0 unless forward_merges
-
-$log.debug "Loading config from ~/.spring-boot/forward_merge.yml"
-config = YAML.load_file(File.join(Dir.home, '.spring-boot', 'forward-merge.yml'))
-username = config['github']['credentials']['username']
-password = config['github']['credentials']['password']
-dry_run = config['dry_run']
-repository = 'spring-projects/spring-session'
-
-forward_merges.each do |forward_merge|
-  existing_issue = get_issue(username, password, repository, forward_merge.issue)
-  title = existing_issue['title']
-  labels = existing_issue['labels'].map { |label| label['name'] }
-  labels << "status: forward-port"
-  $log.debug "Processing issue '#{title}'"
-
-  milestone = find_milestone(username, password, repository, forward_merge.milestone)
-  new_issue_number = create_issue(username, password, repository, forward_merge.issue, title, labels, milestone, forward_merge.milestone, dry_run)
-
-  puts "Created gh-#{new_issue_number} for forward port of gh-#{forward_merge.issue} into #{forward_merge.milestone}"
-  rewritten_message = forward_merge.message.sub(forward_merge.line, "Closes gh-#{new_issue_number}\n")
-  File.write(message_file, rewritten_message)
-end

git/hooks/prepare-forward-merge

@@ -1,71 +0,0 @@
-#!/usr/bin/ruby
-require 'json'
-require 'net/http'
-require 'yaml'
-require 'logger'
-
-$main_branch = "3.0.x"
-
-$log = Logger.new(STDOUT)
-$log.level = Logger::WARN
-
-def get_fixed_issues()
-  $log.debug "Searching for for forward merge"
-  rev=`git rev-parse -q --verify MERGE_HEAD`.strip
-  $log.debug "Found #{rev} from git rev-parse"
-  return nil unless rev
-  fixed = []
-  message = `git log -1 --pretty=%B #{rev}`
-  message.each_line do |line|
-    $log.debug "Checking #{line} for message"
-    fixed << line.strip if /^(?:Fixes|Closes) gh-(\d+)/.match(line)
-  end
-  $log.debug "Found fixed issues #{fixed}"
-  return fixed;
-end
-
-def rewrite_message(message_file, fixed)
-  current_branch = `git rev-parse --abbrev-ref HEAD`.strip
-  if current_branch == "main"
-    current_branch = $main_branch
-  end
-  rewritten_message = ""
-  message = File.read(message_file)
-  message.each_line do |line|
-    match = /^Merge.*branch\ '(.*)'(?:\ into\ (.*))?$/.match(line)
-    if match
-      from_branch = match[1]
-      if from_branch.include? "/"
-        from_branch = from_branch.partition("/").last
-      end
-      to_brach = match[2]
-      $log.debug "Rewriting merge message"
-      line = "Merge branch '#{from_branch}'" + (to_brach ? " into #{to_brach}\n" : "\n")
-    end
-    if fixed and line.start_with?("#")
-      $log.debug "Adding fixed"
-      rewritten_message << "\n"
-      fixed.each do |fixes|
-        rewritten_message << "#{fixes} in #{current_branch}\n"
-      end
-      fixed = nil
-    end
-    rewritten_message << line
-  end
-  return rewritten_message
-end
-
-$log.debug "Running prepare-forward-merge hook script"
-
-message_file=ARGV[0]
-message_type=ARGV[1]
-
-if message_type != "merge"
-  $log.debug "Not a merge commit"
-  exit 0;
-end
-
-$log.debug "Searching for for forward merge"
-fixed = get_fixed_issues()
-rewritten_message = rewrite_message(message_file, fixed)
-File.write(message_file, rewritten_message)

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

gradle/dependency-management.gradle

@@ -1,12 +1,12 @@
 dependencyManagement {
 	imports {
-		mavenBom 'io.projectreactor:reactor-bom:2020.0.30'
-		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.5'
+		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.26'
-		mavenBom 'org.springframework.data:spring-data-bom:2021.2.9'
-		mavenBom 'org.springframework.security:spring-security-bom:5.7.7'
-		mavenBom 'org.testcontainers:testcontainers-bom:1.17.6'
+		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,35 +15,35 @@ dependencyManagement {
 			entry 'hazelcast-client'
 		}
 
-		dependency 'org.aspectj:aspectjweaver:1.9.9.1'
-		dependency 'ch.qos.logback:logback-core:1.2.11'
+		dependency 'org.aspectj:aspectjweaver:1.9.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.8.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.zaxxer:HikariCP:4.0.3'
+		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.10.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.32'
+		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.8'
-		dependencySet(group: 'org.mockito', version: '4.5.1') {
+		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'
 		}
 
-		dependencySet(group: 'org.mongodb', version: '4.6.1') {
+		dependencySet(group: 'org.mongodb', version: '4.5.1') {
 			entry 'mongodb-driver-core'
 			entry 'mongodb-driver-sync'
 			entry 'mongodb-driver-reactivestreams'
 		}
-		dependency 'org.postgresql:postgresql:42.3.8'
+		dependency 'org.postgresql:postgresql:42.3.1'
 	}
 }
 

spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.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.
@@ -399,8 +399,8 @@ public abstract class AbstractMongoRepositoryITest extends AbstractITest {
 		@Bean
 		public MongoOperations mongoOperations(MongoDBContainer mongoContainer) {
 
-			MongoClient mongo = MongoClients
-					.create("mongodb://" + mongoContainer.getHost() + ":" + mongoContainer.getFirstMappedPort());
+			MongoClient mongo = MongoClients.create(
+					"mongodb://" + mongoContainer.getContainerIpAddress() + ":" + mongoContainer.getFirstMappedPort());
 			return new MongoTemplate(mongo, "test");
 		}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 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.
@@ -185,8 +185,8 @@ public class MongoDbDeleteJacksonSessionVerificationTest {
 		@Bean
 		ReactiveMongoOperations mongoOperations(MongoDBContainer mongoContainer) {
 
-			MongoClient mongo = MongoClients
-					.create("mongodb://" + mongoContainer.getHost() + ":" + mongoContainer.getFirstMappedPort());
+			MongoClient mongo = MongoClients.create(
+					"mongodb://" + mongoContainer.getContainerIpAddress() + ":" + mongoContainer.getFirstMappedPort());
 			return new ReactiveMongoTemplate(mongo, "DB_Name_DeleteJacksonSessionVerificationTest");
 		}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 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.
@@ -180,8 +180,8 @@ public class MongoDbLogoutVerificationTest {
 		@Bean
 		ReactiveMongoOperations mongoOperations(MongoDBContainer mongoContainer) {
 
-			MongoClient mongo = MongoClients
-					.create("mongodb://" + mongoContainer.getHost() + ":" + mongoContainer.getFirstMappedPort());
+			MongoClient mongo = MongoClients.create(
+					"mongodb://" + mongoContainer.getContainerIpAddress() + ":" + mongoContainer.getFirstMappedPort());
 			return new ReactiveMongoTemplate(mongo, "test");
 		}
 

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

@@ -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.
@@ -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 {
 
@@ -42,8 +42,8 @@ public abstract class AbstractRedisITests {
 
 		@Bean
 		public LettuceConnectionFactory redisConnectionFactory() {
-			RedisStandaloneConfiguration configuration = new RedisStandaloneConfiguration(redisContainer().getHost(),
-					redisContainer().getFirstMappedPort());
+			RedisStandaloneConfiguration configuration = new RedisStandaloneConfiguration(
+					redisContainer().getContainerIpAddress(), redisContainer().getFirstMappedPort());
 			return new LettuceConnectionFactory(configuration);
 		}
 

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.1'
+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/guides/java-hazelcast.adoc

@@ -100,7 +100,7 @@ Spring Session provides `PrincipalNameExtractor` for this purpose.
 is not set, Hazelcast will serialize sessions using native Java serialization.
 <4> We create a `HazelcastInstance` that connects Spring Session to Hazelcast.
 By default, the application starts and connects to an embedded instance of Hazelcast.
-For more information on configuring Hazelcast, see the https://docs.hazelcast.com/hazelcast/latest/[reference documentation].
+For more information on configuring Hazelcast, see the https://docs.hazelcast.org/docs/{hazelcast-version}/manual/html-single/index.html#hazelcast-configuration[reference documentation].
 ====
 
 NOTE: If `HazelcastSessionSerializer` is preferred, it needs to be configured for all Hazelcast cluster members before they start.
@@ -161,7 +161,7 @@ $ ./gradlew :spring-session-sample-javaconfig-hazelcast:tomcatRun
 ====
 
 NOTE: By default, Hazelcast runs in embedded mode with your application.
-However, if you want to connect to a standalone instance instead, you can configure it by following the instructions in the https://docs.hazelcast.com/hazelcast/latest/getting-started/get-started-cli[reference documentation].
+However, if you want to connect to a standalone instance instead, you can configure it by following the instructions in the https://docs.hazelcast.org/docs/{hazelcast-version}/manual/html-single/index.html#hazelcast-configuration[reference documentation].
 
 You should now be able to access the application at http://localhost:8080/
 
@@ -188,9 +188,9 @@ You can view the cookies (with https://developers.google.com/web/tools/chrome-de
 
 === Interacting with the Data Store
 
-You can remove the session by using https://docs.hazelcast.com/hazelcast/latest/clients/java[a Java client],
-https://hazelcast.com/clients/[one of the other clients], or the
-https://docs.hazelcast.com/management-center/latest/getting-started/overview[management center].
+You can remove the session by using https://docs.hazelcast.org/docs/{hazelcast-version}/manual/html-single/index.html#hazelcast-java-client[a Java client],
+https://docs.hazelcast.org/docs/{hazelcast-version}/manual/html-single/index.html#other-client-implementations[one of the other clients], or the
+https://docs.hazelcast.org/docs/{hazelcast-version}/manual/html-single/index.html#management-center[management center].
 
 ==== Using the Console
 
@@ -203,7 +203,7 @@ For example, to remove the session by using the management center console after
 ----
 ====
 
-TIP: The Hazelcast documentation has instructions for https://docs.hazelcast.com/hazelcast/latest/clients/clc[the console].
+TIP: The Hazelcast documentation has instructions for https://docs.hazelcast.org/docs/{hazelcast-version}/manual/html-single/index.html#executing-console-commands[the console].
 
 Alternatively, you can also delete the explicit key. Enter the following into the console, being sure to replace `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your `SESSION` cookie:
 
@@ -218,7 +218,7 @@ Now visit the application at http://localhost:8080/ and observe that we are no l
 ==== Using the REST API
 
 As described in the section of the documentation that cover other clients, there is a
-https://docs.hazelcast.com/hazelcast/latest/clients/rest[REST API]
+https://docs.hazelcast.org/docs/{hazelcast-version}/manual/html-single/index.html#rest-client[REST API]
 provided by the Hazelcast node(s).
 
 For example, you could delete an individual key as follows (being sure to replace `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your SESSION cookie):

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-hazelcast/hazelcast4/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcast4IndexedSessionRepositoryITests.java

@@ -66,7 +66,8 @@ class ClientServerHazelcast4IndexedSessionRepositoryITests extends AbstractHazel
 		@Bean
 		HazelcastInstance hazelcastInstance() {
 			ClientConfig clientConfig = new ClientConfig();
-			clientConfig.getNetworkConfig().addAddress(container.getHost() + ":" + container.getFirstMappedPort());
+			clientConfig.getNetworkConfig()
+					.addAddress(container.getContainerIpAddress() + ":" + container.getFirstMappedPort());
 			clientConfig.getUserCodeDeploymentConfig().setEnabled(true).addClass(Session.class)
 					.addClass(MapSession.class).addClass(Hazelcast4SessionUpdateEntryProcessor.class);
 			return HazelcastClient.newHazelcastClient(clientConfig);

spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcastIndexedSessionRepositoryITests.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.
@@ -67,7 +67,8 @@ class ClientServerHazelcastIndexedSessionRepositoryITests extends AbstractHazelc
 		@Bean
 		HazelcastInstance hazelcastInstance() {
 			ClientConfig clientConfig = new ClientConfig();
-			clientConfig.getNetworkConfig().addAddress(container.getHost() + ":" + container.getFirstMappedPort());
+			clientConfig.getNetworkConfig()
+					.addAddress(container.getContainerIpAddress() + ":" + container.getFirstMappedPort());
 			clientConfig.getUserCodeDeploymentConfig().setEnabled(true).addClass(Session.class)
 					.addClass(MapSession.class).addClass(SessionUpdateEntryProcessor.class);
 			return HazelcastClient.newHazelcastClient(clientConfig);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.springframework.session.jdbc;
 
+import java.time.Duration;
+
 import org.testcontainers.containers.Db2Container;
 import org.testcontainers.containers.JdbcDatabaseContainer;
 import org.testcontainers.containers.MSSQLServerContainer;
@@ -23,6 +25,7 @@ import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.containers.OracleContainer;
 import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 
 /**
  * Factories for various {@link JdbcDatabaseContainer}s.
@@ -39,19 +42,33 @@ 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() {
-		return new OracleContainer("gvenzl/oracle-xe:18.4.0-slim");
+		return new OracleContainer() {
+
+			@Override
+			protected void configure() {
+				this.waitStrategy = new LogMessageWaitStrategy().withRegEx(".*DATABASE IS READY TO USE!.*\\s")
+						.withStartupTimeout(Duration.ofMinutes(10));
+				addEnv("ORACLE_PWD", getPassword());
+			}
+
+			@Override
+			protected void waitUntilContainerStarted() {
+				getWaitStrategy().waitUntilReady(this);
+			}
+
+		};
 	}
 
 	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.61.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

@@ -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.
@@ -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;
@@ -115,7 +115,8 @@ class FindByUsernameTests {
 
 		@Bean
 		LettuceConnectionFactory redisConnectionFactory() {
-			return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort());
+			return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+					redisContainer().getFirstMappedPort());
 		}
 
 	}

spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/HttpRedisJsonTest.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.
@@ -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;
@@ -115,7 +115,8 @@ class HttpRedisJsonTest {
 
 		@Bean
 		LettuceConnectionFactory redisConnectionFactory() {
-			return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort());
+			return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+					redisContainer().getFirstMappedPort());
 		}
 
 	}

spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/RedisSerializerTest.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.
@@ -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;
@@ -64,7 +64,8 @@ class RedisSerializerTest {
 
 		@Bean
 		LettuceConnectionFactory redisConnectionFactory() {
-			return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort());
+			return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+					redisContainer().getFirstMappedPort());
 		}
 
 	}

spring-session-samples/spring-session-sample-boot-redis-simple/src/integration-test/java/sample/BootTests.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.
@@ -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;
@@ -93,7 +93,8 @@ class BootTests {
 
 		@Bean
 		LettuceConnectionFactory redisConnectionFactory() {
-			return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort());
+			return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+					redisContainer().getFirstMappedPort());
 		}
 
 	}

spring-session-samples/spring-session-sample-boot-redis/src/integration-test/java/sample/BootTests.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.
@@ -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;
@@ -97,7 +97,8 @@ class BootTests {
 
 		@Bean
 		LettuceConnectionFactory redisConnectionFactory() {
-			return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort());
+			return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+					redisContainer().getFirstMappedPort());
 		}
 
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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;
@@ -103,7 +103,8 @@ class AttributeTests {
 
 		@Bean
 		LettuceConnectionFactory redisConnectionFactory() {
-			return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort());
+			return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+					redisContainer().getFirstMappedPort());
 		}
 
 	}

spring-session-samples/spring-session-sample-boot-webflux/src/integration-test/java/sample/AttributeTests.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.
@@ -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;
@@ -105,7 +105,8 @@ class AttributeTests {
 
 		@Bean
 		LettuceConnectionFactory redisConnectionFactory() {
-			return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort());
+			return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+					redisContainer().getFirstMappedPort());
 		}
 
 	}

spring-session-samples/spring-session-sample-boot-websocket/src/integration-test/java/sample/ApplicationTests.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.
@@ -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;
@@ -86,7 +86,8 @@ class ApplicationTests {
 
 		@Bean
 		LettuceConnectionFactory redisConnectionFactory() {
-			return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort());
+			return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+					redisContainer().getFirstMappedPort());
 		}
 
 	}

spring-session-samples/spring-session-sample-javaconfig-custom-cookie/src/main/java/sample/EmbeddedRedisConfig.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.
@@ -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() {
@@ -40,7 +40,8 @@ public class EmbeddedRedisConfig {
 	@Bean
 	@Primary
 	public LettuceConnectionFactory redisConnectionFactory() {
-		return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort());
+		return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+				redisContainer().getFirstMappedPort());
 	}
 
 }

spring-session-samples/spring-session-sample-javaconfig-redis/src/main/java/sample/EmbeddedRedisConfig.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.
@@ -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() {
@@ -40,7 +40,8 @@ public class EmbeddedRedisConfig {
 	@Bean
 	@Primary
 	public LettuceConnectionFactory redisConnectionFactory() {
-		return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort());
+		return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+				redisContainer().getFirstMappedPort());
 	}
 
 }

spring-session-samples/spring-session-sample-javaconfig-rest/src/integration-test/java/rest/RestMockMvcTests.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.
@@ -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;
@@ -99,7 +99,8 @@ class RestMockMvcTests {
 
 		@Bean
 		LettuceConnectionFactory redisConnectionFactory() {
-			return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort());
+			return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+					redisContainer().getFirstMappedPort());
 		}
 
 		@Bean

spring-session-samples/spring-session-sample-javaconfig-rest/src/main/java/sample/EmbeddedRedisConfig.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.
@@ -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() {
@@ -40,7 +40,8 @@ public class EmbeddedRedisConfig {
 	@Bean
 	@Primary
 	public LettuceConnectionFactory redisConnectionFactory() {
-		return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort());
+		return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+				redisContainer().getFirstMappedPort());
 	}
 
 }

spring-session-samples/spring-session-sample-javaconfig-security/src/main/java/sample/EmbeddedRedisConfig.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.
@@ -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() {
@@ -40,7 +40,8 @@ public class EmbeddedRedisConfig {
 	@Bean
 	@Primary
 	public LettuceConnectionFactory redisConnectionFactory() {
-		return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort());
+		return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+				redisContainer().getFirstMappedPort());
 	}
 
 }

spring-session-samples/spring-session-sample-xml-redis/src/main/java/sample/EmbeddedRedisConfig.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.
@@ -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() {
@@ -40,7 +40,8 @@ public class EmbeddedRedisConfig {
 	@Bean
 	@Primary
 	public LettuceConnectionFactory redisConnectionFactory() {
-		return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort());
+		return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+				redisContainer().getFirstMappedPort());
 	}
 
 }