From 2911d1a22a863d4a49a4ff558e49e3cbd4670c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 4 Mar 2025 13:05:20 +0100 Subject: [PATCH] Start building against Spring Framework 6.2.4 snapshots See gh-44517 --- gradle.properties | 2 +- .../org/springframework/boot/SpringApplicationTests.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 68efefdc8c8..2c5eafdf12b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ mavenVersion=3.9.4 mockitoVersion=5.15.2 nativeBuildToolsVersion=0.10.5 snakeYamlVersion=2.4 -springFrameworkVersion=6.2.3 +springFrameworkVersion=6.2.4-SNAPSHOT springFramework60xVersion=6.0.23 tomcatVersion=10.1.36 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 3117b3d4446..97187aad805 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 @@ -46,6 +46,7 @@ import reactor.core.publisher.Mono; import org.springframework.aot.AotDetector; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanCurrentlyInCreationException; +import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.UnsatisfiedDependencyException; import org.springframework.beans.factory.annotation.Autowired; @@ -221,8 +222,10 @@ class SpringApplicationTests { @Test void sourcesMustBeAccessible() { - assertThatIllegalArgumentException() + assertThatExceptionOfType(BeanDefinitionStoreException.class) .isThrownBy(() -> new SpringApplication(InaccessibleConfiguration.class).run()) + .havingRootCause() + .isInstanceOf(IllegalArgumentException.class) .withMessageContaining("No visible constructors"); }