Merge branch '3.0.x'

Closes gh-35132

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

@@ -215,7 +215,7 @@ class FlywayAutoConfigurationTests {
 				DataSource dataSource = context.getBean(Flyway.class).getConfiguration().getDataSource();
 				assertThat(dataSource).isNotNull();
 				assertThat(dataSource).hasFieldOrPropertyWithValue("username", null);
-				assertThat(dataSource).hasFieldOrPropertyWithValue("password", "");
+				assertThat(dataSource).hasFieldOrPropertyWithValue("password", null);
 			});
 	}