Merge branch '3.3.x' into 3.4.x

Closes gh-44483

Author: mhalbritter

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

@@ -305,7 +305,6 @@ private void configureProperties(FluentConfiguration configuration, FlywayProper
 			map.from(properties::getLoggers).to((loggers) -> configuration.loggers(loggers));
 			map.from(properties::getCommunityDbSupportEnabled)
 				.to((communityDbSupportEnabled) -> configuration.communityDBSupportEnabled(communityDbSupportEnabled));
-			// Flyway Teams properties
 			map.from(properties.getBatch()).to((batch) -> configuration.batch(batch));
 			map.from(properties.getDryRunOutput()).to((dryRunOutput) -> configuration.dryRunOutput(dryRunOutput));
 			map.from(properties.getErrorOverrides())

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

@@ -275,7 +275,7 @@ public class FlywayProperties {
 	private String[] loggers = { "slf4j" };
 
 	/**
-	 * Whether to batch SQL statements when executing them. Requires Flyway Teams.
+	 * Whether to batch SQL statements when executing them.
 	 */
 	private Boolean batch;
 
@@ -292,12 +292,12 @@ public class FlywayProperties {
 	private String[] errorOverrides;
 
 	/**
-	 * Whether to stream SQL migrations when executing them. Requires Flyway Teams.
+	 * Whether to stream SQL migrations when executing them.
 	 */
 	private Boolean stream;
 
 	/**
-	 * Properties to pass to the JDBC driver. Requires Flyway Teams.
+	 * Properties to pass to the JDBC driver.
 	 */
 	private Map<String, String> jdbcProperties = new HashMap<>();
 
@@ -308,25 +308,23 @@ public class FlywayProperties {
 
 	/**
 	 * Whether Flyway should output a table with the results of queries when executing
-	 * migrations. Requires Flyway Teams.
+	 * migrations.
 	 */
 	private Boolean outputQueryResults;
 
 	/**
 	 * Whether Flyway should skip executing the contents of the migrations and only update
-	 * the schema history table. Requires Flyway teams.
+	 * the schema history table.
 	 */
 	private Boolean skipExecutingMigrations;
 
 	/**
 	 * List of patterns that identify migrations to ignore when performing validation.
-	 * Requires Flyway Teams.
 	 */
 	private List<String> ignoreMigrationPatterns;
 
 	/**
-	 * Whether to attempt to automatically detect SQL migration file encoding. Requires
-	 * Flyway Teams.
+	 * Whether to attempt to automatically detect SQL migration file encoding.
 	 */
 	private Boolean detectEncoding;
 

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

@@ -33,6 +33,7 @@
 import org.flywaydb.core.api.callback.Event;
 import org.flywaydb.core.api.configuration.FluentConfiguration;
 import org.flywaydb.core.api.migration.JavaMigration;
+import org.flywaydb.core.api.pattern.ValidatePattern;
 import org.flywaydb.core.internal.license.FlywayEditionUpgradeRequiredException;
 import org.flywaydb.database.oracle.OracleConfigurationExtension;
 import org.flywaydb.database.postgresql.PostgreSQLConfigurationExtension;
@@ -916,6 +917,22 @@ void shouldRegisterResourceHints() {
 		assertThat(RuntimeHintsPredicates.resource().forResource("db/migration/V1__init.sql")).accepts(runtimeHints);
 	}
 
+	@Test
+	void detectEncodingCorrectlyMapped() {
+		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
+			.withPropertyValues("spring.flyway.detect-encoding=true")
+			.run((context) -> assertThat(context.getBean(Flyway.class).getConfiguration().isDetectEncoding())
+				.isEqualTo(true));
+	}
+
+	@Test
+	void ignoreMigrationPatternsCorrectlyMapped() {
+		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
+			.withPropertyValues("spring.flyway.ignore-migration-patterns=*:missing")
+			.run((context) -> assertThat(context.getBean(Flyway.class).getConfiguration().getIgnoreMigrationPatterns())
+				.containsExactly(ValidatePattern.fromPattern("*:missing")));
+	}
+
 	private ContextConsumer<AssertableApplicationContext> validateFlywayTeamsPropertyOnly(String propertyName) {
 		return (context) -> {
 			assertThat(context).hasFailed();