From 254abe1264843d3b8f6dd8bd149a80e5f2520ae9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 15:21:50 +0100 Subject: [PATCH] fix(deps): update dependency io.micronaut.flyway:micronaut-flyway-bom to v7 (#569) * fix(deps): update dependency io.micronaut.flyway:micronaut-flyway-bom to v7 * use flyway mysql from flyway bom * platform to 4.2.3 * test to 4.2.0 * Fix r2dbc build --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Sergio del Amo Co-authored-by: radovanradic --- .../io.micronaut.build.internal.r2dbc-example.gradle | 4 ++-- doc-examples/example-groovy/build.gradle.kts | 8 ++++++++ .../src/test/groovy/example/BookControllerTest.groovy | 2 +- doc-examples/example-java/build.gradle | 5 +++++ .../src/test/java/example/BookControllerTest.java | 2 +- .../src/test/kotlin/example/BookControllerTest.kt | 2 +- .../src/test/kotlin/example/SomeEntityRepositoryTest.kt | 2 +- gradle/libs.versions.toml | 8 +++----- 8 files changed, 22 insertions(+), 11 deletions(-) diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.r2dbc-example.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.r2dbc-example.gradle index 77a4e4eeb..e976e606c 100644 --- a/buildSrc/src/main/groovy/io.micronaut.build.internal.r2dbc-example.gradle +++ b/buildSrc/src/main/groovy/io.micronaut.build.internal.r2dbc-example.gradle @@ -37,7 +37,7 @@ dependencies { runtimeOnly(libs.managed.r2dbc.mysql) runtimeOnly(mnSql.mysql.connector.java) - runtimeOnly(libs.flyway.mysql) + runtimeOnly(mnFlyway.flyway.mysql) testImplementation(mn.micronaut.http.client) testImplementation(platform(libs.testcontainers)) @@ -45,4 +45,4 @@ dependencies { testImplementation(mnTest.micronaut.test.core) runtimeOnly mn.snakeyaml -} +} \ No newline at end of file diff --git a/doc-examples/example-groovy/build.gradle.kts b/doc-examples/example-groovy/build.gradle.kts index 8e3ec8702..af4e81c4c 100644 --- a/doc-examples/example-groovy/build.gradle.kts +++ b/doc-examples/example-groovy/build.gradle.kts @@ -6,3 +6,11 @@ plugins { micronaut { testRuntime("spock") } + +dependencies { + annotationProcessor(mnSerde.micronaut.serde.processor) + compileOnly(mnSerde.micronaut.serde.processor) + + testAnnotationProcessor(mnSerde.micronaut.serde.processor) + testImplementation(mnSerde.micronaut.serde.processor) +} diff --git a/doc-examples/example-groovy/src/test/groovy/example/BookControllerTest.groovy b/doc-examples/example-groovy/src/test/groovy/example/BookControllerTest.groovy index e42fe767d..e463a98cd 100644 --- a/doc-examples/example-groovy/src/test/groovy/example/BookControllerTest.groovy +++ b/doc-examples/example-groovy/src/test/groovy/example/BookControllerTest.groovy @@ -67,7 +67,7 @@ class BookControllerTest extends Specification implements TestPropertyProvider { @Override Map getProperties() { - container = new MySQLContainer<>(DockerImageName.parse("mysql").withTag("8")) + container = new MySQLContainer<>(DockerImageName.parse("mysql").withTag("8.2")) container.start() return CollectionUtils.mapOf( "datasources.default.url", container.getJdbcUrl(), diff --git a/doc-examples/example-java/build.gradle b/doc-examples/example-java/build.gradle index 222545914..44e573f3b 100644 --- a/doc-examples/example-java/build.gradle +++ b/doc-examples/example-java/build.gradle @@ -2,3 +2,8 @@ plugins { id "java" id "io.micronaut.build.internal.r2dbc-example" } + +dependencies { + annotationProcessor(mnSerde.micronaut.serde.processor) + testAnnotationProcessor(mnSerde.micronaut.serde.processor) +} diff --git a/doc-examples/example-java/src/test/java/example/BookControllerTest.java b/doc-examples/example-java/src/test/java/example/BookControllerTest.java index 2dc17fa44..a03540d42 100644 --- a/doc-examples/example-java/src/test/java/example/BookControllerTest.java +++ b/doc-examples/example-java/src/test/java/example/BookControllerTest.java @@ -90,7 +90,7 @@ void testListBooksMicronautData() { @Override public Map getProperties() { - container = new MySQLContainer<>(DockerImageName.parse("mysql").withTag("8")); + container = new MySQLContainer<>(DockerImageName.parse("mysql").withTag("8.2")); container.start(); return CollectionUtils.mapOf( "datasources.default.url", container.getJdbcUrl(), diff --git a/doc-examples/example-kotlin/src/test/kotlin/example/BookControllerTest.kt b/doc-examples/example-kotlin/src/test/kotlin/example/BookControllerTest.kt index 95798deb0..28cfcf8e5 100644 --- a/doc-examples/example-kotlin/src/test/kotlin/example/BookControllerTest.kt +++ b/doc-examples/example-kotlin/src/test/kotlin/example/BookControllerTest.kt @@ -82,7 +82,7 @@ class BookControllerTest : TestPropertyProvider { } override fun getProperties(): Map { - container = MySQLContainer(DockerImageName.parse("mysql").withTag("8")) + container = MySQLContainer(DockerImageName.parse("mysql").withTag("8.2")) container!!.start() return mapOf( "datasources.default.url" to container!!.jdbcUrl, diff --git a/doc-examples/example-kotlin/src/test/kotlin/example/SomeEntityRepositoryTest.kt b/doc-examples/example-kotlin/src/test/kotlin/example/SomeEntityRepositoryTest.kt index 46ae146fb..87bf92516 100644 --- a/doc-examples/example-kotlin/src/test/kotlin/example/SomeEntityRepositoryTest.kt +++ b/doc-examples/example-kotlin/src/test/kotlin/example/SomeEntityRepositoryTest.kt @@ -25,7 +25,7 @@ class SomeEntityRepositoryTest : TestPropertyProvider { } override fun getProperties(): Map { - container = MySQLContainer(DockerImageName.parse("mysql").withTag("8")) + container = MySQLContainer(DockerImageName.parse("mysql").withTag("8.2")) container!!.start() return mapOf( "datasources.default.url" to container!!.jdbcUrl, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5ab840d3f..698545fb3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,16 +1,16 @@ [versions] micronaut = "4.2.3" -micronaut-platform = "4.1.6" +micronaut-platform = "4.2.3" micronaut-docs = "2.0.0" micronaut-reactor = "3.2.1" micronaut-rxjava2 = "2.2.1" micronaut-serde = "2.7.0" -micronaut-test = "4.0.1" +micronaut-test = "4.2.0" micronaut-kotlin = "4.1.0" micronaut-data = "4.4.1" micronaut-sql = "5.4.0" -micronaut-flyway = "6.2.1" +micronaut-flyway = "7.0.0" micronaut-validation = "4.2.0" micronaut-logging = "1.2.1" @@ -67,8 +67,6 @@ managed-r2dbc-io-asyncer-mysql = { module = "io.asyncer:r2dbc-mysql", version.re managed-r2dbc-mssql = { module = "io.r2dbc:r2dbc-mssql", version.ref = "managed-r2dbc-mssql" } managed-r2dbc-postgresql = { module = "org.postgresql:r2dbc-postgresql", version.ref = "managed-r2dbc-postgresql" } -flyway-mysql = { module = "org.flywaydb:flyway-mysql" } - testcontainers-jdbc = { module = "org.testcontainers:jdbc" } testcontainers-junit-jupiter = { module = "org.testcontainers:junit-jupiter" } testcontainers-mariadb = { module = "org.testcontainers:mariadb" }