From 689352e85c72840dcd5e95511b60034a33be26c9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 2 Aug 2023 09:32:50 +0200 Subject: [PATCH] Update dependency checkstyle to v10 (#9113) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Trask Stalnaker --- .../src/main/kotlin/otel.java-conventions.gradle.kts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts index dfe233dd7f..961cd4bed6 100644 --- a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts @@ -358,7 +358,7 @@ codenarc { checkstyle { configFile = rootProject.file("buildscripts/checkstyle.xml") // this version should match the version of google_checks.xml used as basis for above configuration - toolVersion = "8.45.1" + toolVersion = "10.12.2" maxWarnings = 0 } @@ -412,3 +412,13 @@ configurations.configureEach { exclude("io.opentelemetry.instrumentation", "opentelemetry-instrumentation-bom-alpha") } } + +dependencies { + modules { + // checkstyle uses the very old google-collections which causes Java 9 module conflict with + // guava which is also on the classpath + module("com.google.collections:google-collections") { + replacedBy("com.google.guava:guava", "google-collections is now part of Guava") + } + } +}