Release 2.1.9.RELEASE

Update integration tests
Upgrade test dependencies
2019-09-30 22:31:35 -05:00 · 2019-09-30 22:24:26 +02:00 · 2019-09-30 22:07:08 +02:00 · 2019-09-30 13:23:12 +02:00 · 2019-09-29 11:47:55 +02:00 · 2019-09-24 21:06:00 +02:00
21 changed files with 56 additions and 36 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
 		snapshotBuild = version.endsWith('SNAPSHOT')
 		milestoneBuild = !(releaseBuild || snapshotBuild)

-		springBootVersion = '2.1.6.RELEASE'
+		springBootVersion = '2.1.8.RELEASE'
 	}

 	repositories {
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=2.1.8.RELEASE
+version=2.1.9.RELEASE
--- a/gradle/dependency-management.gradle
+++ b/gradle/dependency-management.gradle
@@ -1,9 +1,8 @@
 dependencyManagement {
 	imports {
-		mavenBom 'com.fasterxml.jackson:jackson-bom:2.9.6'
-		mavenBom 'io.projectreactor:reactor-bom:Californium-SR10'
-		mavenBom 'org.springframework:spring-framework-bom:5.1.9.RELEASE'
-		mavenBom 'org.springframework.data:spring-data-releasetrain:Lovelace-SR10'
+		mavenBom 'io.projectreactor:reactor-bom:Californium-SR12'
+		mavenBom 'org.springframework:spring-framework-bom:5.1.10.RELEASE'
+		mavenBom 'org.springframework.data:spring-data-releasetrain:Lovelace-SR11'
 		mavenBom 'org.springframework.security:spring-security-bom:5.1.5.RELEASE'
 		mavenBom 'org.testcontainers:testcontainers-bom:1.12.0'
 	}
@@ -16,9 +15,9 @@ dependencyManagement {

 		dependency 'com.h2database:h2:1.4.199'
 		dependency 'com.microsoft.sqlserver:mssql-jdbc:7.4.1.jre8'
-		dependency 'com.zaxxer:HikariCP:3.3.1'
+		dependency 'com.zaxxer:HikariCP:3.4.1'
 		dependency 'edu.umd.cs.mtc:multithreadedtc:1.01'
-		dependency 'io.lettuce:lettuce-core:5.1.8.RELEASE'
+		dependency 'io.lettuce:lettuce-core:5.2.0.RELEASE'
 		dependency 'javax.annotation:javax.annotation-api:1.3.2'
 		dependency 'javax.servlet:javax.servlet-api:4.0.1'
 		dependency 'junit:junit:4.12'
@@ -26,8 +25,8 @@ dependencyManagement {
 		dependency 'org.apache.derby:derby:10.14.2.0'
 		dependency 'org.assertj:assertj-core:3.13.2'
 		dependency 'org.hsqldb:hsqldb:2.5.0'
-		dependency 'org.mariadb.jdbc:mariadb-java-client:2.4.3'
+		dependency 'org.mariadb.jdbc:mariadb-java-client:2.4.4'
 		dependency 'org.mockito:mockito-core:3.0.0'
-		dependency 'org.postgresql:postgresql:42.2.6'
+		dependency 'org.postgresql:postgresql:42.2.8'
 	}
 }
--- 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:5.0.5";
+	private static final String DOCKER_IMAGE = "redis:5.0.6";

 	@Autowired
 	private MockMvc mockMvc;
--- 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:5.0.5";
+	private static final String DOCKER_IMAGE = "redis:5.0.6";

 	@Autowired
 	private MockMvc mockMvc;
--- 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:5.0.5";
+	private static final String DOCKER_IMAGE = "redis:5.0.6";

 	@SpringSessionRedisOperations
 	private RedisTemplate<Object, Object> sessionRedisTemplate;
--- 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:5.0.5";
+	private static final String DOCKER_IMAGE = "redis:5.0.6";

 	@Autowired
 	private MockMvc mockMvc;
--- 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:5.0.5";
+	private static final String DOCKER_IMAGE = "redis:5.0.6";

 	@LocalServerPort
 	private int port;
--- a/samples/boot/websocket/src/integration-test/java/sample/ApplicationTests.java
+++ b/samples/boot/websocket/src/integration-test/java/sample/ApplicationTests.java
@@ -52,7 +52,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 public class ApplicationTests {

-	private static final String DOCKER_IMAGE = "redis:5.0.5";
+	private static final String DOCKER_IMAGE = "redis:5.0.6";

 	@Value("${local.server.port}")
 	private String port;
--- a/samples/gradle/dependency-management.gradle
+++ b/samples/gradle/dependency-management.gradle
@@ -1,13 +1,17 @@
 dependencyManagement {
+	imports {
+		mavenBom 'com.fasterxml.jackson:jackson-bom:2.10.0'
+	}
+
 	dependencies {
 		dependency 'ch.qos.logback:logback-classic:1.2.3'
 		dependency 'com.maxmind.geoip2:geoip2:2.3.1'
-		dependency 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1'
-		dependency 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02'
+		dependency 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.2'
+		dependency 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.3'
 		dependency 'org.apache.taglibs:taglibs-standard-jstlel:1.2.5'
-		dependency 'org.seleniumhq.selenium:htmlunit-driver:2.32.0'
-		dependency 'org.slf4j:jcl-over-slf4j:1.7.25'
-		dependency 'org.slf4j:log4j-over-slf4j:1.7.25'
+		dependency 'org.seleniumhq.selenium:htmlunit-driver:2.33.0'
+		dependency 'org.slf4j:jcl-over-slf4j:1.7.28'
+		dependency 'org.slf4j:log4j-over-slf4j:1.7.28'
 		dependency 'org.webjars:bootstrap:2.3.2'
 		dependency 'org.webjars:html5shiv:3.7.3'
 		dependency 'org.webjars:jquery:1.12.4'
--- 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:5.0.5";
+	private static final String DOCKER_IMAGE = "redis:5.0.6";

 	@Bean
 	public GenericContainer redisContainer() {
--- 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:5.0.5";
+	private static final String DOCKER_IMAGE = "redis:5.0.6";

 	@Bean
 	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
@@ -54,7 +54,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@WebAppConfiguration
 public class RestMockMvcTests {

-	private static final String DOCKER_IMAGE = "redis:5.0.5";
+	private static final String DOCKER_IMAGE = "redis:5.0.6";

 	@Autowired
 	private SessionRepositoryFilter<? extends Session> sessionRepositoryFilter;
--- 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:5.0.5";
+	private static final String DOCKER_IMAGE = "redis:5.0.6";

 	@Bean
 	public GenericContainer redisContainer() {
--- 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:5.0.5";
+	private static final String DOCKER_IMAGE = "redis:5.0.6";

 	@Bean
 	public GenericContainer redisContainer() {
--- 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:5.0.5";
+	private static final String DOCKER_IMAGE = "redis:5.0.6";

 	@Bean
 	public GenericContainer redisContainer() {
--- a/spring-session-core/src/main/java/org/springframework/session/web/http/OnCommittedResponseWrapper.java
+++ b/spring-session-core/src/main/java/org/springframework/session/web/http/OnCommittedResponseWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -68,6 +68,12 @@ abstract class OnCommittedResponseWrapper extends HttpServletResponseWrapper {
 		super.addHeader(name, value);
 	}

+	@Override
+	public void setContentLengthLong(long len) {
+		setContentLength(len);
+		super.setContentLengthLong(len);
+	}
+
 	@Override
 	public void setContentLength(int len) {
 		setContentLength((long) len);
--- a/spring-session-core/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java
+++ b/spring-session-core/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -1102,6 +1102,17 @@ public class OnCommittedResponseWrapperTests {
 		assertThat(this.committed).isTrue();
 	}

+	// gh-7261
+	@Test
+	public void contentLengthLongOutputStreamWriteStringCommits() throws IOException {
+		String body = "something";
+		this.response.setContentLengthLong(body.length());
+
+		this.response.getOutputStream().print(body);
+
+		assertThat(this.committed).isTrue();
+	}
+
 	@Test
 	public void bufferSizeCommitsOnce() throws Exception {
 		String expected = "1234567890";
--- 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:5.0.5";
+	private static final String DOCKER_IMAGE = "redis:5.0.6";

 	protected static class BaseConfig {

--- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java
+++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java
@@ -88,7 +88,7 @@ final class DatabaseContainers {
 	private static class MariaDb10Container extends MariaDBContainer<MariaDb10Container> {

 		MariaDb10Container() {
-			super("mariadb:10.4.7");
+			super("mariadb:10.4.8");
 		}

 		@Override
@@ -143,7 +143,7 @@ final class DatabaseContainers {
 			extends PostgreSQLContainer<PostgreSql9Container> {

 		PostgreSql9Container() {
-			super("postgres:9.6.14");
+			super("postgres:9.6.15");
 		}

 	}
@@ -152,7 +152,7 @@ final class DatabaseContainers {
 			extends PostgreSQLContainer<PostgreSql10Container> {

 		PostgreSql10Container() {
-			super("postgres:10.9");
+			super("postgres:10.10");
 		}

 	}
@@ -161,7 +161,7 @@ final class DatabaseContainers {
 			extends PostgreSQLContainer<PostgreSql11Container> {

 		PostgreSql11Container() {
-			super("postgres:11.4");
+			super("postgres:11.5");
 		}

 	}
@@ -170,7 +170,7 @@ final class DatabaseContainers {
 			extends MSSQLServerContainer<SqlServer2017Container> {

 		SqlServer2017Container() {
-			super("mcr.microsoft.com/mssql/server:2017-cu16");
+			super("mcr.microsoft.com/mssql/server:2017-CU16");
 		}

 	}
--- a/spring-session-jdbc/src/integration-test/resources/container-license-acceptance.txt
+++ b/spring-session-jdbc/src/integration-test/resources/container-license-acceptance.txt
@@ -1 +1 @@
-mcr.microsoft.com/mssql/server:2017-cu16
+mcr.microsoft.com/mssql/server:2017-CU16
Author	SHA1	Message	Date
Rob Winch	b7857db5bb	Release 2.1.9.RELEASE	2019-09-30 22:31:35 -05:00
Vedran Pavic	8e97ac9acd	Update integration tests	2019-09-30 22:24:26 +02:00
Vedran Pavic	ca943b6717	Upgrade test dependencies	2019-09-30 22:07:08 +02:00
Vedran Pavic	08c3056fb5	Upgrade Spring Data to Lovelace-SR11 Resolves: #1518	2019-09-30 13:23:12 +02:00
Vedran Pavic	ca41542113	Upgrade Spring Framework to 5.1.10.RELEASE Resolves: #1491	2019-09-29 11:47:55 +02:00
Vedran Pavic	2e4f12e1a7	Upgrade Reactor to Californium-SR12 Resolves: #1500	2019-09-24 21:06:00 +02:00
Vedran Pavic	d582343a7e	Upgrade samples to Spring Boot 2.1.8.RELEASE Resolves: #1492	2019-09-24 21:05:54 +02:00
Vedran Pavic	2505270f5f	Upgrade Reactor to Californium-SR11 Resolves: #1500	2019-09-03 22:10:11 +02:00
Vedran Pavic	02e182ab4a	Upgrade samples to Spring Boot 2.1.7.RELEASE Resolves: #1492	2019-08-22 22:49:57 +02:00
Vedran Pavic	8f13a7b356	Fix test visibility See: #1489	2019-08-21 18:56:38 +02:00
Josh Cummings	51252a55e6	Add OnCommittedResponseWrapper.setContentLengthLong Add setContentLengthLong tracking to OnCommittedResponseWrapper in order to detect commits on servlets that use setContentLengthLong to announce the entity size they are about to write (as used in the Apache Tomcat's DefaultServlet). Fixes gh-1489	2019-08-21 18:53:08 +02:00
Vedran Pavic	4487b07bb1	Next development version	2019-08-05 17:07:18 +02:00