From 82fd2516d6c018e46ef290e05551349a9ed82ca8 Mon Sep 17 00:00:00 2001
From: pascalschumacher <pascalschumacher@gmx.net>
Date: Tue, 28 Aug 2018 19:00:09 +0200
Subject: [PATCH 1/2] Replace FindBugs with SpotBugs

---
 pom.xml                                       | 21 +++++++++----------
 ...-filter.xml => spotbugs-exclude-filter.xml |  0
 2 files changed, 10 insertions(+), 11 deletions(-)
 rename findbugs-exclude-filter.xml => spotbugs-exclude-filter.xml (100%)

diff --git a/pom.xml b/pom.xml
index 149e1514e..add707556 100644
--- a/pom.xml
+++ b/pom.xml
@@ -589,6 +589,7 @@
     <commons.encoding>utf-8</commons.encoding>
 
     <checkstyle.plugin.version>3.0.0</checkstyle.plugin.version>
+    <spotbugs.plugin.version>3.1.6</spotbugs.plugin.version>
     <japicmp.skip>false</japicmp.skip>
 
     <!-- JMH Benchmark related properties, version, target compiler and name of the benchmarking uber jar. -->
@@ -611,7 +612,7 @@
 
 
   <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>
@@ -703,12 +704,11 @@
         </configuration>
       </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}/findbugs-exclude-filter.xml</excludeFilterFile>
+          <excludeFilterFile>${basedir}/spotbugs-exclude-filter.xml</excludeFilterFile>
         </configuration>
       </plugin>
     </plugins>
@@ -735,12 +735,11 @@
       </plugin>
       <!-- Requires setting 'export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=128m" ' -->
       <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}/findbugs-exclude-filter.xml</excludeFilterFile>
+          <excludeFilterFile>${basedir}/spotbugs-exclude-filter.xml</excludeFilterFile>
         </configuration>
       </plugin>
       <plugin>
diff --git a/findbugs-exclude-filter.xml b/spotbugs-exclude-filter.xml
similarity index 100%
rename from findbugs-exclude-filter.xml
rename to spotbugs-exclude-filter.xml

From bb20855b5cba03fd4f38f934b21b7c25712f747c Mon Sep 17 00:00:00 2001
From: pascalschumacher <pascalschumacher@gmx.net>
Date: Tue, 28 Aug 2018 19:11:31 +0200
Subject: [PATCH 2/2] Skip SpotBugs on Java 11

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

diff --git a/pom.xml b/pom.xml
index add707556..25721e31b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -868,6 +868,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 -->
+        <spotbugs.skip>true</spotbugs.skip>
       </properties>
     </profile>