From d6bfdbd90e1027aa4882dc55ff1c18ab4dbbf03e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 13 Sep 2024 14:33:28 +0200 Subject: [PATCH] Upgrade to Flyway 10.18.0 Closes gh-42295 --- .../boot/autoconfigure/flyway/FlywayAutoConfiguration.java | 1 + .../boot/autoconfigure/flyway/FlywayProperties.java | 3 +++ .../boot/autoconfigure/flyway/FlywayPropertiesTests.java | 1 + spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java index d04d240f5eb..d07ceeef606 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java @@ -225,6 +225,7 @@ public class FlywayAutoConfiguration { * @param configuration the configuration * @param properties the properties */ + @SuppressWarnings("removal") private void configureProperties(FluentConfiguration configuration, FlywayProperties properties) { // NOTE: Using method references in the mapper methods can break // back-compatibility (see gh-38164) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java index ad9c25864a6..370dc85e5b1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java @@ -597,10 +597,13 @@ public class FlywayProperties { this.cleanDisabled = cleanDisabled; } + @Deprecated(since = "3.4.0", forRemoval = true) + @DeprecatedConfigurationProperty(since = "3.4.0") public boolean isCleanOnValidationError() { return this.cleanOnValidationError; } + @Deprecated(since = "3.4.0", forRemoval = true) public void setCleanOnValidationError(boolean cleanOnValidationError) { this.cleanOnValidationError = cleanOnValidationError; } 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 a79740949ae..fbf15285972 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 @@ -46,6 +46,7 @@ import static org.assertj.core.api.Assertions.assertThat; class FlywayPropertiesTests { @Test + @SuppressWarnings("removal") void defaultValuesAreConsistent() { FlywayProperties properties = new FlywayProperties(); Configuration configuration = new FluentConfiguration(); diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index c4f18da8d0f..414154197f2 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -354,7 +354,7 @@ bom { releaseNotes("https://www.elastic.co/guide/en/elasticsearch/reference/current/release-notes-{version}.html") } } - library("Flyway", "10.17.3") { + library("Flyway", "10.18.0") { group("org.flywaydb") { modules = [ "flyway-commandline",