diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b730e14d1..f8ea53539 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -52,6 +52,10 @@ managed-mockk = { module = "io.mockk:mockk", version.ref = "managed-mockk" } managed-kotest-assertions-core-jvm = { module = "io.kotest:kotest-assertions-core-jvm", version.ref = "managed-kotest" } managed-kotest-runner-junit5-jvm = { module = "io.kotest:kotest-runner-junit5-jvm", version.ref = "managed-kotest" } +managed-junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "managed-junit" } +managed-junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "managed-junit" } +managed-junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "managed-junit" } + # BOMs boms-junit = { module = "org.junit:junit-bom", version.ref = "managed-junit" } boms-kotest = { module = "io.kotest:kotest-bom", version.ref = "managed-kotest" } @@ -64,9 +68,6 @@ graal-svm = { module = "org.graalvm.nativeimage:svm", version.ref = "graal-svm" spock-core = { module = "org.spockframework:spock-core" } jakarta-inject-api = { module = "jakarta.inject:jakarta.inject-api" } -junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "managed-junit" } -junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "managed-junit" } -junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "managed-junit" } rest-assured = { module = "io.rest-assured:rest-assured" } kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } diff --git a/test-core/build.gradle b/test-core/build.gradle index 4473256df..c820dddcf 100644 --- a/test-core/build.gradle +++ b/test-core/build.gradle @@ -5,7 +5,7 @@ plugins { dependencies { compileOnly(mn.micronaut.http.server) - compileOnly(libs.junit.jupiter.api) + compileOnly(libs.managed.junit.jupiter.api) compileOnly(mnData.micronaut.data.connection.jdbc) compileOnly(mnR2dbc.r2dbc.spi) compileOnly(mn.reactor) diff --git a/test-junit5/build.gradle b/test-junit5/build.gradle index 9b9e1b02b..aac010e42 100644 --- a/test-junit5/build.gradle +++ b/test-junit5/build.gradle @@ -34,18 +34,21 @@ tasks.withType(Jar).configureEach { } dependencies { + + compileOnly(libs.graal.svm) + api projects.micronautTestCore api(mn.micronaut.inject) - api(libs.junit.jupiter.api) + api(libs.managed.junit.jupiter.api) + implementation(mn.micronaut.context) - compileOnly(libs.graal.svm) testCompileOnly(mn.micronaut.inject) testAnnotationProcessor(mn.micronaut.inject.java) testAnnotationProcessor(mn.micronaut.graal) - testImplementation(libs.junit.jupiter.params) + testImplementation(libs.managed.junit.jupiter.params) testImplementation(mn.micronaut.http.server.netty) testImplementation(mn.micronaut.http.client) testImplementation(libs.managed.mockito.junit.jupiter) @@ -58,7 +61,7 @@ dependencies { testRuntimeOnly(mnSql.micronaut.jdbc.tomcat) testRuntimeOnly(mnSql.h2) testRuntimeOnly(mnSerde.micronaut.serde.jackson) - testRuntimeOnly(libs.junit.jupiter.engine) + testRuntimeOnly(libs.managed.junit.jupiter.engine) testRuntimeOnly(testFixtures(projects.micronautTestCore)) } diff --git a/test-kotest5/build.gradle b/test-kotest5/build.gradle index d9e101a37..3d780707a 100644 --- a/test-kotest5/build.gradle +++ b/test-kotest5/build.gradle @@ -5,6 +5,9 @@ plugins { } dependencies { + + compileOnly(libs.jakarta.inject.api) + api projects.micronautTestCore api(mn.micronaut.context) api(platform(libs.boms.kotest)) @@ -15,27 +18,23 @@ dependencies { implementation(libs.kotlin.stdlib.jdk8) implementation(libs.kotlin.reflect) - compileOnly(libs.jakarta.inject.api) - - testCompileOnly(libs.jakarta.inject.api) - kaptTest(platform(mn.micronaut.core.bom)) kaptTest(mn.micronaut.inject.java) - testImplementation(libs.managed.mockk) + testCompileOnly(libs.jakarta.inject.api) + testImplementation(libs.managed.mockk) testImplementation(mn.micronaut.http.server.netty) testImplementation(mn.micronaut.http.client) - testImplementation(mnData.micronaut.data.tx) testImplementation(mnData.micronaut.data.hibernate.jpa) + testImplementation(mn.snakeyaml) + testImplementation(libs.managed.kotest.assertions.core.jvm) testRuntimeOnly(mnLogging.logback.classic) testRuntimeOnly(mnSql.micronaut.jdbc.tomcat) testRuntimeOnly(mnSql.h2) testRuntimeOnly(mnSerde.micronaut.serde.jackson) - testImplementation(mn.snakeyaml) - testImplementation(libs.managed.kotest.assertions.core.jvm) testRuntimeOnly(testFixtures(projects.micronautTestCore)) } diff --git a/test-rest-assured/build.gradle b/test-rest-assured/build.gradle index f66d9ccd2..2cc1a9e65 100644 --- a/test-rest-assured/build.gradle +++ b/test-rest-assured/build.gradle @@ -4,6 +4,7 @@ plugins { dependencies { annotationProcessor(mn.micronaut.inject.java) + api projects.micronautTestCore api(platform(libs.boms.rest.assured)) api(mn.micronaut.inject) @@ -11,15 +12,17 @@ dependencies { exclude group:"org.codehaus.groovy", module:"groovy" } implementation(mn.micronaut.context) - implementation(libs.groovy) - testCompileOnly(mn.micronaut.inject) testAnnotationProcessor(mn.micronaut.inject.java) - testImplementation(libs.junit.jupiter.api) + + testCompileOnly(mn.micronaut.inject) + + testImplementation(libs.managed.junit.jupiter.api) testImplementation projects.micronautTestJunit5 testImplementation(mn.micronaut.http.server.netty) testImplementation(libs.managed.hamcrest) - testRuntimeOnly(libs.junit.jupiter.engine) + + testRuntimeOnly(libs.managed.junit.jupiter.engine) testRuntimeOnly(mnSerde.micronaut.serde.jackson) } diff --git a/test-spock/build.gradle b/test-spock/build.gradle index cefadcc21..333089de8 100644 --- a/test-spock/build.gradle +++ b/test-spock/build.gradle @@ -3,23 +3,25 @@ plugins { } dependencies { + + compileOnly(libs.jakarta.inject.api) + api(platform(libs.boms.spock)) api projects.micronautTestCore api(mn.micronaut.inject) api(libs.spock.core) { exclude group: "org.codehaus.groovy", module: "groovy-all" } + implementation(mn.micronaut.context) - compileOnly(libs.jakarta.inject.api) testCompileOnly(libs.jakarta.inject.api) + testImplementation(mn.micronaut.inject.groovy) testImplementation(mn.micronaut.http.server.netty) testImplementation(mn.micronaut.http.client) - testImplementation(mnSql.micronaut.jdbc.hikari) testImplementation(libs.micronaut.hibernate.validator) -// testImplementation(mn.micronaut.hibernate.gorm) testImplementation(mnSpring.micronaut.spring) testImplementation(mn.snakeyaml) testImplementation(mnReactor.micronaut.reactor) diff --git a/test-suite-at-sql-jpa/build.gradle.kts b/test-suite-at-sql-jpa/build.gradle.kts index 8aee0e533..97f727501 100644 --- a/test-suite-at-sql-jpa/build.gradle.kts +++ b/test-suite-at-sql-jpa/build.gradle.kts @@ -8,22 +8,23 @@ repositories { dependencies { annotationProcessor(mn.micronaut.inject.java) - testAnnotationProcessor(mn.micronaut.inject.java) - annotationProcessor(mnData.micronaut.data.processor) + implementation(mnData.micronaut.data.hibernate.jpa) implementation(mnSql.micronaut.jdbc.hikari) - runtimeOnly(mnSql.postgresql) + runtimeOnly(mnSql.postgresql) runtimeOnly(mnLogging.logback.classic) - testImplementation(libs.junit.jupiter.api) - testImplementation(projects.micronautTestJunit5) - testRuntimeOnly(libs.junit.jupiter.engine) + testAnnotationProcessor(mn.micronaut.inject.java) testImplementation(platform(libs.testcontainers.bom)) + testImplementation(libs.managed.junit.jupiter.api) + testImplementation(projects.micronautTestJunit5) testImplementation(libs.testcontainers) testImplementation(libs.testcontainers.postgresql) + + testRuntimeOnly(libs.managed.junit.jupiter.engine) } tasks.withType { useJUnitPlatform()