diff --git a/ci/accept-third-party-license.sh b/ci/accept-third-party-license.sh index 2b3bc933e..f1650edf9 100755 --- a/ci/accept-third-party-license.sh +++ b/ci/accept-third-party-license.sh @@ -1,6 +1,6 @@ #!/bin/sh { - echo "mcr.microsoft.com/mssql/server:2017-CU12" + echo "mcr.microsoft.com/mssql/server:2019-CU16-ubuntu-20.04" echo "ibmcom/db2:11.5.7.0a" } > spring-data-jdbc/src/test/resources/container-license-acceptance.txt diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/LicenseListener.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/LicenseListener.java index bb01f4697..d81c72bf1 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/LicenseListener.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/LicenseListener.java @@ -25,6 +25,8 @@ import org.testcontainers.containers.Db2Container; import org.testcontainers.containers.MSSQLServerContainer; import org.testcontainers.utility.LicenseAcceptance; +import static org.springframework.data.jdbc.testing.MsSqlDataSourceConfiguration.*; + /** * {@link TestExecutionListener} to selectively skip tests if the license for a particular database container was not * accepted. @@ -47,7 +49,7 @@ public class LicenseListener implements TestExecutionListener { } if (environment.acceptsProfiles(Profiles.of("mssql"))) { - assumeLicenseAccepted(MSSQLServerContainer.IMAGE + ":" + MSSQLServerContainer.DEFAULT_TAG); + assumeLicenseAccepted(MS_SQL_SERVER_VERSION); } } 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 3a36ceb9a..d82afc280 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 @@ -39,6 +39,7 @@ import com.microsoft.sqlserver.jdbc.SQLServerDataSource; @Profile({"mssql"}) public class MsSqlDataSourceConfiguration extends DataSourceConfiguration { + public static final String MS_SQL_SERVER_VERSION = "mcr.microsoft.com/mssql/server:2019-CU16-ubuntu-20.04"; private static MSSQLServerContainer MSSQL_CONTAINER; @Override @@ -46,7 +47,7 @@ public class MsSqlDataSourceConfiguration extends DataSourceConfiguration { if (MSSQL_CONTAINER == null) { - MSSQLServerContainer container = new MSSQLServerContainer<>() // + MSSQLServerContainer container = new MSSQLServerContainer<>(MS_SQL_SERVER_VERSION) // .withReuse(true); container.start();