Small cleanup (#9267)

This commit is contained in:
Trask Stalnaker 2023-08-21 22:38:39 -07:00 committed by GitHub
parent 3d7703bd70
commit 7d49bb1bbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions

View File

@ -141,6 +141,14 @@ dependencies {
codenarc("org.codenarc:CodeNarc:3.3.0")
codenarc(platform("org.codehaus.groovy:groovy-bom:3.0.18"))
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")
}
}
}
testing {
@ -412,13 +420,3 @@ 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")
}
}
}