From 0eac5c7d1814251633503fa2e992f855247c8c8e Mon Sep 17 00:00:00 2001
From: Pascal Schumacher <pascalschumacher@gmx.net>
Date: Thu, 10 May 2018 14:55:28 +0200
Subject: [PATCH 1/2] Replace FindBugs with SpotBugs

---
 pom.xml                            | 22 +++++++++++-----------
 fb-excludes.xml => sb-excludes.xml |  0
 2 files changed, 11 insertions(+), 11 deletions(-)
 rename fb-excludes.xml => sb-excludes.xml (100%)

diff --git a/pom.xml b/pom.xml
index b077277888..0135a78066 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,8 @@
 
     <checkstyle.plugin.version>3.0.0</checkstyle.plugin.version>
     <checkstyle.version>8.9</checkstyle.version>
+
+    <spotbugs.plugin.version>3.1.3.1</spotbugs.plugin.version>
   </properties>
 
   <dependencies>
@@ -89,7 +91,7 @@
   </dependencies>
 
   <build>
-    <defaultGoal>clean verify apache-rat:check clirr:check checkstyle:check findbugs:check javadoc:javadoc</defaultGoal>
+    <defaultGoal>clean verify apache-rat:check clirr:check checkstyle:check spotbugs:check javadoc:javadoc</defaultGoal>
     <pluginManagement>
       <plugins>
         <plugin>
@@ -137,12 +139,11 @@
         </dependencies>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <!-- Use version from parent pom as that is adjusted according to the Java version used to run Maven -->
-        <version>${commons.findbugs.version}</version>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <version>${spotbugs.plugin.version}</version>
         <configuration>
-          <excludeFilterFile>${basedir}/fb-excludes.xml</excludeFilterFile>
+          <excludeFilterFile>${basedir}/sb-excludes.xml</excludeFilterFile>
         </configuration>
       </plugin>
       <plugin>
@@ -209,12 +210,11 @@
       </plugin>
       <!-- Requires setting 'export MAVEN_OPTS="-Xmx512m" ' -->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <!-- Use version from parent pom as that is adjusted according to the Java version used to run Maven -->
-        <version>${commons.findbugs.version}</version>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <version>${spotbugs.plugin.version}</version>
         <configuration>
-          <excludeFilterFile>${basedir}/fb-excludes.xml</excludeFilterFile>
+          <excludeFilterFile>${basedir}/sb-excludes.xml</excludeFilterFile>
         </configuration>
       </plugin>
       <plugin>
diff --git a/fb-excludes.xml b/sb-excludes.xml
similarity index 100%
rename from fb-excludes.xml
rename to sb-excludes.xml

From 01c1e1adf80e8eb5de7d6096c0bdeb651f8f44df Mon Sep 17 00:00:00 2001
From: Pascal Schumacher <pascalschumacher@gmx.net>
Date: Thu, 10 May 2018 15:48:31 +0200
Subject: [PATCH 2/2] Skip SpotBugs on Java 11, because it uses ASM and ASM
 does not yet support the java 11 class file format.

---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index 0135a78066..5cb4ca0fac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -430,6 +430,8 @@
       <properties>
         <!-- jacoco does not work with java 11 yet, see https://github.com/jacoco/jacoco/issues/663 -->
         <jacoco.skip>true</jacoco.skip>
+        <!-- spotbugs does not work with java 11 yet, because ASM does not yet support the java 11 class file format -->
+        <spotbugs.skip>true</spotbugs.skip>
       </properties>
     </profile>
   </profiles>