From b6d55a53904d45d304a23fe39d596a22e35e0d7a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 3 May 2025 17:18:12 +0000 Subject: [PATCH 1/2] Update org.junit.jupiter to v5.12.2 --- compile-java-test/build.gradle.kts | 4 ++-- compile-kotlin-test/build.gradle.kts | 4 ++-- compile-mix-test/build.gradle.kts | 4 ++-- compile/build.gradle.kts | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compile-java-test/build.gradle.kts b/compile-java-test/build.gradle.kts index 4e911af..95f92ba 100644 --- a/compile-java-test/build.gradle.kts +++ b/compile-java-test/build.gradle.kts @@ -39,6 +39,6 @@ repositories { dependencies { annotationProcessor("org.seasar.doma:doma-processor:$domaVersion") implementation("org.seasar.doma:doma-core:$domaVersion") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.4") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.12.2") } \ No newline at end of file diff --git a/compile-kotlin-test/build.gradle.kts b/compile-kotlin-test/build.gradle.kts index b1db8da..0ddffc6 100644 --- a/compile-kotlin-test/build.gradle.kts +++ b/compile-kotlin-test/build.gradle.kts @@ -46,6 +46,6 @@ dependencies { kapt("org.seasar.doma:doma-processor:$domaVersion") implementation("org.seasar.doma:doma-core:$domaVersion") implementation("org.jetbrains.kotlin:kotlin-stdlib") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.4") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.12.2") } \ No newline at end of file diff --git a/compile-mix-test/build.gradle.kts b/compile-mix-test/build.gradle.kts index a4d01bd..81e79e2 100644 --- a/compile-mix-test/build.gradle.kts +++ b/compile-mix-test/build.gradle.kts @@ -46,6 +46,6 @@ dependencies { kapt("org.seasar.doma:doma-processor:$domaVersion") implementation("org.seasar.doma:doma-core:$domaVersion") implementation("org.jetbrains.kotlin:kotlin-stdlib") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.4") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.12.2") } \ No newline at end of file diff --git a/compile/build.gradle.kts b/compile/build.gradle.kts index b34cd3b..965c056 100644 --- a/compile/build.gradle.kts +++ b/compile/build.gradle.kts @@ -45,8 +45,8 @@ repositories { } dependencies { - testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.4") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.12.2") } tasks { From 0bf5f31a19d753ad0a01cd86e46c49605123acf0 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Sat, 3 May 2025 21:12:19 +0000 Subject: [PATCH 2/2] Use JUnit BOM and add junit-platform-launcher to fix test failures Co-Authored-By: Toshihiro Nakamura --- compile-java-test/build.gradle.kts | 9 ++++++--- compile-kotlin-test/build.gradle.kts | 9 ++++++--- compile-mix-test/build.gradle.kts | 9 ++++++--- compile/build.gradle.kts | 7 +++++-- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/compile-java-test/build.gradle.kts b/compile-java-test/build.gradle.kts index 95f92ba..513f970 100644 --- a/compile-java-test/build.gradle.kts +++ b/compile-java-test/build.gradle.kts @@ -39,6 +39,9 @@ repositories { dependencies { annotationProcessor("org.seasar.doma:doma-processor:$domaVersion") implementation("org.seasar.doma:doma-core:$domaVersion") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.12.2") -} \ No newline at end of file + // Use JUnit BOM for version management + testImplementation(platform("org.junit:junit-bom:5.12.2")) + testImplementation("org.junit.jupiter:junit-jupiter-api") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") +} diff --git a/compile-kotlin-test/build.gradle.kts b/compile-kotlin-test/build.gradle.kts index 0ddffc6..9c093e1 100644 --- a/compile-kotlin-test/build.gradle.kts +++ b/compile-kotlin-test/build.gradle.kts @@ -46,6 +46,9 @@ dependencies { kapt("org.seasar.doma:doma-processor:$domaVersion") implementation("org.seasar.doma:doma-core:$domaVersion") implementation("org.jetbrains.kotlin:kotlin-stdlib") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.12.2") -} \ No newline at end of file + // Use JUnit BOM for version management + testImplementation(platform("org.junit:junit-bom:5.12.2")) + testImplementation("org.junit.jupiter:junit-jupiter-api") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") +} diff --git a/compile-mix-test/build.gradle.kts b/compile-mix-test/build.gradle.kts index 81e79e2..089467c 100644 --- a/compile-mix-test/build.gradle.kts +++ b/compile-mix-test/build.gradle.kts @@ -46,6 +46,9 @@ dependencies { kapt("org.seasar.doma:doma-processor:$domaVersion") implementation("org.seasar.doma:doma-core:$domaVersion") implementation("org.jetbrains.kotlin:kotlin-stdlib") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.12.2") -} \ No newline at end of file + // Use JUnit BOM for version management + testImplementation(platform("org.junit:junit-bom:5.12.2")) + testImplementation("org.junit.jupiter:junit-jupiter-api") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") +} diff --git a/compile/build.gradle.kts b/compile/build.gradle.kts index 965c056..81b8bd9 100644 --- a/compile/build.gradle.kts +++ b/compile/build.gradle.kts @@ -45,8 +45,11 @@ repositories { } dependencies { - testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.12.2") + // Use JUnit BOM for version management + testImplementation(platform("org.junit:junit-bom:5.12.2")) + testImplementation("org.junit.jupiter:junit-jupiter-api") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") } tasks {