Update integration tests

This commit updates TestContainers dependency and versions of Docker images used in integration tests.
2018-01-02 21:20:26 +01:00
parent 2fccca1158
commit c4daeff3d8
15 changed files with 33 additions and 30 deletions
--- a/samples/boot/findbyusername/src/integration-test/java/sample/FindByUsernameTests.java
+++ b/samples/boot/findbyusername/src/integration-test/java/sample/FindByUsernameTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr
@ContextConfiguration(initializers = FindByUsernameTests.Initializer.class)
 public class FindByUsernameTests {

-	private static final String DOCKER_IMAGE = "redis:4.0.2";
+	private static final String DOCKER_IMAGE = "redis:4.0.6";

 	@ClassRule
 	public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)
--- a/samples/boot/redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java
+++ b/samples/boot/redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -53,7 +53,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@ContextConfiguration(initializers = HttpRedisJsonTest.Initializer.class)
 public class HttpRedisJsonTest {

-	private static final String DOCKER_IMAGE = "redis:4.0.2";
+	private static final String DOCKER_IMAGE = "redis:4.0.6";

 	@ClassRule
 	public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)
--- a/samples/boot/redis-json/src/integration-test/java/sample/RedisSerializerTest.java
+++ b/samples/boot/redis-json/src/integration-test/java/sample/RedisSerializerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@ContextConfiguration(initializers = RedisSerializerTest.Initializer.class)
 public class RedisSerializerTest {

-	private static final String DOCKER_IMAGE = "redis:4.0.2";
+	private static final String DOCKER_IMAGE = "redis:4.0.6";

 	@ClassRule
 	public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)
--- a/samples/boot/redis/src/integration-test/java/sample/BootTests.java
+++ b/samples/boot/redis/src/integration-test/java/sample/BootTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr
@ContextConfiguration(initializers = BootTests.Initializer.class)
 public class BootTests {

-	private static final String DOCKER_IMAGE = "redis:4.0.2";
+	private static final String DOCKER_IMAGE = "redis:4.0.6";

 	@ClassRule
 	public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)
--- a/samples/boot/webflux/src/integration-test/java/sample/AttributeTests.java
+++ b/samples/boot/webflux/src/integration-test/java/sample/AttributeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@ContextConfiguration(initializers = AttributeTests.Initializer.class)
 public class AttributeTests {

-	private static final String DOCKER_IMAGE = "redis:4.0.2";
+	private static final String DOCKER_IMAGE = "redis:4.0.6";

 	@ClassRule
 	public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)
--- a/samples/boot/websocket/src/test/java/sample/ApplicationTests.java
+++ b/samples/boot/websocket/src/test/java/sample/ApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ import org.springframework.web.socket.sockjs.client.WebSocketTransport;
@ContextConfiguration(initializers = ApplicationTests.Initializer.class)
 public class ApplicationTests {

-	private static final String DOCKER_IMAGE = "redis:4.0.2";
+	private static final String DOCKER_IMAGE = "redis:4.0.6";

 	@ClassRule
 	public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)
--- a/samples/javaconfig/custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java
+++ b/samples/javaconfig/custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
@Profile("embedded-redis")
 public class EmbeddedRedisConfig {

-	private static final String REDIS_DOCKER_IMAGE = "redis:4.0.2";
+	private static final String REDIS_DOCKER_IMAGE = "redis:4.0.6";

 	@Bean(initMethod = "start")
 	public GenericContainer redisContainer() {
--- a/samples/javaconfig/redis/src/main/java/sample/EmbeddedRedisConfig.java
+++ b/samples/javaconfig/redis/src/main/java/sample/EmbeddedRedisConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
@Profile("embedded-redis")
 public class EmbeddedRedisConfig {

-	private static final String REDIS_DOCKER_IMAGE = "redis:4.0.2";
+	private static final String REDIS_DOCKER_IMAGE = "redis:4.0.6";

 	@Bean(initMethod = "start")
 	public GenericContainer redisContainer() {
--- a/samples/javaconfig/rest/src/integration-test/java/rest/RestMockMvcTests.java
+++ b/samples/javaconfig/rest/src/integration-test/java/rest/RestMockMvcTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@WebAppConfiguration
 public class RestMockMvcTests {

-	private static final String DOCKER_IMAGE = "redis:4.0.2";
+	private static final String DOCKER_IMAGE = "redis:4.0.6";

 	@ClassRule
 	public static GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)
--- a/samples/javaconfig/rest/src/main/java/sample/EmbeddedRedisConfig.java
+++ b/samples/javaconfig/rest/src/main/java/sample/EmbeddedRedisConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
@Profile("embedded-redis")
 public class EmbeddedRedisConfig {

-	private static final String REDIS_DOCKER_IMAGE = "redis:4.0.2";
+	private static final String REDIS_DOCKER_IMAGE = "redis:4.0.6";

 	@Bean(initMethod = "start")
 	public GenericContainer redisContainer() {
--- a/samples/javaconfig/security/src/main/java/sample/EmbeddedRedisConfig.java
+++ b/samples/javaconfig/security/src/main/java/sample/EmbeddedRedisConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
@Profile("embedded-redis")
 public class EmbeddedRedisConfig {

-	private static final String REDIS_DOCKER_IMAGE = "redis:4.0.2";
+	private static final String REDIS_DOCKER_IMAGE = "redis:4.0.6";

 	@Bean(initMethod = "start")
 	public GenericContainer redisContainer() {
--- a/samples/xml/redis/src/main/java/sample/EmbeddedRedisConfig.java
+++ b/samples/xml/redis/src/main/java/sample/EmbeddedRedisConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
@Profile("embedded-redis")
 public class EmbeddedRedisConfig {

-	private static final String REDIS_DOCKER_IMAGE = "redis:4.0.2";
+	private static final String REDIS_DOCKER_IMAGE = "redis:4.0.6";

 	@Bean(initMethod = "start")
 	public GenericContainer redisContainer() {