From 19df3934c61d94f414aa40f380954e51f83bac7d Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 23 Aug 2023 10:19:47 +0200 Subject: [PATCH] Upgrade to Flyway 9.21.2 Closes gh-37076 --- .../boot/autoconfigure/flyway/FlywayPropertiesTests.java | 2 ++ spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayPropertiesTests.java index b2d3607dd8..0562b6c48e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayPropertiesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayPropertiesTests.java @@ -114,6 +114,8 @@ class FlywayPropertiesTests { "oracleWalletLocation", "sqlServerKerberosLoginFile"); // Properties that are managed by specific extensions ignoreProperties(properties, "oracle", "postgresql", "sqlserver"); + // https://github.com/flyway/flyway/issues/3732 + ignoreProperties(configuration, "environment"); // High level object we can't set with properties ignoreProperties(configuration, "callbacks", "classLoader", "dataSource", "javaMigrations", "javaMigrationClassProvider", "pluginRegister", "resourceProvider", "resolvers"); diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 9cbe976501..eb2f669fd4 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -283,7 +283,7 @@ bom { ] } } - library("Flyway", "9.21.1") { + library("Flyway", "9.21.2") { group("org.flywaydb") { modules = [ "flyway-core",