From af4093e8387945b607cff75d18c61e22cde167de Mon Sep 17 00:00:00 2001 From: altro3 Date: Tue, 17 Oct 2023 15:11:51 +0700 Subject: [PATCH] Corrections in dependencies. Update libs versions. --- gradle/libs.versions.toml | 26 ++++++++++---------------- settings.gradle | 2 ++ test-suite-groovy/build.gradle | 19 +++++++++---------- test-suite-kotlin/build.gradle | 16 ++++++++-------- test-suite/build.gradle | 12 ++++++------ validation/build.gradle | 12 +++++++----- 6 files changed, 42 insertions(+), 45 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f5dd4954..1d6f5fed 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,18 +1,16 @@ [versions] micronaut = "4.1.9" -micronaut-platform = "4.1.0" +micronaut-platform = "4.1.4" micronaut-docs = "2.0.0" -micronaut-test = "4.0.1" +micronaut-test = "4.0.2" micronaut-reactor = "3.0.3" micronaut-rxjava2 = "2.0.1" micronaut-kotlin = "4.0.2" -micronaut-logging = "1.1.0" +micronaut-logging = "1.1.2" groovy = "4.0.15" -kotlin = "1.9.10" -kotest = "5.7.2" -junit5 = "5.10.0" -spotbugs = "4.7.3" +spotbugs = "4.8.0" +jakarta-validation-tck = "3.0.1" managed-validation = "3.0.2" @@ -22,8 +20,6 @@ micronaut-gradle-plugin = "4.1.1" kotlin-gradle-plugin = "1.9.10" ksp-gradle-plugin = "1.9.10-1.0.13" -jakarta-validation-tck = "3.0.1" - [libraries] # Core micronaut-core = { module = 'io.micronaut:micronaut-core-bom', version.ref = 'micronaut' } @@ -33,18 +29,16 @@ micronaut-logging = { module = "io.micronaut.logging:micronaut-logging-bom", ver micronaut-reactor = { module = 'io.micronaut.reactor:micronaut-reactor-bom', version.ref = "micronaut-reactor" } micronaut-rxjava2 = { module = 'io.micronaut.rxjava2:micronaut-rxjava2-bom', version.ref = "micronaut-rxjava2" } micronaut-kotlin = { module = 'io.micronaut.kotlin:micronaut-kotlin-bom', version.ref = "micronaut-kotlin" } +micronaut-test = { module = 'io.micronaut.test:micronaut-test-bom', version.ref = "micronaut-test" } groovy-bom = { module = "org.apache.groovy:groovy-bom", version.ref = "groovy" } -groovy-json = { module = "org.apache.groovy:groovy-json" } # TESTING -micronaut-test-junit5 = { module = "io.micronaut.test:micronaut-test-junit5", version.ref = "micronaut-test" } -micronaut-test-spock = { module = "io.micronaut.test:micronaut-test-spock", version.ref = "micronaut-test" } -junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit5" } -junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit5" } -kotlin-kotest-junit5 = { module = "io.kotest:kotest-runner-junit5-jvm", version.ref = "kotest" } -kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } +junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" } +kotlin-kotest-junit5 = { module = "io.kotest:kotest-runner-junit5-jvm" } +kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" } +groovy-json = { module = "org.apache.groovy:groovy-json" } spotbugs = { module = "com.github.spotbugs:spotbugs-annotations", version.ref = "spotbugs" } # MANAGED DEPENDENCIES diff --git a/settings.gradle b/settings.gradle index 8cd9d583..e4739d97 100644 --- a/settings.gradle +++ b/settings.gradle @@ -33,5 +33,7 @@ micronautBuild { importMicronautCatalog() importMicronautCatalog("micronaut-reactor") importMicronautCatalog("micronaut-rxjava2") + importMicronautCatalog("micronaut-test") + importMicronautCatalog("micronaut-kotlin") } diff --git a/test-suite-groovy/build.gradle b/test-suite-groovy/build.gradle index 67d419ee..f13617ea 100644 --- a/test-suite-groovy/build.gradle +++ b/test-suite-groovy/build.gradle @@ -4,23 +4,22 @@ plugins { } dependencies { - testImplementation mn.micronaut.inject - testImplementation libs.managed.validation - - testCompileOnly mn.micronaut.inject.groovy - testImplementation project(":micronaut-validation") - testImplementation project(":micronaut-validation-processor") - testAnnotationProcessor project(":micronaut-validation-processor") + testAnnotationProcessor projects.micronautValidationProcessor testAnnotationProcessor mn.micronaut.inject.java + testCompileOnly mn.micronaut.inject.groovy + + testImplementation projects.micronautValidation + testImplementation projects.micronautValidationProcessor testImplementation mn.micronaut.http.client testImplementation mn.micronaut.http.server.netty testImplementation mn.micronaut.inject.java.test testImplementation mn.micronaut.jackson.databind + testImplementation mn.micronaut.inject + testImplementation mnTest.micronaut.test.junit5 + testImplementation mnTest.micronaut.test.spock + testImplementation libs.managed.validation - testImplementation libs.junit.jupiter.api - testImplementation libs.micronaut.test.spock - testImplementation libs.junit.jupiter.engine testRuntimeOnly libs.junit.jupiter.engine } diff --git a/test-suite-kotlin/build.gradle b/test-suite-kotlin/build.gradle index e36f6528..c3aeaac9 100644 --- a/test-suite-kotlin/build.gradle +++ b/test-suite-kotlin/build.gradle @@ -14,22 +14,22 @@ tasks.withType(KotlinCompile).configureEach { } dependencies { - testImplementation mn.micronaut.inject - testImplementation libs.managed.validation - testImplementation project(":micronaut-validation") - kspTest project(":micronaut-validation-processor") + kspTest projects.micronautValidationProcessor kspTest mn.micronaut.inject.kotlin + testImplementation mn.micronaut.inject + testImplementation libs.managed.validation + testImplementation projects.micronautValidation + testImplementation mn.micronaut.inject testImplementation libs.kotlin.test - testImplementation libs.junit.jupiter.api + testImplementation mnTest.micronaut.test.junit5 testImplementation libs.kotlin.kotest.junit5 - testImplementation libs.micronaut.test.junit5 - testImplementation libs.junit.jupiter.engine - testImplementation mn.micronaut.http.client testImplementation mn.micronaut.http.server.netty testImplementation mn.micronaut.jackson.databind + + testRuntimeOnly libs.junit.jupiter.engine } diff --git a/test-suite/build.gradle b/test-suite/build.gradle index 13c5de86..408d4145 100644 --- a/test-suite/build.gradle +++ b/test-suite/build.gradle @@ -3,22 +3,22 @@ plugins { } dependencies { - testAnnotationProcessor project(":micronaut-validation-processor") + testAnnotationProcessor projects.micronautValidationProcessor testAnnotationProcessor mn.micronaut.inject.java testImplementation mn.micronaut.inject testImplementation mn.micronaut.core.reactive testImplementation libs.managed.validation - testImplementation project(":micronaut-validation") + testImplementation projects.micronautValidation testImplementation mn.micronaut.http.client testImplementation mn.micronaut.http.server.netty testImplementation mn.micronaut.jackson.databind - testImplementation libs.junit.jupiter.api - testImplementation libs.micronaut.test.junit5 - testImplementation libs.micronaut.test.spock - testImplementation libs.junit.jupiter.engine + testImplementation mnTest.micronaut.test.junit5 + testImplementation mnTest.micronaut.test.spock + + testRuntimeOnly libs.junit.jupiter.engine } diff --git a/validation/build.gradle b/validation/build.gradle index b693a66e..23a63bf6 100644 --- a/validation/build.gradle +++ b/validation/build.gradle @@ -5,19 +5,21 @@ plugins { dependencies { annotationProcessor mn.micronaut.inject.java + compileOnly mn.micronaut.http.server + api mn.micronaut.inject api mn.micronaut.core.reactive api libs.managed.validation - compileOnly mn.micronaut.http.server - implementation mnReactor.micronaut.reactor - testAnnotationProcessor project(":micronaut-validation-processor") - testImplementation project(":micronaut-validation-processor") + testAnnotationProcessor projects.micronautValidationProcessor testAnnotationProcessor mn.micronaut.inject.java - testImplementation libs.spotbugs + testCompileOnly mn.micronaut.inject.groovy + + testImplementation projects.micronautValidationProcessor + testImplementation libs.spotbugs testImplementation mn.micronaut.inject testImplementation platform(libs.groovy.bom)