Skip to content

Commit

Permalink
fix(deps): update junit5 monorepo to v5.12.0 (minor) (#13372)
Browse files Browse the repository at this point in the history
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Trask Stalnaker <[email protected]>
  • Loading branch information
renovate[bot] and trask authored Feb 24, 2025
1 parent 94e7291 commit 7ca4e3d
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 15 deletions.
2 changes: 1 addition & 1 deletion benchmark-overhead/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion conventions/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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",

Expand Down
11 changes: 6 additions & 5 deletions examples/distro/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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 {
Expand Down
11 changes: 6 additions & 5 deletions examples/extension/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gradle-plugins/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 7ca4e3d

Please sign in to comment.