From b6da457b41c33e00ccc9012669be2769f1d24db4 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 1 Oct 2025 13:37:10 -0700 Subject: [PATCH 1/4] Modernize JUnit Gradle configuration --- buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index 8a72f5dc1..55ee42d3c 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -147,10 +147,11 @@ dependencies { testing { suites.withType(JvmTestSuite::class).configureEach { + useJUnitJupiter("5.13.4") + dependencies { implementation(project(project.path)) - implementation(enforcedPlatform("org.junit:junit-bom:5.13.4")) implementation(enforcedPlatform("org.testcontainers:testcontainers-bom:1.21.3")) implementation(enforcedPlatform("com.google.guava:guava-bom:33.5.0-jre")) implementation(enforcedPlatform("com.linecorp.armeria:armeria-bom:1.33.4")) @@ -159,16 +160,12 @@ testing { compileOnly("com.google.errorprone:error_prone_annotations") compileOnly("com.google.code.findbugs:jsr305") - implementation("org.junit.jupiter:junit-jupiter-api") implementation("org.junit.jupiter:junit-jupiter-params") implementation("org.mockito:mockito-core") implementation("org.mockito:mockito-junit-jupiter") implementation("org.assertj:assertj-core") implementation("org.awaitility:awaitility") implementation("io.github.netmikey.logunit:logunit-jul") - - runtimeOnly("org.junit.jupiter:junit-jupiter-engine") - runtimeOnly("org.junit.platform:junit-platform-launcher") } } } From 101dbd1e0d43cae3fbaf19852d441b26c16e546f Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 1 Oct 2025 16:23:06 -0700 Subject: [PATCH 2/4] fix --- buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index 55ee42d3c..6c90ad131 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -147,11 +147,15 @@ dependencies { testing { suites.withType(JvmTestSuite::class).configureEach { - useJUnitJupiter("5.13.4") + useJUnitJupiter() dependencies { implementation(project(project.path)) + // this is only needed to establish the version of JUnit we want to use + // since Renovate doesn't currently understand useJUnitJupiter("") + implementation("org.junit.jupiter:junit-jupiter-api:5.13.4") + implementation(enforcedPlatform("org.testcontainers:testcontainers-bom:1.21.3")) implementation(enforcedPlatform("com.google.guava:guava-bom:33.5.0-jre")) implementation(enforcedPlatform("com.linecorp.armeria:armeria-bom:1.33.4")) @@ -160,7 +164,6 @@ testing { compileOnly("com.google.errorprone:error_prone_annotations") compileOnly("com.google.code.findbugs:jsr305") - implementation("org.junit.jupiter:junit-jupiter-params") implementation("org.mockito:mockito-core") implementation("org.mockito:mockito-junit-jupiter") implementation("org.assertj:assertj-core") From e758b751a9427edb5fbd5898aaa243035e80d183 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 14 Oct 2025 13:16:53 -0700 Subject: [PATCH 3/4] renovate --- buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index eb9df3f60..1af2c2f9b 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -147,15 +147,11 @@ dependencies { testing { suites.withType(JvmTestSuite::class).configureEach { - useJUnitJupiter() + useJUnitJupiter("5.14.0") dependencies { implementation(project()) - // this is only needed to establish the version of JUnit we want to use - // since Renovate doesn't currently understand useJUnitJupiter("") - implementation("org.junit.jupiter:junit-jupiter-api:5.14.0") - implementation(enforcedPlatform("org.testcontainers:testcontainers-bom:1.21.3")) implementation(enforcedPlatform("com.google.guava:guava-bom:33.5.0-jre")) implementation(enforcedPlatform("com.linecorp.armeria:armeria-bom:1.33.4")) From 36f656b9098b53d6884ad156f3f4673081d95e63 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 16 Oct 2025 16:01:13 -0700 Subject: [PATCH 4/4] less --- buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index 1af2c2f9b..488465468 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -147,7 +147,7 @@ dependencies { testing { suites.withType(JvmTestSuite::class).configureEach { - useJUnitJupiter("5.14.0") + useJUnitJupiter("5.13.4") dependencies { implementation(project())