Merge pull request #22120 from kedar-joshi

* gh-22120:
  Upgrade to Flyway 6.5.0 and support createSchemas

Closes gh-22120

Author: wilkinsona

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

@@ -178,6 +178,7 @@ private void configureProperties(FluentConfiguration configuration, FlywayProper
 			// No method reference for compatibility with Flyway 5.x
 			map.from(properties.getDefaultSchema()).to((schema) -> configuration.defaultSchema(schema));
 			map.from(properties.getSchemas()).as(StringUtils::toStringArray).to(configuration::schemas);
+			configureCreateSchemas(configuration, properties.isCreateSchemas());
 			map.from(properties.getTable()).to(configuration::table);
 			// No method reference for compatibility with Flyway 5.x
 			map.from(properties.getTablespace()).whenNonNull().to((tablespace) -> configuration.tablespace(tablespace));
@@ -221,6 +222,15 @@ private void configureProperties(FluentConfiguration configuration, FlywayProper
 			map.from(properties.getUndoSqlMigrationPrefix()).whenNonNull().to(configuration::undoSqlMigrationPrefix);
 		}
 
+		private void configureCreateSchemas(FluentConfiguration configuration, boolean createSchemas) {
+			try {
+				configuration.createSchemas(createSchemas);
+			}
+			catch (NoSuchMethodError ex) {
+				// Flyway < 6.5
+			}
+		}
+
 		private void configureValidateMigrationNaming(FluentConfiguration configuration,
 				boolean validateMigrationNaming) {
 			try {

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

@@ -74,6 +74,12 @@ public class FlywayProperties {
 	 */
 	private List<String> schemas = new ArrayList<>();
 
+	/**
+	 * Whether Flyway should attempt to create the schemas specified in the schemas
+	 * property.
+	 */
+	private boolean createSchemas = true;
+
 	/**
 	 * Name of the schema history table that will be used by Flyway.
 	 */
@@ -343,6 +349,14 @@ public void setSchemas(List<String> schemas) {
 		this.schemas = schemas;
 	}
 
+	public boolean isCreateSchemas() {
+		return this.createSchemas;
+	}
+
+	public void setCreateSchemas(boolean createSchemas) {
+		this.createSchemas = createSchemas;
+	}
+
 	public String getTable() {
 		return this.table;
 	}

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

@@ -53,6 +53,7 @@ void defaultValuesAreConsistent() {
 		assertThat(properties.getConnectRetries()).isEqualTo(configuration.getConnectRetries());
 		assertThat(properties.getDefaultSchema()).isEqualTo(configuration.getDefaultSchema());
 		assertThat(properties.getSchemas()).isEqualTo(Arrays.asList(configuration.getSchemas()));
+		assertThat(properties.isCreateSchemas()).isEqualTo(configuration.getCreateSchemas());
 		assertThat(properties.getTable()).isEqualTo(configuration.getTable());
 		assertThat(properties.getBaselineDescription()).isEqualTo(configuration.getBaselineDescription());
 		assertThat(MigrationVersion.fromVersion(properties.getBaselineVersion()))
@@ -98,7 +99,8 @@ void expectedPropertiesAreManaged() {
 		ignoreProperties(properties, "url", "user", "password", "enabled", "checkLocation", "createDataSource");
 
 		// High level object we can't set with properties
-		ignoreProperties(configuration, "callbacks", "classLoader", "dataSource", "javaMigrations", "resolvers");
+		ignoreProperties(configuration, "callbacks", "classLoader", "dataSource", "javaMigrations",
+				"javaMigrationClassProvider", "resourceProvider", "resolvers");
 		// Properties we don't want to expose
 		ignoreProperties(configuration, "resolversAsClassNames", "callbacksAsClassNames");
 		// Handled by the conversion service
@@ -109,6 +111,8 @@ void expectedPropertiesAreManaged() {
 		ignoreProperties(properties, "initSqls");
 		// Handled as dryRunOutput
 		ignoreProperties(configuration, "dryRunOutputAsFile", "dryRunOutputAsFileName");
+		// Handled as createSchemas
+		ignoreProperties(configuration, "shouldCreateSchemas");
 		List<String> configurationKeys = new ArrayList<>(configuration.keySet());
 		Collections.sort(configurationKeys);
 		List<String> propertiesKeys = new ArrayList<>(properties.keySet());

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -310,7 +310,7 @@ bom {
 			]
 		}
 	}
-	library("Flyway", "6.4.4") {
+	library("Flyway", "6.5.0") {
 		group("org.flywaydb") {
 			modules = [
 				"flyway-core"