diff --git a/benchmark-overhead/build.gradle.kts b/benchmark-overhead/build.gradle.kts index 833175bf9048..c14adf2a985a 100644 --- a/benchmark-overhead/build.gradle.kts +++ b/benchmark-overhead/build.gradle.kts @@ -16,7 +16,7 @@ repositories { } dependencies { - implementation(enforcedPlatform("org.junit:junit-bom:5.11.4")) + implementation(enforcedPlatform("org.junit:junit-bom:5.12.0")) testImplementation("org.testcontainers:testcontainers:1.20.5") testImplementation("org.testcontainers:postgresql:1.20.5") diff --git a/conventions/build.gradle.kts b/conventions/build.gradle.kts index 2618908a9300..5d099c34c361 100644 --- a/conventions/build.gradle.kts +++ b/conventions/build.gradle.kts @@ -71,7 +71,7 @@ dependencies { implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0") implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.6") - testImplementation(enforcedPlatform("org.junit:junit-bom:5.11.4")) + testImplementation(enforcedPlatform("org.junit:junit-bom:5.12.0")) testImplementation("org.junit.jupiter:junit-jupiter-api") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") testImplementation("org.assertj:assertj-core:3.27.3") diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index fd308d45d304..280396d836f5 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -81,7 +81,7 @@ val CORE_DEPENDENCIES = listOf( // There are dependencies included here that appear to have no usages, but are maintained at // this top level to help consistently satisfy large numbers of transitive dependencies. val DEPENDENCIES = listOf( - "org.junit.jupiter:junit-jupiter-api:5.11.4", + "org.junit.jupiter:junit-jupiter-api:5.12.0", "org.spockframework:spock-core:2.4-M5-groovy-4.0", "org.spockframework:spock-junit4:2.4-M5-groovy-4.0", diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle index 2f6d8400f816..631aac58e24c 100644 --- a/examples/distro/build.gradle +++ b/examples/distro/build.gradle @@ -33,8 +33,7 @@ subprojects { opentelemetryJavaagent : "2.14.0-SNAPSHOT", opentelemetryJavaagentAlpha: "2.14.0-alpha-SNAPSHOT", - autoservice : "1.1.1", - junit : "5.11.4" + autoservice : "1.1.1" ] deps = [ @@ -69,9 +68,11 @@ subprojects { implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions.opentelemetryJavaagentAlpha}")) testImplementation("org.mockito:mockito-core:5.15.2") - testImplementation(enforcedPlatform("org.junit:junit-bom:${versions.junit}")) - testImplementation("org.junit.jupiter:junit-jupiter-api:${versions.junit}") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${versions.junit}") + + testImplementation(enforcedPlatform("org.junit:junit-bom:5.12.0")) + testImplementation("org.junit.jupiter:junit-jupiter-api") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") } tasks { diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle index 9a67f9c8fcb8..f869aa974949 100644 --- a/examples/extension/build.gradle +++ b/examples/extension/build.gradle @@ -27,9 +27,7 @@ ext { // these lines are managed by .github/scripts/update-version.sh opentelemetryJavaagent : "2.14.0-SNAPSHOT", - opentelemetryJavaagentAlpha: "2.14.0-alpha-SNAPSHOT", - - junit : "5.11.4" + opentelemetryJavaagentAlpha: "2.14.0-alpha-SNAPSHOT" ] deps = [ @@ -106,8 +104,11 @@ dependencies { testImplementation("io.opentelemetry:opentelemetry-api") testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha") - testImplementation("org.junit.jupiter:junit-jupiter-api:${versions.junit}") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${versions.junit}") + testImplementation(enforcedPlatform("org.junit:junit-bom:5.12.0")) + testImplementation("org.junit.jupiter:junit-jupiter-api") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testRuntimeOnly("ch.qos.logback:logback-classic:1.5.16") //Otel Java instrumentation that we use and extend during integration tests diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts index 7ab9d2ce1db9..589705552eaf 100644 --- a/gradle-plugins/build.gradle.kts +++ b/gradle-plugins/build.gradle.kts @@ -44,10 +44,10 @@ dependencies { testImplementation("org.assertj:assertj-core:3.27.3") - testImplementation(enforcedPlatform("org.junit:junit-bom:5.11.4")) + testImplementation(enforcedPlatform("org.junit:junit-bom:5.12.0")) testImplementation("org.junit.jupiter:junit-jupiter-api") - testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") } tasks {