diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index e963b8e8e..8a7ac6b7f 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { implementation("net.ltgt.nullaway:net.ltgt.nullaway.gradle.plugin:2.3.0") implementation("org.owasp.dependencycheck:org.owasp.dependencycheck.gradle.plugin:12.1.6") implementation("ru.vyarus.animalsniffer:ru.vyarus.animalsniffer.gradle.plugin:2.0.1") - implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.2.1") + implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.2.2") implementation("me.champeau.gradle.japicmp:me.champeau.gradle.japicmp.gradle.plugin:0.4.6") implementation("com.google.auto.value:auto-value-annotations:1.11.0") } 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/settings.gradle.kts b/settings.gradle.kts index 1df4d33ad..ebe476362 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,7 +2,7 @@ pluginManagement { plugins { id("com.gradleup.shadow") version "9.2.2" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" - id("com.gradle.develocity") version "4.2.1" + id("com.gradle.develocity") version "4.2.2" } }