(groovy) 08/11: SpotBugs Gradle plugin v6

[paulk]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 4a2ab44be75319bca19c77020f1ac39013307d61
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon Dec 4 13:09:57 2023 +0800

    SpotBugs Gradle plugin v6
    
    * Bump com.github.spotbugs.snom:spotbugs-gradle-plugin from 5.2.5 to 6.0.1
    
    Bumps 
[com.github.spotbugs.snom:spotbugs-gradle-plugin](https://github.com/spotbugs/spotbugs-gradle-plugin)
 from 5.2.5 to 6.0.1.
    - [Release 
notes](https://github.com/spotbugs/spotbugs-gradle-plugin/releases)
    - 
[Commits](https://github.com/spotbugs/spotbugs-gradle-plugin/compare/5.2.5...6.0.1)
    
    ---
    updated-dependencies:
    - dependency-name: com.github.spotbugs.snom:spotbugs-gradle-plugin
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <supp...@github.com>
    
    https://github.com/spotbugs/spotbugs-gradle-plugin/releases/tag/6.0.0
    
    * Bump SpotBugs to 4.8.2
    
    * Migrate config
    
    ---------
    
    Signed-off-by: dependabot[bot] <supp...@github.com>
    Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
    Co-authored-by: Goooler <wangzong...@gmail.com>
---
 build-logic/src/main/groovy/org.apache.groovy-base.gradle | 11 +++++++----
 versions.properties                                       |  1 -
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build-logic/src/main/groovy/org.apache.groovy-base.gradle 
b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
index 0f6f43e6ba..dfea60b0a5 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-base.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
@@ -21,6 +21,7 @@ import groovy.transform.CompileStatic
 import org.apache.groovy.gradle.GroovyLibraryExtension
 import org.apache.groovy.gradle.JarJarTask
 import org.apache.groovy.gradle.ReleaseInfoGenerator
+import com.github.spotbugs.snom.Effort
 import org.gradle.api.attributes.java.TargetJvmVersion
 
 import com.github.spotbugs.snom.SpotBugsTask
@@ -123,7 +124,7 @@ configurations {
 }
 
 dependencies {
-    compileOnly providers.provider { 
"com.github.spotbugs:spotbugs-annotations:${versions.spotbugsAnnotations}" }
+    compileOnly providers.provider { 
"com.github.spotbugs:spotbugs-annotations:${versions.spotbugs}" }
 
     codenarc "org.codenarc:CodeNarc:${versions.codenarc}"
     codenarc project(":groovy-templates")
@@ -228,12 +229,14 @@ tasks.withType(CodeNarc).configureEach {
 tasks.withType(SpotBugsTask).configureEach {
     excludeFilter = rootProject.file("config/spotbugs/exclude.xml")
     ignoreFailures = true
-    effort = 'max'
+    effort = Effort.valueOf('MAX')
     maxHeapSize = '2g'
     reports {
-        xml.enabled = false
+        xml {
+            required = false
+        }
         html {
-            enabled = true
+            required = true
             stylesheet = 'fancy.xsl'
         }
     }
diff --git a/versions.properties b/versions.properties
index 729bba80c6..1d0855cbc4 100644
--- a/versions.properties
+++ b/versions.properties
@@ -51,7 +51,6 @@ xmlunit=1.6
 xstream=1.4.20
 spock=2.3-groovy-4.0
 spotbugs=4.8.3
-spotbugsAnnotations=4.8.3
 checkstyle=9.3
 jcipAnnotations=1.0
 treelayout=1.0.3