From e7de1752a7dc9f5f491b3e6288ad59941e170c6f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Sep 2023 11:51:26 +0100 Subject: [PATCH 1/5] Start building against Micrometer 1.10.11 snapshots See gh-37255 --- 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 1edd8d5c5a..1b43aa76cf 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -950,7 +950,7 @@ bom { ] } } - library("Micrometer", "1.10.10") { + library("Micrometer", "1.10.11-SNAPSHOT") { considerSnapshots() group("io.micrometer") { modules = [ From 216dad8bc5fbd9865d47be7a9dd37925d4e2c94a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Sep 2023 11:51:31 +0100 Subject: [PATCH 2/5] Start building against Reactor Bom 2022.0.11 snapshots See gh-37256 --- 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 1b43aa76cf..1677b03159 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1166,7 +1166,7 @@ bom { ] } } - library("Reactor Bom", "2022.0.10") { + library("Reactor Bom", "2022.0.11-SNAPSHOT") { considerSnapshots() calendarName = "Reactor" group("io.projectreactor") { From b1d13c3fe5e7b1b579ebf594e258e02c0dc51e57 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Sep 2023 11:51:36 +0100 Subject: [PATCH 3/5] Start building against Spring AMQP 3.0.9 snapshots See gh-37257 --- 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 1677b03159..07e34746d4 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1347,7 +1347,7 @@ bom { ] } } - library("Spring AMQP", "3.0.8") { + library("Spring AMQP", "3.0.9-SNAPSHOT") { considerSnapshots() group("org.springframework.amqp") { imports = [ From ca254e51f6a1e4be1a386cc009244df5f02275ab Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Sep 2023 11:51:40 +0100 Subject: [PATCH 4/5] Start building against Spring Framework 6.0.12 snapshots See gh-37258 --- gradle.properties | 2 +- .../boot/context/config/ConfigDataLocationRuntimeHints.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 85c850b46f..ce029ec16d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.7.22 nativeBuildToolsVersion=0.9.24 -springFrameworkVersion=6.0.11 +springFrameworkVersion=6.0.12-SNAPSHOT tomcatVersion=10.1.12 kotlin.stdlib.default.dependency=false diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLocationRuntimeHints.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLocationRuntimeHints.java index a3920df086..78f71e458d 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLocationRuntimeHints.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataLocationRuntimeHints.java @@ -49,8 +49,10 @@ class ConfigDataLocationRuntimeHints implements RuntimeHintsRegistrar { logger.debug("Registering application configuration hints for " + fileNames + "(" + extensions + ") at " + locations); } - new FilePatternResourceHintsRegistrar(fileNames, locations, extensions).registerHints(hints.resources(), - classLoader); + FilePatternResourceHintsRegistrar.forClassPathLocations(locations) + .withFileExtensions(extensions) + .withFilePrefixes(fileNames) + .registerHints(hints.resources(), classLoader); } /** From 5de5331102a7e9096d0d8b03e2dd41693c5d6c5a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Sep 2023 11:51:45 +0100 Subject: [PATCH 5/5] Start building against Spring GraphQL 1.1.6 snapshots See gh-37259 --- 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 07e34746d4..ed0dca0125 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1384,7 +1384,7 @@ bom { ] } } - library("Spring GraphQL", "1.1.5") { + library("Spring GraphQL", "1.1.6-SNAPSHOT") { considerSnapshots() group("org.springframework.graphql") { modules = [