Release 2.7.0-M1

This reverts commit bda72c074f.

RELEASE.adoc

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

build.gradle

@@ -4,7 +4,7 @@ buildscript {
 		snapshotBuild = version.endsWith('SNAPSHOT')
 		milestoneBuild = !(releaseBuild || snapshotBuild)
 
-		springBootVersion = '2.6.6'
+		springBootVersion = '2.5.6'
 	}
 
 	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()

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

gradle/dependency-management.gradle

@@ -1,12 +1,12 @@
 dependencyManagement {
 	imports {
-		mavenBom 'io.projectreactor:reactor-bom:2020.0.18'
-		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.2.20220328'
+		mavenBom 'io.projectreactor:reactor-bom:2020.0.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.19'
-		mavenBom 'org.springframework.data:spring-data-bom:2021.1.4'
-		mavenBom 'org.springframework.security:spring-security-bom:5.6.3'
-		mavenBom 'org.testcontainers:testcontainers-bom:1.16.3'
+		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.7.0'
+		dependency 'com.ibm.db2:jcc:11.5.6.0'
 		dependency 'com.microsoft.sqlserver:mssql-jdbc:9.4.1.jre8'
-		dependency 'com.oracle.database.jdbc:ojdbc8:21.3.0.0'
+		dependency 'com.oracle.database.jdbc:ojdbc8:21.4.0.0.1'
 		dependency 'com.zaxxer:HikariCP:3.4.5'
 		dependency 'edu.umd.cs.mtc:multithreadedtc:1.01'
-		dependency 'io.lettuce:lettuce-core:6.1.8.RELEASE'
+		dependency 'io.lettuce:lettuce-core:6.1.6.RELEASE'
 		dependency 'jakarta.annotation:jakarta.annotation-api:1.3.5'
 		dependency 'jakarta.servlet:jakarta.servlet-api:4.0.4'
-		dependency 'mysql:mysql-connector-java:8.0.28'
+		dependency 'mysql:mysql-connector-java:8.0.27'
 		dependency 'org.apache.derby:derby:10.14.2.0'
-		dependency 'org.assertj:assertj-core:3.21.0'
+		dependency 'org.assertj:assertj-core:3.22.0'
 		dependency 'org.hamcrest:hamcrest:2.1'
 		dependency 'org.hsqldb:hsqldb:2.5.2'
 		dependency 'org.mariadb.jdbc:mariadb-java-client:2.7.4'
-		dependencySet(group: 'org.mockito', version: '4.0.0') {
+		dependencySet(group: 'org.mockito', version: '4.2.0') {
         	entry 'mockito-core'
 			entry 'mockito-junit-jupiter'
 		}
 
-		dependencySet(group: 'org.mongodb', version: '4.4.2') {
+		dependencySet(group: 'org.mongodb', version: '4.4.1') {
 			entry 'mongodb-driver-core'
 			entry 'mongodb-driver-sync'
 			entry 'mongodb-driver-reactivestreams'
 		}
-		dependency 'org.postgresql:postgresql:42.3.3'
+		dependency 'org.postgresql:postgresql:42.3.1'
 	}
 }
 

settings.gradle

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

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

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

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

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

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

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

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

@@ -527,30 +527,6 @@ 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,13 +858,11 @@ public class RedisIndexedSessionRepository
 				catch (NonTransientDataAccessException ex) {
 					handleErrNoSuchKeyError(ex);
 				}
-				if (this.originalPrincipalName != null) {
-					String originalPrincipalRedisKey = getPrincipalKey(this.originalPrincipalName);
-					RedisIndexedSessionRepository.this.sessionRedisOperations.boundSetOps(originalPrincipalRedisKey)
-							.remove(this.originalSessionId);
-					RedisIndexedSessionRepository.this.sessionRedisOperations.boundSetOps(originalPrincipalRedisKey)
-							.add(sessionId);
-				}
+				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-playbook.yml

@@ -10,7 +10,7 @@ content:
       branches: [spring-projects/spring-session/*]
     - url: https://github.com/spring-projects/spring-session
       branches: [main,3.0.x]
-      tags: ['2.6.*','!2.6.0-M*','!2.6.0-RC*']
+      tags: ['3.0.*', '2.7.*', '2.6.*','!2.6.0-M*','!2.6.0-RC*']
       start_path: spring-session-docs
 urls:
   latest_version_segment_strategy: redirect:to

spring-session-docs/antora.yml

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 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.

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

@@ -46,7 +46,7 @@ final class DatabaseContainers {
 	}
 
 	static MySQLContainer<?> mySql() {
-		return new MySQLContainer<>("mysql:8.0.28");
+		return new MySQLContainer<>("mysql:8.0.27");
 	}
 
 	static OracleContainer oracle() {

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

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

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

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

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

@@ -1,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 '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.36'
-		dependency 'org.slf4j:log4j-over-slf4j:1.7.36'
+		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-mongodb-reactive/src/main/resources/application.yml

@@ -2,7 +2,3 @@ logging:
   level:
     org.springframework.data.mongodb: DEBUG
     org.springframework.session: DEBUG
-spring:
-  mongodb:
-    embedded:
-      version: 3.0.0

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

@@ -1,4 +1,3 @@
 spring.thymeleaf.cache=false
 spring.template.cache=false
 spring.data.mongodb.port=0
-spring.mongodb.embedded.version=3.0.0

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

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

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

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