diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 1ebab095..e376ebd8 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -5,7 +5,7 @@ dependencyManagement { mavenBom 'org.springframework:spring-framework-bom:5.0.7.RELEASE' mavenBom 'org.springframework.data:spring-data-releasetrain:Kay-SR8' mavenBom 'org.springframework.security:spring-security-bom:5.0.6.RELEASE' - mavenBom 'org.testcontainers:testcontainers-bom:1.7.3' + mavenBom 'org.testcontainers:testcontainers-bom:1.8.1' } dependencies { diff --git a/samples/boot/findbyusername/src/integration-test/java/sample/FindByUsernameTests.java b/samples/boot/findbyusername/src/integration-test/java/sample/FindByUsernameTests.java index 7ffa9b22..8cb00a8c 100644 --- a/samples/boot/findbyusername/src/integration-test/java/sample/FindByUsernameTests.java +++ b/samples/boot/findbyusername/src/integration-test/java/sample/FindByUsernameTests.java @@ -46,7 +46,7 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr @SpringBootTest(webEnvironment = WebEnvironment.MOCK) public class FindByUsernameTests { - private static final String DOCKER_IMAGE = "redis:4.0.9"; + private static final String DOCKER_IMAGE = "redis:4.0.10"; @Autowired private MockMvc mockMvc; diff --git a/samples/boot/redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java b/samples/boot/redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java index 736b7264..df607165 100644 --- a/samples/boot/redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java +++ b/samples/boot/redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java @@ -50,7 +50,7 @@ import static org.assertj.core.api.Assertions.assertThat; @AutoConfigureMockMvc public class HttpRedisJsonTest { - private static final String DOCKER_IMAGE = "redis:4.0.9"; + private static final String DOCKER_IMAGE = "redis:4.0.10"; @Autowired private MockMvc mockMvc; diff --git a/samples/boot/redis-json/src/integration-test/java/sample/RedisSerializerTest.java b/samples/boot/redis-json/src/integration-test/java/sample/RedisSerializerTest.java index cb40fb39..5c42166d 100644 --- a/samples/boot/redis-json/src/integration-test/java/sample/RedisSerializerTest.java +++ b/samples/boot/redis-json/src/integration-test/java/sample/RedisSerializerTest.java @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest public class RedisSerializerTest { - private static final String DOCKER_IMAGE = "redis:4.0.9"; + private static final String DOCKER_IMAGE = "redis:4.0.10"; @SpringSessionRedisOperations private RedisTemplate sessionRedisTemplate; diff --git a/samples/boot/redis/src/integration-test/java/sample/BootTests.java b/samples/boot/redis/src/integration-test/java/sample/BootTests.java index f6cdb169..7127d22f 100644 --- a/samples/boot/redis/src/integration-test/java/sample/BootTests.java +++ b/samples/boot/redis/src/integration-test/java/sample/BootTests.java @@ -45,7 +45,7 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr @SpringBootTest(webEnvironment = WebEnvironment.MOCK) public class BootTests { - private static final String DOCKER_IMAGE = "redis:4.0.9"; + private static final String DOCKER_IMAGE = "redis:4.0.10"; @Autowired private MockMvc mockMvc; diff --git a/samples/boot/webflux/src/integration-test/java/sample/AttributeTests.java b/samples/boot/webflux/src/integration-test/java/sample/AttributeTests.java index 32b12ed8..aa64e5b6 100644 --- a/samples/boot/webflux/src/integration-test/java/sample/AttributeTests.java +++ b/samples/boot/webflux/src/integration-test/java/sample/AttributeTests.java @@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) public class AttributeTests { - private static final String DOCKER_IMAGE = "redis:4.0.9"; + private static final String DOCKER_IMAGE = "redis:4.0.10"; @LocalServerPort private int port; diff --git a/samples/boot/websocket/src/test/java/sample/ApplicationTests.java b/samples/boot/websocket/src/test/java/sample/ApplicationTests.java index e03f2c9e..0b1325c3 100644 --- a/samples/boot/websocket/src/test/java/sample/ApplicationTests.java +++ b/samples/boot/websocket/src/test/java/sample/ApplicationTests.java @@ -52,7 +52,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) public class ApplicationTests { - private static final String DOCKER_IMAGE = "redis:4.0.9"; + private static final String DOCKER_IMAGE = "redis:4.0.10"; @Value("${local.server.port}") private String port; diff --git a/samples/javaconfig/custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java b/samples/javaconfig/custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java index 57563183..72d54c99 100644 --- a/samples/javaconfig/custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java +++ b/samples/javaconfig/custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java @@ -28,7 +28,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor @Profile("embedded-redis") public class EmbeddedRedisConfig { - private static final String DOCKER_IMAGE = "redis:4.0.9"; + private static final String DOCKER_IMAGE = "redis:4.0.10"; @Bean public GenericContainer redisContainer() { diff --git a/samples/javaconfig/redis/src/main/java/sample/EmbeddedRedisConfig.java b/samples/javaconfig/redis/src/main/java/sample/EmbeddedRedisConfig.java index 57563183..72d54c99 100644 --- a/samples/javaconfig/redis/src/main/java/sample/EmbeddedRedisConfig.java +++ b/samples/javaconfig/redis/src/main/java/sample/EmbeddedRedisConfig.java @@ -28,7 +28,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor @Profile("embedded-redis") public class EmbeddedRedisConfig { - private static final String DOCKER_IMAGE = "redis:4.0.9"; + private static final String DOCKER_IMAGE = "redis:4.0.10"; @Bean public GenericContainer redisContainer() { diff --git a/samples/javaconfig/rest/src/integration-test/java/rest/RestMockMvcTests.java b/samples/javaconfig/rest/src/integration-test/java/rest/RestMockMvcTests.java index 09a8ae2f..534e23ca 100644 --- a/samples/javaconfig/rest/src/integration-test/java/rest/RestMockMvcTests.java +++ b/samples/javaconfig/rest/src/integration-test/java/rest/RestMockMvcTests.java @@ -54,7 +54,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @WebAppConfiguration public class RestMockMvcTests { - private static final String DOCKER_IMAGE = "redis:4.0.9"; + private static final String DOCKER_IMAGE = "redis:4.0.10"; @Autowired private SessionRepositoryFilter sessionRepositoryFilter; diff --git a/samples/javaconfig/rest/src/main/java/sample/EmbeddedRedisConfig.java b/samples/javaconfig/rest/src/main/java/sample/EmbeddedRedisConfig.java index 57563183..72d54c99 100644 --- a/samples/javaconfig/rest/src/main/java/sample/EmbeddedRedisConfig.java +++ b/samples/javaconfig/rest/src/main/java/sample/EmbeddedRedisConfig.java @@ -28,7 +28,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor @Profile("embedded-redis") public class EmbeddedRedisConfig { - private static final String DOCKER_IMAGE = "redis:4.0.9"; + private static final String DOCKER_IMAGE = "redis:4.0.10"; @Bean public GenericContainer redisContainer() { diff --git a/samples/javaconfig/security/src/main/java/sample/EmbeddedRedisConfig.java b/samples/javaconfig/security/src/main/java/sample/EmbeddedRedisConfig.java index 57563183..72d54c99 100644 --- a/samples/javaconfig/security/src/main/java/sample/EmbeddedRedisConfig.java +++ b/samples/javaconfig/security/src/main/java/sample/EmbeddedRedisConfig.java @@ -28,7 +28,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor @Profile("embedded-redis") public class EmbeddedRedisConfig { - private static final String DOCKER_IMAGE = "redis:4.0.9"; + private static final String DOCKER_IMAGE = "redis:4.0.10"; @Bean public GenericContainer redisContainer() { diff --git a/samples/xml/redis/src/main/java/sample/EmbeddedRedisConfig.java b/samples/xml/redis/src/main/java/sample/EmbeddedRedisConfig.java index 57563183..72d54c99 100644 --- a/samples/xml/redis/src/main/java/sample/EmbeddedRedisConfig.java +++ b/samples/xml/redis/src/main/java/sample/EmbeddedRedisConfig.java @@ -28,7 +28,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor @Profile("embedded-redis") public class EmbeddedRedisConfig { - private static final String DOCKER_IMAGE = "redis:4.0.9"; + private static final String DOCKER_IMAGE = "redis:4.0.10"; @Bean public GenericContainer redisContainer() { diff --git a/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/AbstractRedisITests.java b/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/AbstractRedisITests.java index 52b0dccb..0f6cd99d 100644 --- a/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/AbstractRedisITests.java +++ b/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/AbstractRedisITests.java @@ -29,7 +29,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor */ public abstract class AbstractRedisITests { - private static final String DOCKER_IMAGE = "redis:4.0.9"; + private static final String DOCKER_IMAGE = "redis:4.0.10"; protected static class BaseConfig { diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb10JdbcOperationsSessionRepositoryITests.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb10JdbcOperationsSessionRepositoryITests.java index c308b60c..0a1e55c8 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb10JdbcOperationsSessionRepositoryITests.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/MariaDb10JdbcOperationsSessionRepositoryITests.java @@ -86,7 +86,7 @@ public class MariaDb10JdbcOperationsSessionRepositoryITests private static class MariaDb10Container extends MariaDBContainer { MariaDb10Container() { - super("mariadb:10.3.7"); + super("mariadb:10.3.8"); } @Override diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/SqlServerJdbcOperationsSessionRepositoryITests.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/SqlServerJdbcOperationsSessionRepositoryITests.java index 37a520b9..1269650e 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/SqlServerJdbcOperationsSessionRepositoryITests.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/SqlServerJdbcOperationsSessionRepositoryITests.java @@ -21,7 +21,6 @@ import javax.sql.DataSource; import com.microsoft.sqlserver.jdbc.SQLServerDataSource; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.runner.RunWith; import org.testcontainers.containers.MSSQLServerContainer; @@ -40,7 +39,6 @@ import org.springframework.test.context.web.WebAppConfiguration; * * @author Vedran Pavic */ -@Ignore @RunWith(SpringRunner.class) @WebAppConfiguration @ContextConfiguration @@ -88,12 +86,9 @@ public class SqlServerJdbcOperationsSessionRepositoryITests extends MSSQLServerContainer { SqlServer2007Container() { - super("microsoft/mssql-server-linux:2017-CU7"); - } - - @Override - protected int getStartupTimeoutSeconds() { - return 240; + super("microsoft/mssql-server-linux:2017-CU8"); + withStartupTimeoutSeconds(240); + withConnectTimeoutSeconds(240); } } 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 new file mode 100644 index 00000000..f9c54354 --- /dev/null +++ b/spring-session-jdbc/src/integration-test/resources/container-license-acceptance.txt @@ -0,0 +1 @@ +microsoft/mssql-server-linux:2017-CU8