From aca534d0dd6e4fbae65ff5a8a9068e72ca6f2433 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 12:22:10 -0400 Subject: [PATCH] fix(deps): update managed.flyway to v10.10.0 (#521) * fix(deps): update managed.flyway to v10.10.0 * Ignore new undocumented configuration properties FlywayConfigurationProperties is updated to ignore two new undocumented configuration builder properties of Flyway's FluentConfiguration. The added properties are allEnvironments and environmentProvisionMode. This clears the way for the update to Flyway 10.10.0. --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jeremy Grelle --- .../io/micronaut/flyway/FlywayConfigurationProperties.java | 7 ++++++- gradle/libs.versions.toml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/flyway/src/main/java/io/micronaut/flyway/FlywayConfigurationProperties.java b/flyway/src/main/java/io/micronaut/flyway/FlywayConfigurationProperties.java index c642bd48..05d74615 100644 --- a/flyway/src/main/java/io/micronaut/flyway/FlywayConfigurationProperties.java +++ b/flyway/src/main/java/io/micronaut/flyway/FlywayConfigurationProperties.java @@ -51,12 +51,17 @@ public class FlywayConfigurationProperties implements Toggleable { // NOTE - Some of the ignored properties (javaMigrations, callbacks, resolvers, resourceProvider, javaMigrationClassProvider) // are custom Flyway types and implementations are meant to be provided by the user through an implementation of // FlywayConfigurationCustomizer if needed. + // // Most of the other ignored properties have overloaded methods in FluentConfiguration, making it non-deterministic as to which // of the methods would be selected for setting the builder property, thus explicit property setters are provided here instead // that pass the value through to the builder. + // + // allEnvironments and environmentProvisionMode were added to the builder in 10.10.0, are undocumented, and were breaking things, + // so added to the ignore list without a pass-through setter @ConfigurationBuilder(prefixes = "", excludes = {"jdbcProperties", "configuration", "dryRunOutput", "ignoreMigrationPatterns", "locations", "encoding", "target", "javaMigrations", "dataSource", - "baselineVersion", "callbacks", "resolvers", "resourceProvider", "javaMigrationClassProvider"}) + "baselineVersion", "callbacks", "resolvers", "resourceProvider", "javaMigrationClassProvider", + "allEnvironments", "environmentProvisionMode"}) FluentConfiguration fluentConfiguration = new FluentConfiguration(); private final String nameQualifier; diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f44097fa..1756b5f5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ micronaut-test-resources="2.4.0" micronaut-gradle-plugin = "4.3.5" -managed-flyway = "10.9.0" +managed-flyway = "10.10.0" graal-svm = "23.1.2" persistence-api = '2.2'