From 8b732a9c330c479d4ab1ff79d5842cbbc89b9515 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 12 Jul 2021 09:43:55 +0200 Subject: [PATCH] Upgrade to Flyway 7.11.1 Closes gh-27290 --- .../autoconfigure/flyway/FlywayAutoConfigurationTests.java | 5 +++-- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java index 262b03b5674..7be7627cb46 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java @@ -527,8 +527,9 @@ class FlywayAutoConfigurationTests { @Test void licenseKeyIsCorrectlyMapped(CapturedOutput output) { this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class) - .withPropertyValues("spring.flyway.license-key=<>").run((context) -> assertThat(output) - .contains("<> is not supported by Flyway Community Edition")); + .withPropertyValues("spring.flyway.license-key=<>") + .run((context) -> assertThat(output).contains( + "Flyway Teams Edition upgrade required: licenseKey is not supported by Flyway Community Edition.")); } @Test diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 5198e015108..739d1d12df3 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.9.2") { + library("Flyway", "7.11.1") { group("org.flywaydb") { modules = [ "flyway-core"