Merge branch '3.2.x' into 3.3.x

rwinch · rwinch · commit e6bbf7ed7af5 · 2024-09-26T10:52:24.000-05:00
Closes gh-3218
diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java
@@ -55,7 +55,7 @@ static JdbcDatabaseContainer<?> postgreSql() {
 	}
 
 	static JdbcDatabaseContainer<?> sqlServer() {
-		return new MSSQLServerContainerProvider().newInstance("2019-CU17-ubuntu-20.04");
+		return new MSSQLServerContainerProvider().newInstance("2022-CU14-ubuntu-22.04");
 	}
 
 }
diff --git a/spring-session-jdbc/src/integration-test/resources/container-license-acceptance.txt b/spring-session-jdbc/src/integration-test/resources/container-license-acceptance.txt
@@ -1,2 +1,2 @@
 ibmcom/db2:11.5.7.0a
-mcr.microsoft.com/mssql/server:2019-CU17-ubuntu-20.04
+mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ static JdbcDatabaseContainer<?> postgreSql() {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`static JdbcDatabaseContainer<?> sqlServer() {`
`58`		`- return new MSSQLServerContainerProvider().newInstance("2019-CU17-ubuntu-20.04");`
	`58`	`+ return new MSSQLServerContainerProvider().newInstance("2022-CU14-ubuntu-22.04");`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`ibmcom/db2:11.5.7.0a`
`2`		`-mcr.microsoft.com/mssql/server:2019-CU17-ubuntu-20.04`
	`2`	`+mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04`