From 397f16ce2d78724cc0bd87235a748c1d91c926c9 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 14 Apr 2023 13:06:16 +0100 Subject: [PATCH] Upgrade to Flyway 9.16.3 Closes gh-34990 --- .../boot/autoconfigure/flyway/FlywayPropertiesTests.java | 2 +- spring-boot-project/spring-boot-dependencies/build.gradle | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) 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 d9956942ae..ecefacf2ae 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 @@ -109,7 +109,7 @@ class FlywayPropertiesTests { "javaMigrationClassProvider", "pluginRegister", "resourceProvider", "resolvers"); // Properties we don't want to expose ignoreProperties(configuration, "resolversAsClassNames", "callbacksAsClassNames", "loggers", "driver", - "modernConfig", "resolvedEnvironments"); + "modernConfig", "currentResolvedEnvironment", "reportFilename"); // Handled by the conversion service ignoreProperties(configuration, "baselineVersionAsString", "encodingAsString", "locationsAsStrings", "targetAsString"); diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index a8f3a2b6b4..8b3b92cecb 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -243,11 +243,7 @@ bom { ] } } - library("Flyway", "9.15.2") { - prohibit { - versionRange "[9.16.0,)" - because "https://github.com/flyway/flyway/issues/3636" - } + library("Flyway", "9.16.3") { group("org.flywaydb") { modules = [ "flyway-core",