From 02fd570b7d4cf730f13a992248367e866f83b958 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 7 Sep 2023 10:17:42 +0100 Subject: [PATCH] Start building against Spring Framework 6.1.0 snapshots See gh-37231 --- 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 db1bd02fa4..e9a6a13fef 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.9.10 nativeBuildToolsVersion=0.9.24 -springFrameworkVersion=6.1.0-M4 +springFrameworkVersion=6.1.0-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..c914f935c2 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.toArray(new String[0])) + .withFilePrefixes(fileNames.toArray(new String[0])) + .withFileExtensions(extensions.toArray(new String[0])) + .registerHints(hints.resources(), classLoader); } /**