From 8ecb7d33c9e6e61ab913a2c3db65d7be2fb3951b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Sep 2023 14:12:59 +0100 Subject: [PATCH 1/7] Start building against Micrometer 1.11.4 snapshots See gh-37261 --- 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 d2b3839846..a2d27cd954 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -976,7 +976,7 @@ bom { ] } } - library("Micrometer", "1.11.3") { + library("Micrometer", "1.11.4-SNAPSHOT") { considerSnapshots() group("io.micrometer") { modules = [ From f4e731bdbb648cbde74548464eb343d6b98516c8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Sep 2023 14:13:03 +0100 Subject: [PATCH 2/7] Start building against Micrometer Tracing 1.1.5 snapshots See gh-37262 --- 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 a2d27cd954..243015d89f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -989,7 +989,7 @@ bom { ] } } - library("Micrometer Tracing", "1.1.4") { + library("Micrometer Tracing", "1.1.5-SNAPSHOT") { considerSnapshots() calendarName = "Tracing" group("io.micrometer") { From 04f55ada44a5ca0acd67882ea8f4f4b4dd6139d7 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Sep 2023 14:13:08 +0100 Subject: [PATCH 3/7] Start building against Reactor Bom 2022.0.11 snapshots See gh-37263 --- 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 243015d89f..fb2d713738 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1214,7 +1214,7 @@ bom { ] } } - library("Reactor Bom", "2022.0.10") { + library("Reactor Bom", "2022.0.11-SNAPSHOT") { considerSnapshots() calendarName = "Reactor" group("io.projectreactor") { From af72bf1671fa3c5db2d378f9bd4f193818a292ba Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Sep 2023 14:13:15 +0100 Subject: [PATCH 4/7] Start building against Spring AMQP 3.0.9 snapshots See gh-37264 --- 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 fb2d713738..e90002fe32 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1379,7 +1379,7 @@ bom { ] } } - library("Spring AMQP", "3.0.8") { + library("Spring AMQP", "3.0.9-SNAPSHOT") { considerSnapshots() group("org.springframework.amqp") { imports = [ From 4bd8c350f2c1583a38bf9f88abf9ba7cca3d3331 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Sep 2023 14:13:19 +0100 Subject: [PATCH 5/7] Start building against Spring Framework 6.0.12 snapshots See gh-37265 --- 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 8734d12c58..47b2f37a76 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.8.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 83a920a28fb641e22c7adbd60031caed3f48c3bd Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Sep 2023 14:13:24 +0100 Subject: [PATCH 6/7] Start building against Spring GraphQL 1.2.3 snapshots See gh-37266 --- 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 e90002fe32..7b3fb5ad00 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1425,7 +1425,7 @@ bom { ] } } - library("Spring GraphQL", "1.2.2") { + library("Spring GraphQL", "1.2.3-SNAPSHOT") { considerSnapshots() group("org.springframework.graphql") { modules = [ From e01b380d2194b8fc7606498dabe9017f6bcf90f0 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Sep 2023 14:13:29 +0100 Subject: [PATCH 7/7] Start building against Spring Integration 6.1.3 snapshots See gh-37267 --- 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 7b3fb5ad00..365aa2daa5 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1442,7 +1442,7 @@ bom { ] } } - library("Spring Integration", "6.1.2") { + library("Spring Integration", "6.1.3-SNAPSHOT") { considerSnapshots() group("org.springframework.integration") { imports = [