Merge branch '3.0.x'

Closes gh-34936
spring-projects · Apr 11, 2023 · ab1e0f5 · ab1e0f5
2 parents 0806743 + 164ab51
commit ab1e0f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...ain/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java b/...ain/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java
@@ -181,7 +181,7 @@ static class LiquibaseAutoConfigurationRuntimeHints implements RuntimeHintsRegis
 
 		@Override
 		public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-			hints.resources().registerPattern("db/changelog/db.changelog-master.yaml");
+			hints.resources().registerPattern("db/changelog/*");
 		}
 
 	}

diff --git a/...ava/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java b/...ava/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java
@@ -463,8 +463,10 @@ void whenCustomSpringLiquibaseIsDefinedThenJooqDslContextDependsOnSpringLiquibas
 	void shouldRegisterHints() {
 		RuntimeHints hints = new RuntimeHints();
 		new LiquibaseAutoConfigurationRuntimeHints().registerHints(hints, getClass().getClassLoader());
+		assertThat(RuntimeHintsPredicates.resource().forResource("db/changelog/")).accepts(hints);
 		assertThat(RuntimeHintsPredicates.resource().forResource("db/changelog/db.changelog-master.yaml"))
 			.accepts(hints);
+		assertThat(RuntimeHintsPredicates.resource().forResource("db/changelog/tables/init.sql")).accepts(hints);
 	}
 
 	private ContextConsumer<AssertableApplicationContext> assertLiquibase(Consumer<SpringLiquibase> consumer) {