From 82b4a6a51beab47f88bdeaec35bdfe3e8b19cf44 Mon Sep 17 00:00:00 2001 From: Sergio del Amo Date: Wed, 6 Nov 2024 16:17:07 +0100 Subject: [PATCH] Flyway to Micronaut Core 4.7 (#612) * fix(deps): update dependency io.micronaut:micronaut-core-bom to v4.7.2 * fix(deps): update dependency io.micronaut.serde:micronaut-serde-bom to v2.12.0 * fix(deps): update dependency io.micronaut.testresources:micronaut-test-resources-bom to v2.6.2 * fix(deps): update flyway to v10.20.1 * copy reflect-config.json from reachability repo * add parenthesis * use latest graalvm metadata repository. --- ...cronaut.build.internal.flyway-tests.gradle | 6 +- .../micronaut-flyway/reflect-config.json | 58 ------------------- gradle/libs.versions.toml | 8 +-- 3 files changed, 7 insertions(+), 65 deletions(-) delete mode 100644 flyway/src/main/resources/META-INF/native-image/io.micronaut.flyway/micronaut-flyway/reflect-config.json diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.flyway-tests.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.flyway-tests.gradle index 2cea5021..6b23feec 100644 --- a/buildSrc/src/main/groovy/io.micronaut.build.internal.flyway-tests.gradle +++ b/buildSrc/src/main/groovy/io.micronaut.build.internal.flyway-tests.gradle @@ -1,15 +1,15 @@ plugins { - id "io.micronaut.build.internal.flyway-base" - id 'org.graalvm.buildtools.native' + id("io.micronaut.build.internal.flyway-base") + id("org.graalvm.buildtools.native") } tasks.named("test") { useJUnitPlatform() } - graalvmNative { toolchainDetection = false metadataRepository { + version = "0.3.12" enabled = true } binaries { diff --git a/flyway/src/main/resources/META-INF/native-image/io.micronaut.flyway/micronaut-flyway/reflect-config.json b/flyway/src/main/resources/META-INF/native-image/io.micronaut.flyway/micronaut-flyway/reflect-config.json deleted file mode 100644 index 9f25a95f..00000000 --- a/flyway/src/main/resources/META-INF/native-image/io.micronaut.flyway/micronaut-flyway/reflect-config.json +++ /dev/null @@ -1,58 +0,0 @@ -[ - { - "name": "org.flywaydb.core.api.migration.baseline.BaselineMigrationConfigurationExtension", - "queryAllDeclaredMethods": true, - "allDeclaredFields": true, - "queryAllDeclaredConstructors": true, - "methods": [ - { - "name": "", - "parameterTypes": [ - - ] - }, - { - "name": "getBaselineMigrationPrefix", - "parameterTypes": [ - - ] - }, - { - "name": "setBaselineMigrationPrefix", - "parameterTypes": [ - "java.lang.String" - ] - } - ] - }, - { - "name": "org.flywaydb.core.extensibility.ConfigurationExtension", - "queryAllDeclaredMethods": true - }, - { - "name": "org.flywaydb.core.internal.command.clean.CleanModeConfigurationExtension", - "queryAllDeclaredMethods": true, - "allDeclaredFields": true, - "queryAllDeclaredConstructors": true, - "methods": [ - { - "name": "", - "parameterTypes": [ - - ] - }, - { - "name": "getClean", - "parameterTypes": [ - - ] - }, - { - "name": "setClean", - "parameterTypes": [ - "org.flywaydb.core.internal.command.clean.CleanModel" - ] - } - ] - } -] \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e73979c8..c14c1886 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,16 +1,16 @@ [versions] micronaut-docs = "2.0.0" -micronaut = "4.6.6" +micronaut = "4.7.2" micronaut-logging = "1.3.0" micronaut-platform = "4.2.3" micronaut-test = "4.4.0" -micronaut-serde = "2.11.2" +micronaut-serde = "2.12.0" micronaut-sql = "5.8.2" -micronaut-test-resources="2.5.4" +micronaut-test-resources="2.6.2" micronaut-gradle-plugin = "4.4.4" -managed-flyway = "10.17.3" +managed-flyway = "10.20.1" graal-svm = "23.1.5" persistence-api = '2.2'