Release 2.3.0.M1

Resolves: #1575

Jenkinsfile

@@ -32,6 +32,44 @@ try {
 			}
 		}
 	},
+	jdk9: {
+		stage('JDK 9') {
+			timeout(time: 45, unit: 'MINUTES') {
+				node('linux') {
+					checkout scm
+					sh "git clean -dfx"
+					try {
+						withEnv(["JAVA_HOME=${tool 'jdk9'}"]) {
+							sh './gradlew clean test --no-daemon --stacktrace'
+						}
+					}
+					catch (e) {
+						currentBuild.result = 'FAILED: jdk9'
+						throw e
+					}
+				}
+			}
+		}
+	},
+	jdk10: {
+		stage('JDK 10') {
+			timeout(time: 45, unit: 'MINUTES') {
+				node('linux') {
+					checkout scm
+					sh "git clean -dfx"
+					try {
+						withEnv(["JAVA_HOME=${tool 'jdk10'}"]) {
+							sh './gradlew clean test --no-daemon --stacktrace'
+						}
+					}
+					catch (e) {
+						currentBuild.result = 'FAILED: jdk10'
+						throw e
+					}
+				}
+			}
+		}
+	},
 	jdk11: {
 		stage('JDK 11') {
 			timeout(time: 45, unit: 'MINUTES') {

build.gradle

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

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.2.4.RELEASE
+version=2.3.0.M1

gradle/dependency-management.gradle

@@ -1,11 +1,11 @@
 dependencyManagement {
 	imports {
-		mavenBom 'io.projectreactor:reactor-bom:Dysprosium-SR12'
+		mavenBom 'io.projectreactor:reactor-bom:Dysprosium-SR4'
 		mavenBom 'org.junit:junit-bom:5.5.2'
-		mavenBom 'org.springframework:spring-framework-bom:5.2.9.RELEASE'
-		mavenBom 'org.springframework.data:spring-data-releasetrain:Moore-SR10'
-		mavenBom 'org.springframework.security:spring-security-bom:5.2.6.RELEASE'
-		mavenBom 'org.testcontainers:testcontainers-bom:1.12.5'
+		mavenBom 'org.springframework:spring-framework-bom:5.2.3.RELEASE'
+		mavenBom 'org.springframework.data:spring-data-releasetrain:Neumann-M2'
+		mavenBom 'org.springframework.security:spring-security-bom:5.3.0.M1'
+		mavenBom 'org.testcontainers:testcontainers-bom:1.12.2'
 	}
 
 	dependencies {
@@ -14,22 +14,22 @@ dependencyManagement {
 			entry 'hazelcast-client'
 		}
 
-		dependency 'com.h2database:h2:1.4.200'
+		dependency 'com.h2database:h2:1.4.199'
 		dependency 'com.ibm.db2:jcc:11.5.0.0'
 		dependency 'com.microsoft.sqlserver:mssql-jdbc:7.4.1.jre8'
 		dependency 'com.oracle.ojdbc:ojdbc8:19.3.0.0'
-		dependency 'com.zaxxer:HikariCP:3.4.5'
+		dependency 'com.zaxxer:HikariCP:3.4.1'
 		dependency 'edu.umd.cs.mtc:multithreadedtc:1.01'
-		dependency 'io.lettuce:lettuce-core:5.2.2.RELEASE'
+		dependency 'io.lettuce:lettuce-core:5.2.0.RELEASE'
 		dependency 'javax.annotation:javax.annotation-api:1.3.2'
 		dependency 'javax.servlet:javax.servlet-api:4.0.1'
 		dependency 'junit:junit:4.12'
-		dependency 'mysql:mysql-connector-java:8.0.21'
+		dependency 'mysql:mysql-connector-java:8.0.17'
 		dependency 'org.apache.derby:derby:10.14.2.0'
 		dependency 'org.assertj:assertj-core:3.13.2'
-		dependency 'org.hsqldb:hsqldb:2.5.1'
+		dependency 'org.hsqldb:hsqldb:2.5.0'
 		dependency 'org.mariadb.jdbc:mariadb-java-client:2.4.4'
 		dependency 'org.mockito:mockito-core:3.0.0'
-		dependency 'org.postgresql:postgresql:42.2.16'
+		dependency 'org.postgresql:postgresql:42.2.8'
 	}
 }

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

@@ -1,6 +1,6 @@
 dependencyManagement {
 	imports {
-		mavenBom 'com.fasterxml.jackson:jackson-bom:2.10.5'
+		mavenBom 'com.fasterxml.jackson:jackson-bom:2.10.0'
 	}
 
 	dependencies {
@@ -9,15 +9,15 @@ dependencyManagement {
 		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.33.3'
-		dependency 'org.slf4j:jcl-over-slf4j:1.7.30'
-		dependency 'org.slf4j:log4j-over-slf4j:1.7.30'
+		dependency 'org.seleniumhq.selenium:htmlunit-driver:2.33.0'
+		dependency 'org.slf4j:jcl-over-slf4j:1.7.28'
+		dependency 'org.slf4j:log4j-over-slf4j:1.7.28'
 		dependency 'org.webjars:bootstrap:2.3.2'
 		dependency 'org.webjars:html5shiv:3.7.3'
 		dependency 'org.webjars:jquery:1.12.4'
 		dependency 'org.webjars:knockout:2.3.0'
 		dependency 'org.webjars:sockjs-client:0.3.4'
-		dependency 'org.webjars:stomp-websocket:2.3.3'
+		dependency 'org.webjars:stomp-websocket:2.3.0'
 		dependency 'org.webjars:webjars-taglib:0.3'
 	}
 }

spring-session-samples/spring-session-sample-boot-findbyusername/src/integration-test/java/sample/FindByUsernameTests.java

@@ -53,8 +53,6 @@ class FindByUsernameTests {
 
 	private WebDriver driver;
 
-	private WebDriver driver2;
-
 	@BeforeEach
 	void setup() {
 		this.driver = MockMvcHtmlUnitDriverBuilder.mockMvcSetup(this.mockMvc).build();
@@ -63,9 +61,6 @@ class FindByUsernameTests {
 	@AfterEach
 	void tearDown() {
 		this.driver.quit();
-		if (this.driver2 != null) {
-			this.driver2.quit();
-		}
 	}
 
 	@Test
@@ -84,25 +79,6 @@ class FindByUsernameTests {
 		home.terminateButtonDisabled();
 	}
 
-	@Test
-	void terminateOtherSession() throws Exception {
-		HomePage forgotToLogout = home(this.driver);
-
-		this.driver2 = MockMvcHtmlUnitDriverBuilder.mockMvcSetup(this.mockMvc).build();
-		HomePage terminateFogotSession = home(this.driver2);
-		terminateFogotSession.terminateSession(forgotToLogout.getSessionId()).assertAt();
-
-		LoginPage login = HomePage.go(this.driver);
-		login.assertAt();
-	}
-
-	private static HomePage home(WebDriver driver) {
-		LoginPage login = HomePage.go(driver);
-		HomePage home = login.form().login(HomePage.class);
-		home.assertAt();
-		return home;
-	}
-
 	@TestConfiguration
 	static class Config {
 

spring-session-samples/spring-session-sample-boot-findbyusername/src/integration-test/java/sample/pages/HomePage.java

@@ -56,18 +56,6 @@ public class HomePage extends BasePage {
 	}
 
 	public void terminateButtonDisabled() {
-		String sessionId = getSessionId();
-		WebElement element = getDriver().findElement(By.id("terminate-" + sessionId));
-		assertThat(element.isEnabled()).isFalse();
-	}
-
-	public HomePage terminateSession(String sessionId) {
-		WebElement terminate = getDriver().findElement(By.id("terminate-" + sessionId));
-		terminate.click();
-		return new HomePage(getDriver());
-	}
-
-	public String getSessionId() {
 		Set<Cookie> cookies = getDriver().manage().getCookies();
 		String cookieValue = null;
 		for (Cookie cookie : cookies) {
@@ -75,7 +63,8 @@ public class HomePage extends BasePage {
 				cookieValue = new String(Base64.getDecoder().decode(cookie.getValue()));
 			}
 		}
-		return cookieValue;
+		WebElement element = getDriver().findElement(By.id("terminate-" + cookieValue));
+		assertThat(element.isEnabled()).isFalse();
 	}
 
 	public HomePage logout() {

spring-session-samples/spring-session-sample-boot-findbyusername/src/main/java/sample/mvc/IndexController.java

@@ -26,8 +26,8 @@ import org.springframework.session.Session;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 /**
  * Controller for sending the user to the login view.
@@ -50,7 +50,7 @@ public class IndexController {
 	}
 	// end::findbyusername[]
 
-	@PostMapping("/sessions/{sessionIdToDelete}")
+	@RequestMapping(value = "/sessions/{sessionIdToDelete}", method = RequestMethod.DELETE)
 	public String removeSession(Principal principal, @PathVariable String sessionIdToDelete) {
 		Set<String> usersSessionIds = this.sessions.findByPrincipalName(principal.getName()).keySet();
 		if (usersSessionIds.contains(sessionIdToDelete)) {

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

@@ -25,7 +25,7 @@
 				<td th:text="${#temporals.format(sessionElement.lastAccessedTime.atZone(T(java.time.ZoneId).systemDefault()),'dd/MMM/yyyy HH:mm:ss')}"></td>
 				<td th:text="${details?.accessType}"></td>
 				<td>
-					<form th:action="@{'/sessions/' + ${sessionElement.id}}" th:method="post">
+					<form th:action="@{'/sessions/' + ${sessionElement.id}}" th:method="delete">
 						<input th:id="'terminate-' + ${sessionElement.id}" type="submit" value="Terminate" th:disabled="${sessionElement.id == #httpSession.id}"/>
 					</form>
 				</td>