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 d06db9b1e6e61465d6f67f9ca1e5d34d1dc5ad94 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 9 Oct 2025 20:50:48 -0700 Subject: [PATCH 3/4] TESTING --- buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index bc5aeb16a..6c8a4f0be 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -65,7 +65,7 @@ tasks { } withType().configureEach { - useJUnitPlatform() + useJUnitPlatform("5.13.4") val maxTestRetries = gradle.startParameter.projectProperties["maxTestRetries"]?.toInt() ?: 0 develocity.testRetry { @@ -147,15 +147,11 @@ dependencies { testing { suites.withType(JvmTestSuite::class).configureEach { - useJUnitJupiter() + useJUnitJupiter("5.13.4") 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.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 de40aad41c275db54f413924c5d68a8fdbc91c1b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 Oct 2025 03:52:54 +0000 Subject: [PATCH 4/4] fix(deps): update dependency usejunitjupiter to v5.14.0 --- 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 6c8a4f0be..83eb4a856 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.13.4") + useJUnitJupiter("5.14.0") dependencies { implementation(project(project.path))