Merge branch '3.5.x' into 4.0.x

Closes gh-49706

Author: bclozel

module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/autoconfigure/FlywayAutoConfiguration.java

@@ -480,7 +480,7 @@ static class FlywayAutoConfigurationRuntimeHints implements RuntimeHintsRegistra
 
 		@Override
 		public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
-			hints.resources().registerPattern("db/migration/*");
+			hints.resources().registerPattern("db/migration/**");
 		}
 
 	}

module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/autoconfigure/NativeImageResourceProvider.java

@@ -147,7 +147,7 @@ private void initialize() {
 
 	private Resource[] getResources(PathMatchingResourcePatternResolver resolver, Location location, Resource root) {
 		try {
-			return resolver.getResources(root.getURI() + "/*");
+			return resolver.getResources(root.getURI() + "/**/*");
 		}
 		catch (IOException ex) {
 			throw new UncheckedIOException("Failed to list resources for " + location.getDescriptor(), ex);

module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/FlywayAutoConfigurationTests.java

@@ -896,6 +896,8 @@ void shouldRegisterResourceHints() {
 		new FlywayAutoConfigurationRuntimeHints().registerHints(runtimeHints, getClass().getClassLoader());
 		assertThat(RuntimeHintsPredicates.resource().forResource("db/migration/")).accepts(runtimeHints);
 		assertThat(RuntimeHintsPredicates.resource().forResource("db/migration/V1__init.sql")).accepts(runtimeHints);
+		assertThat(RuntimeHintsPredicates.resource().forResource("db/migration/nested/V2__users.sql"))
+			.accepts(runtimeHints);
 	}
 
 	@Test

module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/NativeImageResourceProviderCustomizerTests.java

@@ -25,6 +25,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.testsupport.classpath.resources.WithResource;
+import org.springframework.boot.testsupport.classpath.resources.WithResources;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -56,6 +57,19 @@ void nativeImageResourceProviderShouldFindMigrations() {
 		assertThat(migrations).containsExactly(migration);
 	}
 
+	@Test
+	@WithResources({ @WithResource(name = "db/migration/V1__init.sql"),
+			@WithResource(name = "db/migration/nested/V2__users.sql") })
+	void nativeImageResourceProviderShouldFindNestedMigrations() {
+		FluentConfiguration configuration = new FluentConfiguration();
+		this.customizer.customize(configuration);
+		ResourceProvider resourceProvider = configuration.getResourceProvider();
+		Collection<LoadableResource> migrations = resourceProvider.getResources("V", new String[] { ".sql" });
+		LoadableResource v1 = resourceProvider.getResource("V1__init.sql");
+		LoadableResource v2 = resourceProvider.getResource("nested/V2__users.sql");
+		assertThat(migrations).containsExactly(v1, v2);
+	}
+
 	@Test
 	void shouldBackOffOnCustomResourceProvider() {
 		FluentConfiguration configuration = new FluentConfiguration();