diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index ffd6f2bf0..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,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.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")) @@ -159,16 +160,11 @@ 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") } } } diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 2221dfd27..9ab06e706 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}")) api(platform("com.fasterxml.jackson:jackson-bom:2.20.0")) api(platform("com.google.protobuf:protobuf-bom:4.32.1")) - api(platform("com.squareup.okhttp3:okhttp-bom:5.1.0")) + api(platform("com.squareup.okhttp3:okhttp-bom:5.2.1")) constraints { api("io.opentelemetry.semconv:opentelemetry-semconv:${semconvVersion}")