From b43cd51f3c6070d274be2065fe7bb3805f8a8ae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 19 Aug 2024 11:15:33 +0200 Subject: [PATCH] Upgrade to Flyway 10.17.1 Closes gh-41924 --- .../boot/autoconfigure/flyway/FlywayPropertiesTests.java | 2 ++ spring-boot-project/spring-boot-dependencies/build.gradle | 3 ++- 2 files changed, 4 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 5a2c2c7b07..17fccbfcfd 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 @@ -115,6 +115,8 @@ class FlywayPropertiesTests { "oracleWalletLocation", "sqlServerKerberosLoginFile"); // Properties that are managed by specific extensions ignoreProperties(properties, "oracle", "postgresql", "sqlserver"); + // Properties that are only used on the command line + ignoreProperties(configuration, "jarDirs"); // https://github.com/flyway/flyway/issues/3732 ignoreProperties(configuration, "environment"); // High level object we can't set with properties diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index c8b1c4fbff..8b21b03ebd 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -354,11 +354,12 @@ bom { releaseNotes("https://www.elastic.co/guide/en/elasticsearch/reference/current/release-notes-{version}.html") } } - library("Flyway", "10.15.2") { + library("Flyway", "10.17.1") { group("org.flywaydb") { modules = [ "flyway-commandline", "flyway-core", + "flyway-database-cassandra", "flyway-database-db2", "flyway-database-derby", "flyway-database-hsqldb",