Start building against Spring Framework 6.1.0 snapshots

wilkinsona · wilkinsona · commit 02fd570b7d4c · 2023-09-07T13:34:14.000+01:00
See spring-projectsgh-37231
diff --git 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
@@ -49,8 +49,10 @@ public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
 			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);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,10 @@ public void registerHints(RuntimeHints hints, ClassLoader classLoader) {`
`49`	`49`	`logger.debug("Registering application configuration hints for " + fileNames + "(" + extensions + ") at "`
`50`	`50`	`+ locations);`
`51`	`51`	`}`
`52`		`- new FilePatternResourceHintsRegistrar(fileNames, locations, extensions).registerHints(hints.resources(),`
`53`		`- classLoader);`
	`52`	`+ FilePatternResourceHintsRegistrar.forClassPathLocations(locations.toArray(new String[0]))`
	`53`	`+ .withFilePrefixes(fileNames.toArray(new String[0]))`
	`54`	`+ .withFileExtensions(extensions.toArray(new String[0]))`
	`55`	`+ .registerHints(hints.resources(), classLoader);`
`54`	`56`	`}`
`55`	`57`
`56`	`58`	`/**`