Merge branch '3.5.x' into 4.0.x

wilkinsona · wilkinsona · commit f988fe93e002 · 2026-03-23T14:50:29.000Z
diff --git a/module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/NativeImageResourceProviderCustomizerTests.java b/module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/NativeImageResourceProviderCustomizerTests.java
@@ -67,7 +67,7 @@ void nativeImageResourceProviderShouldFindNestedMigrations() {
 		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);
+		assertThat(migrations).containsExactlyInAnyOrder(v1, v2);
 	}
 
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ void nativeImageResourceProviderShouldFindNestedMigrations() {`
`67`	`67`	`Collection<LoadableResource> migrations = resourceProvider.getResources("V", new String[] { ".sql" });`
`68`	`68`	`LoadableResource v1 = resourceProvider.getResource("V1__init.sql");`
`69`	`69`	`LoadableResource v2 = resourceProvider.getResource("nested/V2__users.sql");`
`70`		`- assertThat(migrations).containsExactly(v1, v2);`
	`70`	`+ assertThat(migrations).containsExactlyInAnyOrder(v1, v2);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`@Test`