From eb97ede04e7e9f2af82fb97b2c8894488498a316 Mon Sep 17 00:00:00 2001
From: Simon Steiner <ssteiner@apache.org>
Date: Thu, 18 Jan 2024 11:30:44 +0000
Subject: [PATCH] FOP-3158: Switch to spotbugs

---
 .github/workflows/maven.yml | 2 +-
 fop-core/pom.xml            | 8 ++++----
 fop-events/pom.xml          | 4 ++--
 fop-sandbox/pom.xml         | 4 ++--
 fop-util/pom.xml            | 4 ++--
 pom.xml                     | 7 ++++++-
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 661a55573..394564531 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -28,7 +28,7 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
-      run: mvn -B package checkstyle:check findbugs:check --file pom.xml
+      run: mvn -B package checkstyle:check spotbugs:check --file pom.xml
 
     # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
     #- name: Update dependency graph
diff --git a/fop-core/pom.xml b/fop-core/pom.xml
index 221465ddd..bc2c56781 100644
--- a/fop-core/pom.xml
+++ b/fop-core/pom.xml
@@ -328,8 +328,8 @@
       </plugin>
       <!-- code analysis - checkstyle -->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
         <version>${findbugs.plugin.version}</version>
         <configuration>
           <excludeFilterFile>src/tools/resources/findbugs/exclusions.xml</excludeFilterFile>
@@ -378,8 +378,8 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>findbugs-maven-plugin</artifactId>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-maven-plugin</artifactId>
             <version>${findbugs.plugin.version}</version>
             <configuration>
               <excludeFilterFile>src/tools/resources/findbugs/exclusions.xml</excludeFilterFile>
diff --git a/fop-events/pom.xml b/fop-events/pom.xml
index ac0df8625..a7a6d2d0e 100644
--- a/fop-events/pom.xml
+++ b/fop-events/pom.xml
@@ -110,8 +110,8 @@
       </plugin>
       <!-- code analysis - findbugs -->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
         <version>${findbugs.plugin.version}</version>
         <configuration>
           <excludeFilterFile>../fop-core/src/tools/resources/findbugs/exclusions.xml</excludeFilterFile>
diff --git a/fop-sandbox/pom.xml b/fop-sandbox/pom.xml
index 9fefca9b6..880195c65 100644
--- a/fop-sandbox/pom.xml
+++ b/fop-sandbox/pom.xml
@@ -105,8 +105,8 @@
       </plugin>
       <!-- code analysis - findbugs -->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
         <version>${findbugs.plugin.version}</version>
         <configuration>
           <excludeFilterFile>src/tools/resources/findbugs/exclusions.xml</excludeFilterFile>
diff --git a/fop-util/pom.xml b/fop-util/pom.xml
index 020d97fef..33fc903c3 100644
--- a/fop-util/pom.xml
+++ b/fop-util/pom.xml
@@ -58,8 +58,8 @@
       </plugin>
       <!-- code analysis - findbugs -->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
         <version>${findbugs.plugin.version}</version>
         <configuration>
           <excludeFilterFile>../fop-core/src/tools/resources/findbugs/exclusions.xml</excludeFilterFile>
diff --git a/pom.xml b/pom.xml
index 637bafc80..608c4b93b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <commons.logging.version>1.0.4</commons.logging.version>
     <compiler.plugin.version>3.11.0</compiler.plugin.version>
     <exec.plugin.version>1.4.0</exec.plugin.version>
-    <findbugs.plugin.version>3.0.4</findbugs.plugin.version>
+    <findbugs.plugin.version>3.1.12.2</findbugs.plugin.version>
     <jar.plugin.version>3.1.1</jar.plugin.version>
     <java.version>8</java.version>
     <junit.version>4.11</junit.version>
@@ -102,6 +102,11 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <version>${surefire.plugin.version}</version>
         </plugin>
+        <plugin>
+          <groupId>com.github.spotbugs</groupId>
+          <artifactId>spotbugs-maven-plugin</artifactId>
+          <version>${findbugs.plugin.version}</version>
+        </plugin>        
       </plugins>
     </pluginManagement>
   </build>
-- 
2.39.5