From b6da457b41c33e00ccc9012669be2769f1d24db4 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 1 Oct 2025 13:37:10 -0700 Subject: [PATCH 1/2] 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 8a72f5dc12..55ee42d3c8 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 95d0ded9e694cfdb75ee845f68fd4c593589c7ff Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 12:52:30 +0000 Subject: [PATCH 2/2] fix(deps): update junit-framework monorepo --- buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts | 2 +- ibm-mq-metrics/build.gradle.kts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index 55ee42d3c8..23c69bd78a 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)) diff --git a/ibm-mq-metrics/build.gradle.kts b/ibm-mq-metrics/build.gradle.kts index d57b87795a..fad092eee6 100644 --- a/ibm-mq-metrics/build.gradle.kts +++ b/ibm-mq-metrics/build.gradle.kts @@ -43,12 +43,12 @@ dependencies { testImplementation("com.google.guava:guava") testImplementation("io.opentelemetry:opentelemetry-sdk-testing") integrationTestImplementation("org.assertj:assertj-core:3.27.6") - integrationTestImplementation("org.junit.jupiter:junit-jupiter-api:5.13.4") + integrationTestImplementation("org.junit.jupiter:junit-jupiter-api:5.14.0") integrationTestImplementation("io.opentelemetry:opentelemetry-sdk-testing") integrationTestImplementation("com.ibm.mq:com.ibm.mq.jakarta.client:9.4.3.1") integrationTestImplementation("jakarta.jms:jakarta.jms-api:3.1.0") - integrationTestImplementation("org.junit.jupiter:junit-jupiter-engine:5.13.4") - integrationTestRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4") + integrationTestImplementation("org.junit.jupiter:junit-jupiter-engine:5.14.0") + integrationTestRuntimeOnly("org.junit.platform:junit-platform-launcher:1.14.0") ibmClientJar("com.ibm.mq:com.ibm.mq.allclient:9.4.3.1") { artifact { name = "com.ibm.mq.allclient"