From 3a0060b3a6f81ce1feec1fbc4b8de389a104cb2e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 22 Feb 2025 07:44:25 +0000 Subject: [PATCH 1/3] Update org.junit.jupiter to v5.12.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8b4636ce..836a41b6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] doma = "3.4.0" -junit = "5.11.4" +junit = "5.12.0" [libraries] doma-core = { module = "org.seasar.doma:doma-core", version.ref = "doma" } From 9569c0757c791e0a429ac4a40c7aa94efb2a443e Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 22 Feb 2025 18:05:00 +0900 Subject: [PATCH 2/3] Add JUnit BOM and junit-platform-launcher --- build.gradle.kts | 2 ++ common-test/build.gradle.kts | 1 + gradle/libs.versions.toml | 6 ++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bdbc9ae2..2a9d5f60 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -71,8 +71,10 @@ subprojects { implementation(catalog.doma.slf4j) runtimeOnly(catalog.logback.classic) runtimeOnly(catalog.jdbc.h2) + testImplementation(platform(catalog.junit.bom)) testImplementation(catalog.junit.jupiter.api) testRuntimeOnly(catalog.junit.jupiter.engine) + testRuntimeOnly(catalog.junit.platform.launcher) } eclipse { diff --git a/common-test/build.gradle.kts b/common-test/build.gradle.kts index 57604845..85035690 100644 --- a/common-test/build.gradle.kts +++ b/common-test/build.gradle.kts @@ -4,5 +4,6 @@ plugins { dependencies { implementation(project(":common")) + implementation(platform(libs.junit.bom)) implementation(libs.junit.jupiter.api) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 836a41b6..ca24bb69 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,8 +12,10 @@ jdbc-postgresql = { module = "org.postgresql:postgresql", version = "42.7.5" } logback-classic = { module = "ch.qos.logback:logback-classic", version = "1.5.16" } -junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" } -junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" } +junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" } +junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api" } +junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" } +junit-platform-launcher = { module = "org.junit.platform:c" } testcontainers-bom = { module = "org.testcontainers:testcontainers-bom", version = "1.20.5" } testcontainers-postgresql = { module = "org.testcontainers:postgresql" } From a503cb18505fffebd0eac7361c153f1b8aaab88f Mon Sep 17 00:00:00 2001 From: Toshihiro Nakamura Date: Sat, 22 Feb 2025 18:11:48 +0900 Subject: [PATCH 3/3] Fix module reference --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ca24bb69..fca5b79e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] doma = "3.4.0" -junit = "5.12.0" +junit = "5.11.4" [libraries] doma-core = { module = "org.seasar.doma:doma-core", version.ref = "doma" } @@ -15,7 +15,7 @@ logback-classic = { module = "ch.qos.logback:logback-classic", version = "1.5.16 junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" } junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api" } junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" } -junit-platform-launcher = { module = "org.junit.platform:c" } +junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" } testcontainers-bom = { module = "org.testcontainers:testcontainers-bom", version = "1.20.5" } testcontainers-postgresql = { module = "org.testcontainers:postgresql" }