Merge branch '3.5.x'

Closes gh-47014

Author: mhalbritter

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

@@ -320,7 +320,6 @@ private void configureProperties(FluentConfiguration configuration, FlywayProper
 			map.from(properties.getSkipExecutingMigrations())
 				.to((skipExecutingMigrations) -> configuration.skipExecutingMigrations(skipExecutingMigrations));
 			map.from(properties.getIgnoreMigrationPatterns())
-				.whenNot(List::isEmpty)
 				.to((ignoreMigrationPatterns) -> configuration
 					.ignoreMigrationPatterns(ignoreMigrationPatterns.toArray(new String[0])));
 			map.from(properties.getDetectEncoding())

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

@@ -323,7 +323,7 @@ public class FlywayProperties {
 	/**
 	 * List of patterns that identify migrations to ignore when performing validation.
 	 */
-	private @Nullable List<String> ignoreMigrationPatterns;
+	private List<String> ignoreMigrationPatterns = Collections.singletonList("*:future");
 
 	/**
 	 * Whether to attempt to automatically detect SQL migration file encoding.
@@ -757,11 +757,11 @@ public void setSkipExecutingMigrations(@Nullable Boolean skipExecutingMigrations
 		this.skipExecutingMigrations = skipExecutingMigrations;
 	}
 
-	public @Nullable List<String> getIgnoreMigrationPatterns() {
+	public List<String> getIgnoreMigrationPatterns() {
 		return this.ignoreMigrationPatterns;
 	}
 
-	public void setIgnoreMigrationPatterns(@Nullable List<String> ignoreMigrationPatterns) {
+	public void setIgnoreMigrationPatterns(List<String> ignoreMigrationPatterns) {
 		this.ignoreMigrationPatterns = ignoreMigrationPatterns;
 	}
 

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

@@ -897,6 +897,21 @@ void ignoreMigrationPatternsCorrectlyMapped() {
 				.containsExactly(ValidatePattern.fromPattern("*:missing")));
 	}
 
+	@Test
+	void ignoreMigrationPatternsUsesDefaultValuesWhenNotSet() {
+		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
+			.run((context) -> assertThat(context.getBean(Flyway.class).getConfiguration().getIgnoreMigrationPatterns())
+				.containsExactly(new FluentConfiguration().getIgnoreMigrationPatterns()));
+	}
+
+	@Test
+	void ignoreMigrationPatternsWhenEmpty() {
+		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
+			.withPropertyValues("spring.flyway.ignore-migration-patterns=")
+			.run((context) -> assertThat(context.getBean(Flyway.class).getConfiguration().getIgnoreMigrationPatterns())
+				.isEmpty());
+	}
+
 	private ContextConsumer<AssertableApplicationContext> validateFlywayTeamsPropertyOnly(String propertyName) {
 		return (context) -> {
 			assertThat(context).hasFailed();

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

@@ -30,6 +30,7 @@
 import org.flywaydb.core.api.configuration.ClassicConfiguration;
 import org.flywaydb.core.api.configuration.Configuration;
 import org.flywaydb.core.api.configuration.FluentConfiguration;
+import org.flywaydb.core.api.pattern.ValidatePattern;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.BeanWrapper;
@@ -95,6 +96,8 @@ void defaultValuesAreConsistent() {
 		assertThat(properties.getScriptPlaceholderSuffix()).isEqualTo(configuration.getScriptPlaceholderSuffix());
 		assertThat(properties.isExecuteInTransaction()).isEqualTo(configuration.isExecuteInTransaction());
 		assertThat(properties.getCommunityDbSupportEnabled()).isNull();
+		assertThat(properties.getIgnoreMigrationPatterns().stream().map(ValidatePattern::fromPattern))
+			.containsExactly(configuration.getIgnoreMigrationPatterns());
 	}
 
 	@Test