Release 2.5.1

This reverts commit c800c7af40.

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

@@ -1,9 +1,9 @@
-name: CI
+name: 2.5.x CI
 
 on:
   push:
     branches:
-      - main
+      - 2.5.x
   schedule:
     - cron: '0 10 * * *' # Once per day at 10am UTC
   workflow_dispatch: # Manual trigger

.github/workflows/pr-build-workflow.yml

@@ -1,6 +1,9 @@
-name: PR Build
+name: 2.5.x PR Build
 
-on: pull_request
+on:
+  pull_request:
+    branches:
+      - 2.5.x
 
 jobs:
   build:

build.gradle

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

gradle/dependency-management.gradle

@@ -2,9 +2,9 @@ dependencyManagement {
 	imports {
 		mavenBom 'io.projectreactor:reactor-bom:2020.0.7'
 		mavenBom 'org.junit:junit-bom:5.7.2'
-		mavenBom 'org.springframework:spring-framework-bom:5.3.7'
+		mavenBom 'org.springframework:spring-framework-bom:5.3.8'
 		mavenBom 'org.springframework.data:spring-data-bom:2021.0.1'
-		mavenBom 'org.springframework.security:spring-security-bom:5.5.0'
+		mavenBom 'org.springframework.security:spring-security-bom:5.5.1'
 		mavenBom 'org.testcontainers:testcontainers-bom:1.15.3'
 	}
 
@@ -28,9 +28,9 @@ dependencyManagement {
 		dependency 'mysql:mysql-connector-java:8.0.25'
 		dependency 'org.apache.derby:derby:10.14.2.0'
 		dependency 'org.assertj:assertj-core:3.19.0'
-		dependency 'org.hsqldb:hsqldb:2.5.1'
+		dependency 'org.hsqldb:hsqldb:2.5.2'
 		dependency 'org.mariadb.jdbc:mariadb-java-client:2.7.3'
 		dependency 'org.mockito:mockito-core:3.10.0'
-		dependency 'org.postgresql:postgresql:42.2.20'
+		dependency 'org.postgresql:postgresql:42.2.22'
 	}
 }

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

@@ -42,7 +42,7 @@ final class DatabaseContainers {
 	}
 
 	static MariaDBContainer<?> mariaDb() {
-		return new MariaDBContainer<>("mariadb:10.6.0");
+		return new MariaDBContainer<>("mariadb:10.6.2");
 	}
 
 	static MySQLContainer<?> mySql() {

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

@@ -10,8 +10,8 @@ dependencyManagement {
 		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.49.1'
-		dependency 'org.slf4j:jcl-over-slf4j:1.7.30'
+		dependency 'org.slf4j:jcl-over-slf4j:1.7.31'
-		dependency 'org.slf4j:log4j-over-slf4j:1.7.30'
+		dependency 'org.slf4j:log4j-over-slf4j:1.7.31'
 		dependency 'org.webjars:bootstrap:2.3.2'
 		dependency 'org.webjars:html5shiv:3.7.3-1'
 		dependency 'org.webjars:jquery:3.6.0'