diff --git a/CHANGELOG.md b/CHANGELOG.md index 90685d9..bcf8a44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ * Update spotbugs plugin to 5.2.5 (#94) - Remove spotbugsShowStackTraces option because it's not used by spotbugs anymore - Custom xsl file not used for html report - native html report generation used instead +* Update checkstyle 10.6.0 -> 10.12.7 (gradle metadata fix applied) +* Update spotbugs 4.7.3 -> 4.8.3 +* Update pmd 6.54 -> 6.55 (java 20 support) +* Update codenarc 3.2.0 -> 3.4.0 ### 4.9.0 (2023-02-18) * Gradle 8 support (#77) diff --git a/src/main/groovy/ru/vyarus/gradle/plugin/quality/QualityExtension.groovy b/src/main/groovy/ru/vyarus/gradle/plugin/quality/QualityExtension.groovy index e32f611..a50d7c4 100644 --- a/src/main/groovy/ru/vyarus/gradle/plugin/quality/QualityExtension.groovy +++ b/src/main/groovy/ru/vyarus/gradle/plugin/quality/QualityExtension.groovy @@ -22,10 +22,10 @@ class QualityExtension { sourceSets = [project.sourceSets.main] as Collection } - String checkstyleVersion = '10.6.0' - String pmdVersion = '6.54.0' - String spotbugsVersion = '4.7.3' - String codenarcVersion = '3.2.0' + String checkstyleVersion = '10.12.7' + String pmdVersion = '6.55.0' + String spotbugsVersion = '4.8.3' + String codenarcVersion = '3.4.0' /** * Sets AnimalSniffer version. diff --git a/src/main/groovy/ru/vyarus/gradle/plugin/quality/QualityPlugin.groovy b/src/main/groovy/ru/vyarus/gradle/plugin/quality/QualityPlugin.groovy index dfbbc07..cc3a26f 100644 --- a/src/main/groovy/ru/vyarus/gradle/plugin/quality/QualityPlugin.groovy +++ b/src/main/groovy/ru/vyarus/gradle/plugin/quality/QualityPlugin.groovy @@ -128,6 +128,19 @@ class QualityPlugin implements Plugin { register, CheckstylePlugin) { project.configure(project) { + // required due to checkstyle update of gradle metadata causing now collission with google collections + // https://github.com/google/guava/releases/tag/v32.1.0 (https://github.com/gradle/gradle/issues/27035) + String guavaTarget = 'com.google.guava:guava:0' + configurations.checkstyle { + resolutionStrategy.capabilitiesResolution.withCapability( + 'com.google.collections:google-collections') { + select(guavaTarget) + } + resolutionStrategy.capabilitiesResolution.withCapability('com.google.guava:listenablefuture') { + select(guavaTarget) + } + } + checkstyle { showViolations = false toolVersion = extension.checkstyleVersion