Release 2.6.2

Closes gh-2029

.github/workflows/continuous-integration-workflow.yml

@@ -2,8 +2,6 @@ name: CI
 
 on:
   push:
-    branches:
-      - main
   schedule:
     - cron: '0 10 * * *' # Once per day at 10am UTC
   workflow_dispatch: # Manual trigger

buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle

@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-	optional 'javax.servlet:javax.servlet-api:3.1.0'
+	optional 'jakarta.servlet:jakarta.servlet-api:4.0.4'
 	testImplementation platform('org.junit:junit-bom:5.8.1')
 	testImplementation 'org.junit.jupiter:junit-jupiter-api'
 	testImplementation 'org.junit.jupiter:junit-jupiter-engine'

buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-	provided 'javax.servlet:javax.servlet-api'
+	provided 'jakarta.servlet:jakarta.servlet-api:4.0.4'
     testImplementation 'commons-io:commons-io:2.11.0'
     testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation platform('org.junit:junit-bom:5.8.1')

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

gradle/dependency-management.gradle

@@ -1,11 +1,11 @@
 dependencyManagement {
 	imports {
-		mavenBom 'io.projectreactor:reactor-bom:2020.0.14'
-		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.0'
+		mavenBom 'io.projectreactor:reactor-bom:2020.0.16'
+		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.1'
 		mavenBom 'org.junit:junit-bom:5.8.2'
-		mavenBom 'org.springframework:spring-framework-bom:5.3.14'
-		mavenBom 'org.springframework.data:spring-data-bom:2021.1.0'
-		mavenBom 'org.springframework.security:spring-security-bom:5.6.1'
+		mavenBom 'org.springframework:spring-framework-bom:5.3.16'
+		mavenBom 'org.springframework.data:spring-data-bom:2021.1.2'
+		mavenBom 'org.springframework.security:spring-security-bom:5.6.2'
 		mavenBom 'org.testcontainers:testcontainers-bom:1.16.2'
 	}
 
@@ -15,19 +15,19 @@ dependencyManagement {
 			entry 'hazelcast-client'
 		}
 
-		dependency 'org.aspectj:aspectjweaver:1.9.7'
-		dependency 'ch.qos.logback:logback-core:1.2.9'
+		dependency 'org.aspectj:aspectjweaver:1.9.8'
+		dependency 'ch.qos.logback:logback-core:1.2.10'
 		dependency 'com.google.code.findbugs:jsr305:3.0.2'
 		dependency 'com.h2database:h2:1.4.200'
-		dependency 'com.ibm.db2:jcc:11.5.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.3.0.0'
 		dependency 'com.zaxxer:HikariCP:3.4.5'
 		dependency 'edu.umd.cs.mtc:multithreadedtc:1.01'
-		dependency 'io.lettuce:lettuce-core:6.1.5.RELEASE'
-		dependency 'javax.annotation:javax.annotation-api:1.3.2'
-		dependency 'javax.servlet:javax.servlet-api:4.0.1'
-		dependency 'mysql:mysql-connector-java:8.0.27'
+		dependency 'io.lettuce:lettuce-core:6.1.6.RELEASE'
+		dependency 'jakarta.annotation:jakarta.annotation-api:1.3.5'
+		dependency 'jakarta.servlet:jakarta.servlet-api:4.0.4'
+		dependency 'mysql:mysql-connector-java:8.0.28'
 		dependency 'org.apache.derby:derby:10.14.2.0'
 		dependency 'org.assertj:assertj-core:3.21.0'
 		dependency 'org.hamcrest:hamcrest:2.1'
@@ -38,12 +38,12 @@ dependencyManagement {
 			entry 'mockito-junit-jupiter'
 		}
 
-		dependencySet(group: 'org.mongodb', version: '4.4.0') {
+		dependencySet(group: 'org.mongodb', version: '4.4.2') {
 			entry 'mongodb-driver-core'
 			entry 'mongodb-driver-sync'
 			entry 'mongodb-driver-reactivestreams'
 		}
-		dependency 'org.postgresql:postgresql:42.3.1'
+		dependency 'org.postgresql:postgresql:42.3.3'
 	}
 }
 

spring-session-core/spring-session-core.gradle

@@ -6,8 +6,8 @@ dependencies {
 	api "org.springframework:spring-jcl"
 
 	optional "io.projectreactor:reactor-core"
-	optional "javax.annotation:javax.annotation-api"
-	optional "javax.servlet:javax.servlet-api"
+	optional "jakarta.annotation:jakarta.annotation-api"
+	optional "jakarta.servlet:jakarta.servlet-api"
 	optional "org.springframework:spring-context"
 	optional "org.springframework:spring-jdbc"
 	optional "org.springframework:spring-messaging"

spring-session-data-mongodb/spring-session-data-mongodb.gradle

@@ -41,5 +41,5 @@ dependencies {
     testImplementation "org.mockito:mockito-core"
     testImplementation "org.mockito:mockito-junit-jupiter"
     testImplementation "io.projectreactor:reactor-test"
-    testImplementation "javax.servlet:javax.servlet-api"
+    testImplementation "jakarta.servlet:jakarta.servlet-api"
 }

spring-session-data-redis/spring-session-data-redis.gradle

@@ -15,7 +15,7 @@ dependencies {
 	testImplementation "org.mockito:mockito-core"
 	testImplementation "org.springframework:spring-test"
 	testImplementation "io.projectreactor:reactor-test"
-	testImplementation "javax.servlet:javax.servlet-api"
+	testImplementation "jakarta.servlet:jakarta.servlet-api"
 	testImplementation "org.springframework:spring-web"
 	testImplementation "org.springframework.security:spring-security-core"
 	testImplementation "org.junit.jupiter:junit-jupiter-api"

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

@@ -527,6 +527,30 @@ class RedisIndexedSessionRepositoryITests extends AbstractRedisITests {
 		assertThat(findByPrincipalName.keySet()).containsOnly(changeSessionId);
 	}
 
+	@Test // gh-1987
+	void changeSessionIdWhenPrincipalNameChangesFromNullThenIndexShouldNotBeCreated() {
+		String principalName = null;
+		String principalNameChanged = "findByChangedPrincipalName" + UUID.randomUUID();
+		RedisSession toSave = this.repository.createSession();
+		toSave.setAttribute(INDEX_NAME, principalName);
+
+		this.repository.save(toSave);
+
+		RedisSession findById = this.repository.findById(toSave.getId());
+		String changeSessionId = findById.changeSessionId();
+		findById.setAttribute(INDEX_NAME, principalNameChanged);
+		this.repository.save(findById);
+
+		Map<String, RedisSession> findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME,
+				principalName);
+		assertThat(findByPrincipalName).isEmpty();
+
+		findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME, principalNameChanged);
+
+		assertThat(findByPrincipalName).hasSize(1);
+		assertThat(findByPrincipalName.keySet()).containsOnly(changeSessionId);
+	}
+
 	@Test
 	void changeSessionIdWhenOnlyChangeId() {
 		String attrName = "changeSessionId";

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

@@ -858,11 +858,13 @@ public class RedisIndexedSessionRepository
 				catch (NonTransientDataAccessException ex) {
 					handleErrNoSuchKeyError(ex);
 				}
-				String originalPrincipalRedisKey = getPrincipalKey(this.originalPrincipalName);
-				RedisIndexedSessionRepository.this.sessionRedisOperations.boundSetOps(originalPrincipalRedisKey)
-						.remove(this.originalSessionId);
-				RedisIndexedSessionRepository.this.sessionRedisOperations.boundSetOps(originalPrincipalRedisKey)
-						.add(sessionId);
+				if (this.originalPrincipalName != null) {
+					String originalPrincipalRedisKey = getPrincipalKey(this.originalPrincipalName);
+					RedisIndexedSessionRepository.this.sessionRedisOperations.boundSetOps(originalPrincipalRedisKey)
+							.remove(this.originalSessionId);
+					RedisIndexedSessionRepository.this.sessionRedisOperations.boundSetOps(originalPrincipalRedisKey)
+							.add(sessionId);
+				}
 			}
 			this.originalSessionId = sessionId;
 		}

spring-session-docs/antora.yml

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

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

@@ -22,7 +22,7 @@ dependencies {
 	testImplementation 'org.assertj:assertj-core'
 	testImplementation 'com.hazelcast:hazelcast'
 	testImplementation 'io.lettuce:lettuce-core'
-	testImplementation 'javax.servlet:javax.servlet-api'
+	testImplementation 'jakarta.servlet:jakarta.servlet-api'
 	testImplementation 'org.junit.jupiter:junit-jupiter-api'
 	testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 }

spring-session-hazelcast/hazelcast4/hazelcast4.gradle

@@ -21,11 +21,11 @@ artifacts {
 
 dependencies {
     api project(':spring-session-core')
-    optional "com.hazelcast:hazelcast:4.2.3"
+    optional "com.hazelcast:hazelcast:4.2.4"
     api "org.springframework:spring-context"
-    api "javax.annotation:javax.annotation-api"
+    api "jakarta.annotation:jakarta.annotation-api"
 
-    testImplementation "javax.servlet:javax.servlet-api"
+    testImplementation "jakarta.servlet:jakarta.servlet-api"
     testImplementation "org.assertj:assertj-core"
     testImplementation "org.mockito:mockito-core"
     testImplementation "org.springframework:spring-test"
@@ -35,7 +35,7 @@ dependencies {
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
 
     integrationTestCompile "org.testcontainers:testcontainers"
-    integrationTestCompile "com.hazelcast:hazelcast:4.2.3"
+    integrationTestCompile "com.hazelcast:hazelcast:4.2.4"
     integrationTestCompile project(":spring-session-hazelcast")
 }
 

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

@@ -45,7 +45,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @WebAppConfiguration
 class ClientServerHazelcast4IndexedSessionRepositoryITests extends AbstractHazelcast4IndexedSessionRepositoryITests {
 
-	private static GenericContainer container = new GenericContainer<>("hazelcast/hazelcast:4.2.2")
+	private static GenericContainer container = new GenericContainer<>("hazelcast/hazelcast:4.2.4")
 			.withExposedPorts(5701).withCopyFileToContainer(MountableFile.forClasspathResource("/hazelcast-server.xml"),
 					"/opt/hazelcast/hazelcast.xml");
 

spring-session-hazelcast/spring-session-hazelcast.gradle

@@ -7,13 +7,13 @@ configurations {
 dependencies {
 	api project(':spring-session-core')
 	api "com.hazelcast:hazelcast"
-	api "javax.annotation:javax.annotation-api"
+	api "jakarta.annotation:jakarta.annotation-api"
 	api "org.springframework:spring-context"
 
 	hazelcast4(project(path: ":hazelcast4", configuration: 'classesOnlyElements'))
 	compileOnly(project(":hazelcast4"))
 
-	testImplementation "javax.servlet:javax.servlet-api"
+	testImplementation "jakarta.servlet:jakarta.servlet-api"
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.mockito:mockito-core"
 	testImplementation "org.springframework:spring-test"

spring-session-jdbc/spring-session-jdbc.gradle

@@ -7,7 +7,7 @@ dependencies {
 	api "org.springframework:spring-context"
 	api "org.springframework:spring-jdbc"
 
-	testImplementation "javax.servlet:javax.servlet-api"
+	testImplementation "jakarta.servlet:jakarta.servlet-api"
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.mockito:mockito-core"
 	testImplementation "org.springframework:spring-test"

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

@@ -1,17 +1,17 @@
 dependencyManagement {
 	imports {
-		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.0'
+		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.1'
 	}
 
 	dependencies {
-		dependency 'ch.qos.logback:logback-classic:1.2.9'
+		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:2.52.0'
-		dependency 'org.slf4j:jcl-over-slf4j:1.7.32'
-		dependency 'org.slf4j:log4j-over-slf4j:1.7.32'
+		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-hazelcast4/spring-session-sample-boot-hazelcast4.gradle

@@ -7,7 +7,7 @@ dependencies {
 	implementation  "org.springframework.boot:spring-boot-starter-actuator"
 	implementation  "org.springframework.boot:spring-boot-starter-thymeleaf"
 	implementation  "org.springframework.boot:spring-boot-starter-security"
-	implementation  "com.hazelcast:hazelcast:4.2.3"
+	implementation  "com.hazelcast:hazelcast:4.2.4"
 	implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
 	implementation "org.webjars:bootstrap"
 	implementation "org.webjars:html5shiv"

spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle

@@ -17,7 +17,7 @@ dependencies {
 	implementation  "ch.qos.logback:logback-classic"
 	implementation  "org.testcontainers:testcontainers"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.junit.jupiter:junit-jupiter-api"

spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle

@@ -19,7 +19,7 @@ dependencies {
 	implementation "org.slf4j:log4j-over-slf4j"
 	implementation "ch.qos.logback:logback-classic"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 	providedCompile "javax.servlet.jsp:javax.servlet.jsp-api"
 
 	testImplementation "org.assertj:assertj-core"

spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle

@@ -16,7 +16,7 @@ dependencies {
 	implementation "org.slf4j:log4j-over-slf4j"
 	implementation "ch.qos.logback:logback-classic"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.junit.jupiter:junit-jupiter-api"

spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle

@@ -17,7 +17,7 @@ dependencies {
 	implementation "ch.qos.logback:logback-classic"
 	implementation "org.testcontainers:testcontainers"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.junit.jupiter:junit-jupiter-api"

spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle

@@ -18,7 +18,7 @@ dependencies {
 	implementation "ch.qos.logback:logback-classic"
 	implementation "org.testcontainers:testcontainers"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testImplementation "org.springframework.security:spring-security-test"
 	testImplementation "org.assertj:assertj-core"

spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle

@@ -19,7 +19,7 @@ dependencies {
 	implementation "ch.qos.logback:logback-classic"
 	implementation "org.testcontainers:testcontainers"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 	providedCompile "javax.servlet.jsp:javax.servlet.jsp-api"
 
 	testImplementation "org.assertj:assertj-core"

spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle

@@ -15,7 +15,7 @@ dependencies {
 	implementation "org.slf4j:log4j-over-slf4j"
 	implementation "ch.qos.logback:logback-classic"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.junit.jupiter:junit-jupiter-api"

spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle

@@ -16,7 +16,7 @@ dependencies {
 	implementation "org.slf4j:log4j-over-slf4j"
 	implementation "ch.qos.logback:logback-classic"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.junit.jupiter:junit-jupiter-api"

spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle

@@ -17,7 +17,7 @@ dependencies {
 	implementation "ch.qos.logback:logback-classic"
 	implementation "org.testcontainers:testcontainers"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.junit.jupiter:junit-jupiter-api"