From 977b938977b035f2b7470e3da215d064ae9d9ae0 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 21 Jan 2021 15:14:12 +0000 Subject: [PATCH] Upgrade to Flyway 7.5.1 Closes gh-24961 --- .../boot/autoconfigure/flyway/FlywayPropertiesTests.java | 2 +- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 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 8b614c470b..f2c039997f 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 @@ -110,7 +110,7 @@ class FlywayPropertiesTests { "targetAsString"); // Teams-only properties that we cannot detect as no exception is thrown and // getters return null - ignoreProperties(configuration, "conjurToken", "conjurUrl", "vaultSecret", "vaultToken", "vaultUrl"); + ignoreProperties(configuration, "conjurToken", "conjurUrl", "vaultSecrets", "vaultToken", "vaultUrl"); // Handled as initSql array ignoreProperties(configuration, "initSql"); ignoreProperties(properties, "initSqls"); diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 10e5a2bc4d..a7b7a51f1c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -306,7 +306,7 @@ bom { ] } } - library("Flyway", "7.5.0") { + library("Flyway", "7.5.1") { group("org.flywaydb") { modules = [ "flyway-core"