open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update dependency checkstyle to v10 (#9113) 

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
This commit is contained in:
renovate[bot] 2023-08-02 09:32:50 +02:00 committed by GitHub
parent 3f46b7111a
commit 689352e85c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
conventions/src/main/kotlin/otel.java-conventions.gradle.kts
View File

@ -358,7 +358,7 @@ codenarc {
checkstyle { checkstyle {
configFile = rootProject.file("buildscripts/checkstyle.xml") configFile = rootProject.file("buildscripts/checkstyle.xml")
// this version should match the version of google_checks.xml used as basis for above configuration // 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 maxWarnings = 0
} }
@ -412,3 +412,13 @@ configurations.configureEach {
exclude("io.opentelemetry.instrumentation", "opentelemetry-instrumentation-bom-alpha") 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")
}
}
}