Skip to content

Commit 555abb3

Browse files
committed
Update MSSQL
1 parent 267312d commit 555abb3

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/mssql/DockerMSSQLDatabaseProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public DatabaseInstance load(DatabaseConfig config) {
7777
private final ClientConfig clientConfig;
7878

7979
public DockerMSSQLDatabaseProvider(Environment environment, ObjectProvider<List<MSSQLServerContainerCustomizer>> containerCustomizers) {
80-
String dockerImage = environment.getProperty("zonky.test.database.mssql.docker.image", "mcr.microsoft.com/mssql/server:2017-latest");
80+
String dockerImage = environment.getProperty("zonky.test.database.mssql.docker.image", "mcr.microsoft.com/mssql/server:2022-latest");
8181
Map<String, String> connectProperties = PropertyUtils.extractAll(environment, "zonky.test.database.mssql.client.properties");
8282
List<MSSQLServerContainerCustomizer> customizers = Optional.ofNullable(containerCustomizers.getIfAvailable()).orElse(emptyList());
8383

embedded-database-spring-test/src/main/resources/META-INF/spring-configuration-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
"name": "zonky.test.database.mssql.docker.image",
143143
"type": "java.lang.String",
144144
"description": "Docker image containing MSSQL database.",
145-
"defaultValue": "mcr.microsoft.com/mssql/server:2017-latest"
145+
"defaultValue": "mcr.microsoft.com/mssql/server:2022-latest"
146146
},
147147
{
148148
"name": "zonky.test.database.mysql.client.properties",

embedded-database-spring-test/src/test/java/io/zonky/test/db/provider/DockerMSSQLProviderWithConfigurationIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
@Category(MSSQLTestSuite.class)
2929
@AutoConfigureEmbeddedDatabase(type = MSSQL)
3030
@TestPropertySource(properties = {
31-
"zonky.test.database.mssql.docker.image=mcr.microsoft.com/mssql/server:2017-CU20"
31+
"zonky.test.database.mssql.docker.image=mcr.microsoft.com/mssql/server:2022-CU14"
3232
})
3333
@ContextConfiguration
3434
public class DockerMSSQLProviderWithConfigurationIntegrationTest {

embedded-database-spring-test/src/test/java/io/zonky/test/db/provider/mssql/DockerMSSQLDatabaseProviderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public void providersWithDifferentCustomizersShouldNotEquals() {
118118
@Test
119119
public void testConfigurationProperties() throws Exception {
120120
MockEnvironment environment = new MockEnvironment();
121-
environment.setProperty("zonky.test.database.mssql.docker.image", "mcr.microsoft.com/mssql/server:2017-CU20");
121+
environment.setProperty("zonky.test.database.mssql.docker.image", "mcr.microsoft.com/mssql/server:2022-CU14");
122122
environment.setProperty("zonky.test.database.mssql.client.properties.queryTimeout", "30");
123123
environment.setProperty("zonky.test.database.mssql.client.properties.description", "test description");
124124
environment.setProperty("zonky.test.database.mssql.client.properties.sendTimeAsDatetime", "false");
@@ -197,4 +197,4 @@ private static int getPort(DataSource dataSource) throws SQLException {
197197
private static MSSQLServerContainerCustomizer mssqlContainerCustomizer(long timeout) {
198198
return container -> container.withStartupTimeout(Duration.ofSeconds(timeout));
199199
}
200-
}
200+
}

0 commit comments

Comments
 (0)