This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch GROOVY_3_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit ff3296c1e91f88748511dc59243ca60ba8a7be27 Author: Paul King <[email protected]> AuthorDate: Sun Mar 15 15:46:18 2020 +1000 Revert "Downgrade spotbugs to 3.1.11" (both old and new plugin versions have issues - may as well stick with new one and work with spotbugs project to fix) This reverts commit b133809ae4412b06a9ae42b266b6a89762789beb. --- build.gradle | 8 +++----- gradle/quality.gradle | 3 +-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index adefcc9..cdce559 100644 --- a/build.gradle +++ b/build.gradle @@ -46,9 +46,7 @@ buildscript { plugins { id 'me.champeau.buildscan-recipes' version '0.2.3' - // id 'com.github.spotbugs' version '3.0.0' // fails due to Guava conflict: https://github.com/spotbugs/spotbugs-gradle-plugin/issues/166 - // id 'com.github.spotbugs' version '1.6.9' // not compatible with Gradle 6 - id 'jp.skypencil.spotbugs.snom' version '0.4.13' // work in progress replacement of above + id 'com.github.spotbugs' version '4.0.2' id 'com.github.ben-manes.versions' version '0.28.0' id 'com.github.blindpirate.osgi' version '0.0.3' } @@ -152,8 +150,8 @@ ext { xmlunitVersion = '1.6' xstreamVersion = '1.4.11.1' spockVersion = '1.3-groovy-2.5-SNAPSHOT' // supports up to 3.9.99 - spotbugsVersion = '3.1.11' - spotbugsAnnotationsVersion = '3.1.11' + spotbugsVersion = '4.0.0' + spotbugsAnnotationsVersion = '4.0.0' checkstyleVersion = '8.30' } diff --git a/gradle/quality.gradle b/gradle/quality.gradle index 3643a7a..a00c86a 100644 --- a/gradle/quality.gradle +++ b/gradle/quality.gradle @@ -24,8 +24,7 @@ allprojects { proj -> //apply plugin: "com.github.hierynomus.license" apply plugin: 'checkstyle' apply plugin: 'codenarc' - // apply plugin: 'com.github.spotbugs' - apply plugin: 'jp.skypencil.spotbugs.snom' + apply plugin: 'com.github.spotbugs' configurations.codenarc { // because we will rely on the version we build // because version ranges are evil
