From f50927f7a18d43803da8007871d463a9ab9e6cdf Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Wed, 2 Sep 2020 17:47:06 +0200 Subject: [PATCH] Start building against Spring Framework 5.3.0.RC1 SNAPSHOTs See gh-23170 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../java/org/springframework/boot/SpringApplicationTests.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index bd9658899e..0edf6a60db 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1564,7 +1564,7 @@ bom { ] } } - library("Spring Framework", "5.3.0-M2") { + library("Spring Framework", "5.3.0-SNAPSHOT") { group("org.springframework") { imports = [ "spring-framework-bom" diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java index 263f7c3409..5541743f0e 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java @@ -1198,9 +1198,7 @@ class SpringApplicationTests { .filter((invocation) -> invocation.getMethod().toString().contains("start(")).count(); long endCount = mockingDetails(startupStep).getInvocations().stream() .filter((invocation) -> invocation.getMethod().toString().contains("end(")).count(); - assertThat(startCount).isEqualTo(endCount + 1); // Will be same after - // spring-framework #25572 is - // fixed + assertThat(startCount).isEqualTo(endCount); } private ArgumentMatcher isAvailabilityChangeEventWithState(