From 0dbcb5f6d3cd26182c81216150b697fc93726421 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 2 Jun 2022 15:58:29 +0200 Subject: [PATCH] Start building against Spring Framework 6.0.0-M5 snapshots See gh-31241 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../java/org/springframework/boot/maven/AotGenerateTests.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index f7c070bdce8..e07c00d1ffe 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1381,7 +1381,7 @@ bom { ] } } - library("Spring Framework", "6.0.0-M4") { + library("Spring Framework", "6.0.0-SNAPSHOT") { group("org.springframework") { imports = [ "spring-framework-bom" diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/AotGenerateTests.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/AotGenerateTests.java index d5fe9100767..31e663e1e11 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/AotGenerateTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/AotGenerateTests.java @@ -46,6 +46,8 @@ public class AotGenerateTests { "reflect-config.json"), Path.of("META-INF", "native-image", "org.springframework.boot.maven.it", "aot", "resource-config.json"), + Path.of("META-INF", "native-image", "org.springframework.boot.maven.it", "aot", + "proxy-config.json"), Path.of("META-INF", "native-image", "org.springframework.boot.maven.it", "aot", "native-image.properties")); }); @@ -67,6 +69,7 @@ public class AotGenerateTests { assertThat(collectRelativePaths(classesDirectory)).contains( Path.of("org.springframework.boot.maven.it", "aot", "reflect-config.json"), Path.of("org.springframework.boot.maven.it", "aot", "resource-config.json"), + Path.of("org.springframework.boot.maven.it", "aot", "proxy-config.json"), Path.of("org.springframework.boot.maven.it", "aot", "native-image.properties")); }); }