From 967f0f9179e2c8cbdbfbfd2b633362c6b532379b Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 23 May 2024 08:48:24 +0200 Subject: [PATCH] Upgrade to SQL Server 2022-latest. See #1768 --- ci/accept-third-party-license.sh | 6 ++---- spring-data-jdbc/README.adoc | 2 +- .../data/jdbc/testing/MsSqlDataSourceConfiguration.java | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ci/accept-third-party-license.sh b/ci/accept-third-party-license.sh index 0318e62fa..bf25ac7e4 100755 --- a/ci/accept-third-party-license.sh +++ b/ci/accept-third-party-license.sh @@ -1,10 +1,9 @@ #!/bin/sh { - echo "mcr.microsoft.com/mssql/server:2022-CU5-ubuntu-20.04" + echo "mcr.microsoft.com/mssql/server:2022-latest" echo "ibmcom/db2:11.5.7.0a" - echo "harbor-repo.vmware.com/mcr-proxy-cache/mssql/server:2019-CU16-ubuntu-20.04" - echo "harbor-repo.vmware.com/mcr-proxy-cache/mssql/server:2022-CU5-ubuntu-20.04" + echo "harbor-repo.vmware.com/mcr-proxy-cache/mssql/server:2022-latest" echo "harbor-repo.vmware.com/dockerhub-proxy-cache/ibmcom/db2:11.5.7.0a" } > spring-data-jdbc/src/test/resources/container-license-acceptance.txt @@ -12,6 +11,5 @@ echo "mcr.microsoft.com/mssql/server:2022-latest" echo "ibmcom/db2:11.5.7.0a" echo "harbor-repo.vmware.com/mcr-proxy-cache/mssql/server:2022-latest" - echo "harbor-repo.vmware.com/mcr-proxy-cache/mssql/server:2022-CU5-ubuntu-20.04" echo "harbor-repo.vmware.com/dockerhub-proxy-cache/ibmcom/db2:11.5.7.0a" } > spring-data-r2dbc/src/test/resources/container-license-acceptance.txt diff --git a/spring-data-jdbc/README.adoc b/spring-data-jdbc/README.adoc index 930997c00..c793f9ade 100644 --- a/spring-data-jdbc/README.adoc +++ b/spring-data-jdbc/README.adoc @@ -69,7 +69,7 @@ In order to accept the EULA, please add a file named `container-license-acceptan At the time of this writing this would be ``` -mcr.microsoft.com/mssql/server:2022-CU5-ubuntu-20.04 +mcr.microsoft.com/mssql/server:2022-latest ibmcom/db2:11.5.7.0a ``` diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MsSqlDataSourceConfiguration.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MsSqlDataSourceConfiguration.java index 727a155fc..43fb9f141 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MsSqlDataSourceConfiguration.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MsSqlDataSourceConfiguration.java @@ -38,7 +38,7 @@ import com.microsoft.sqlserver.jdbc.SQLServerDataSource; @ConditionalOnDatabase(DatabaseType.SQL_SERVER) public class MsSqlDataSourceConfiguration extends DataSourceConfiguration { - public static final String MS_SQL_SERVER_VERSION = "mcr.microsoft.com/mssql/server:2022-CU5-ubuntu-20.04"; + public static final String MS_SQL_SERVER_VERSION = "mcr.microsoft.com/mssql/server:2022-latest"; private static MSSQLServerContainer MSSQL_CONTAINER; public MsSqlDataSourceConfiguration(TestClass testClass, Environment environment) {