From 9b6f6fa0961f560dd9263af7edbf2ffdf3092c42 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 21 Feb 2025 14:38:37 +0000 Subject: [PATCH 1/6] fix(deps): update junit5 monorepo to v5.12.0 --- benchmark-overhead/build.gradle.kts | 2 +- conventions/build.gradle.kts | 2 +- dependencyManagement/build.gradle.kts | 2 +- examples/distro/build.gradle | 2 +- examples/extension/build.gradle | 2 +- gradle-plugins/build.gradle.kts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 e404b2988ee7..240b188b7932 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..e26dd114e5b7 100644 --- a/examples/distro/build.gradle +++ b/examples/distro/build.gradle @@ -34,7 +34,7 @@ subprojects { opentelemetryJavaagentAlpha: "2.14.0-alpha-SNAPSHOT", autoservice : "1.1.1", - junit : "5.11.4" + junit : "5.12.0" ] deps = [ diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle index 9a67f9c8fcb8..d6bbf2b15246 100644 --- a/examples/extension/build.gradle +++ b/examples/extension/build.gradle @@ -29,7 +29,7 @@ ext { opentelemetryJavaagent : "2.14.0-SNAPSHOT", opentelemetryJavaagentAlpha: "2.14.0-alpha-SNAPSHOT", - junit : "5.11.4" + junit : "5.12.0" ] deps = [ diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts index 7ab9d2ce1db9..e7914ed735e9 100644 --- a/gradle-plugins/build.gradle.kts +++ b/gradle-plugins/build.gradle.kts @@ -44,7 +44,7 @@ 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") From 2e0a163a5c144362e2c257a6bee4882db07c1337 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 21 Feb 2025 18:54:15 -0800 Subject: [PATCH 2/6] fix --- gradle-plugins/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts index e7914ed735e9..589705552eaf 100644 --- a/gradle-plugins/build.gradle.kts +++ b/gradle-plugins/build.gradle.kts @@ -46,8 +46,8 @@ dependencies { 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 { From 49ab3790aea281c7cd092e0aa351a035c1602ed6 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 21 Feb 2025 18:55:26 -0800 Subject: [PATCH 3/6] fix --- examples/distro/build.gradle | 2 +- examples/extension/build.gradle | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle index e26dd114e5b7..6c8e2e280649 100644 --- a/examples/distro/build.gradle +++ b/examples/distro/build.gradle @@ -70,8 +70,8 @@ subprojects { 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}") + testRuntimeOnly("org.junit.platform:junit-platform-launcher:${versions.junit}") } tasks { diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle index d6bbf2b15246..212b78a61149 100644 --- a/examples/extension/build.gradle +++ b/examples/extension/build.gradle @@ -108,6 +108,8 @@ dependencies { testImplementation("org.junit.jupiter:junit-jupiter-api:${versions.junit}") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${versions.junit}") + testRuntimeOnly("org.junit.platform:junit-platform-launcher:${versions.junit}") + testRuntimeOnly("ch.qos.logback:logback-classic:1.5.16") //Otel Java instrumentation that we use and extend during integration tests From fd36e5db35b0526015f0b622c1f18408ee90c106 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 21 Feb 2025 19:02:44 -0800 Subject: [PATCH 4/6] fix --- examples/distro/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle index 6c8e2e280649..0104a3157d9b 100644 --- a/examples/distro/build.gradle +++ b/examples/distro/build.gradle @@ -70,6 +70,7 @@ subprojects { 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}") testRuntimeOnly("org.junit.platform:junit-platform-launcher:${versions.junit}") } From a246904af3dccc83c96f78e7cfe41145b657423a Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sat, 22 Feb 2025 09:58:40 -0800 Subject: [PATCH 5/6] fix --- examples/distro/build.gradle | 7 ++++--- examples/extension/build.gradle | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle index 0104a3157d9b..15fbed256164 100644 --- a/examples/distro/build.gradle +++ b/examples/distro/build.gradle @@ -69,10 +69,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}") - testRuntimeOnly("org.junit.platform:junit-platform-launcher:${versions.junit}") + 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 212b78a61149..8db6798a9f73 100644 --- a/examples/extension/build.gradle +++ b/examples/extension/build.gradle @@ -106,9 +106,10 @@ 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}") - testRuntimeOnly("org.junit.platform:junit-platform-launcher:${versions.junit}") + testImplementation(enforcedPlatform("org.junit:junit-bom:${versions.junit}")) + 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") From d71d47133a709f797111eb7d49b4efc887d494ba Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sat, 22 Feb 2025 09:59:29 -0800 Subject: [PATCH 6/6] fix --- examples/distro/build.gradle | 5 ++--- examples/extension/build.gradle | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle index 15fbed256164..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.12.0" + autoservice : "1.1.1" ] deps = [ @@ -70,7 +69,7 @@ subprojects { testImplementation("org.mockito:mockito-core:5.15.2") - testImplementation(enforcedPlatform("org.junit:junit-bom:${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") diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle index 8db6798a9f73..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.12.0" + opentelemetryJavaagentAlpha: "2.14.0-alpha-SNAPSHOT" ] deps = [ @@ -106,7 +104,7 @@ dependencies { testImplementation("io.opentelemetry:opentelemetry-api") testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha") - testImplementation(enforcedPlatform("org.junit:junit-bom:${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")