From f1b2db03e0ef100fc5a42def6c542377b99994a2 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 7 Apr 2021 16:03:56 +0200 Subject: [PATCH 1/4] Start building against Spring Framework 5.3.6 snapshots See gh-25909 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../boot/web/servlet/support/ErrorPageFilterTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 65bf5f9857..d9696294cd 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1565,7 +1565,7 @@ bom { ] } } - library("Spring Framework", "5.3.5") { + library("Spring Framework", "5.3.6-SNAPSHOT") { group("org.springframework") { imports = [ "spring-framework-bom" diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterTests.java index b0f183dc43..b839e3207a 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterTests.java @@ -399,7 +399,7 @@ class ErrorPageFilterTests { assertThat(((HttpServletResponseWrapper) this.chain.getResponse()).getStatus()).isEqualTo(500); assertThat(this.request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE)).isEqualTo(500); assertThat(this.request.getAttribute(RequestDispatcher.ERROR_MESSAGE)) - .isEqualTo("Required string parameter 'test' is not present"); + .isEqualTo("Required request parameter 'test' for method parameter type string is not present"); Map requestAttributes = getAttributesForDispatch("/500"); assertThat(requestAttributes.get(RequestDispatcher.ERROR_EXCEPTION_TYPE)) .isEqualTo(MissingServletRequestParameterException.class); From aa8f5433ee707535626bca22deaebbcf6deabcfb Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 7 Apr 2021 16:04:36 +0200 Subject: [PATCH 2/4] Start building against Spring Data 2020.0.8 snapshots See gh-25910 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index d9696294cd..808e217722 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1558,7 +1558,7 @@ bom { ] } } - library("Spring Data Bom", "2020.0.6") { + library("Spring Data Bom", "2020.0.8-SNAPSHOT") { group("org.springframework.data") { imports = [ "spring-data-bom" From 0f53663cf6ac76a8e0d043e09790e51df64a5381 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 7 Apr 2021 16:05:08 +0200 Subject: [PATCH 3/4] Start building against Spring Security 5.4.6 snapshots See gh-25911 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 808e217722..40bf601160 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1624,7 +1624,7 @@ bom { ] } } - library("Spring Security", "5.4.5") { + library("Spring Security", "5.4.6-SNAPSHOT") { group("org.springframework.security") { imports = [ "spring-security-bom" From 5aa1e683c02630ce432fc602d7ddb5c791c8c384 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 7 Apr 2021 16:05:40 +0200 Subject: [PATCH 4/4] Start building against Spring Session 2020.0.4 snapshots See gh-25912 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 40bf601160..c1a29987e0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1631,7 +1631,7 @@ bom { ] } } - library("Spring Session Bom", "2020.0.3") { + library("Spring Session Bom", "2020.0.4-SNAPSHOT") { group("org.springframework.session") { imports = [ "spring-session-bom"