Replace deprecated FindBugs with SpotBugs.

Author: garydgregory

pom.xml

@@ -211,10 +211,12 @@
     <commons.jacoco.version>0.8.7</commons.jacoco.version>
     <commons.surefire-report.version>3.0.0-M5</commons.surefire-report.version>
     <commons.surefire.version>3.0.0-M5</commons.surefire.version>
+    <spotbugs.plugin.version>4.4.1</spotbugs.plugin.version>
+    <spotbugs.impl.version>4.4.1</spotbugs.impl.version>
   </properties>
 
   <build>
-    <defaultGoal>clean package apache-rat:check clirr:check checkstyle:check findbugs:check javadoc:javadoc</defaultGoal>
+    <defaultGoal>clean package apache-rat:check clirr:check checkstyle:check spotbugs:check javadoc:javadoc</defaultGoal>
     <pluginManagement>
       <plugins>
         <plugin>
@@ -246,16 +248,21 @@
             </dependency>
           </dependencies>
         </plugin>      
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>findbugs-maven-plugin</artifactId>
-          <version>${commons.findbugs.version}</version>
-          <configuration>
-            <threshold>Normal</threshold>
-            <effort>Default</effort>
-            <excludeFilterFile>${basedir}/src/conf/findbugs-exclude-filter.xml</excludeFilterFile>
-          </configuration>
-        </plugin>
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <version>${spotbugs.plugin.version}</version>
+        <dependencies>
+          <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs</artifactId>
+            <version>${spotbugs.impl.version}</version>
+         </dependency>
+        </dependencies>
+        <configuration>
+          <excludeFilterFile>${basedir}/src/conf/spotbugs-exclude-filter.xml</excludeFilterFile>
+        </configuration>
+      </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-scm-publish-plugin</artifactId>
@@ -272,6 +279,10 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
@@ -313,6 +324,10 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>

src/changes/changes.xml

@@ -24,12 +24,15 @@
 
     <release version="1.5" date="tba" description="tba">
       <!-- FIX -->
-      <action type="update" dev="ggregory" due-to="Gary Gregory">
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">
         Fix NPE in DefaultParser.isLongOption(String).
       </action>
-      <action type="update" dev="britter" due-to="Krishna Mohan Rao Kandunoori" issue="CLI-279">
+      <action type="fix" dev="britter" due-to="Krishna Mohan Rao Kandunoori" issue="CLI-279">
         @param or @return lines should end with a period in CommandLine.java
       </action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">
+        Replace deprecated FindBugs with SpotBugs.
+      </action>
       <!-- ADD -->
       <action type="add" dev="chtompki" due-to="Rubin Simons" issue="CLI-217">
         Accommodate toggling partial matching in DefaultParser.

src/conf/findbugs-exclude-filter.xml src/conf/spotbugs-exclude-filter.xmlsrc/conf/findbugs-exclude-filter.xml renamed to src/conf/spotbugs-exclude-filter.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,20 +15,35 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
+<FindBugsFilter xmlns="https://github.com/spotbugs/filter/3.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubusercontent.com/spotbugs/spotbugs/3.1.0/spotbugs/etc/findbugsfilter.xsd">
 
-<!--
-  This file contains some false positive bugs detected by findbugs. Their
-  false positive nature has been analyzed individually and they have been
-  put here to instruct findbugs it must ignore them.
--->
-<FindBugsFilter>
-
-  <!--  default encoding is intended when writing to System.out -->
   <Match>
     <Class name="org.apache.commons.cli.HelpFormatter" />
     <Method name="printHelp"
-            params="int,java.lang.String,java.lang.String,org.apache.commons.cli.Options,java.lang.String,boolean" returns="void" />
+      params="int,java.lang.String,java.lang.String,org.apache.commons.cli.Options,java.lang.String,boolean"
+      returns="void" />
     <Bug pattern="DM_DEFAULT_ENCODING" />
   </Match>
 
+  <Match>
+    <!-- Note: OptionBuilder is deprecated. -->
+    <Class name="org.apache.commons.cli.OptionBuilder" />
+    <Method name="withType"
+      params="java.lang.Class"
+      returns="org.apache.commons.cli.OptionBuilder" />
+    <Bug pattern="EI_EXPOSE_STATIC_REP2" />
+  </Match>
+
+  <Match>
+    <!-- TODO ? -->
+    <Bug pattern="EI_EXPOSE_REP" />
+  </Match>
+  
+  <Match>
+    <!-- TODO ? -->
+    <Bug pattern="EI_EXPOSE_REP2" />
+  </Match>
+  
 </FindBugsFilter>