From 946d4551ed2aa9c628099fd3ae190c6eb851da43 Mon Sep 17 00:00:00 2001
From: Jonas Kalderstam <jonas@kalderstam.se>
Date: Fri, 5 Feb 2016 16:15:39 +0100
Subject: [PATCH] Turn on findbugs and add annotation support

It was already there as a plugin. I updated the version and enabled it
to run during builds. Without failing them for now.

Also adds dependencies to the findbugs annotations library, so one can
use things like `@Nullable` and `@Nonnull`.
---
 community/function/pom.xml |  10 ++++
 community/logging/pom.xml  |  10 ++++
 enterprise/pom.xml         |   4 +-
 pom.xml                    |  47 ++++++++++++----
 tools/pom.xml              | 107 ++++++++++++++++++-------------------
 5 files changed, 112 insertions(+), 66 deletions(-)

diff --git a/community/function/pom.xml b/community/function/pom.xml
index e35f1ba376dd5..452975120ff87 100644
--- a/community/function/pom.xml
+++ b/community/function/pom.xml
@@ -70,5 +70,15 @@ the relevant Commercial Agreement.
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <version>3.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>annotations</artifactId>
+      <version>3.0.0</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/community/logging/pom.xml b/community/logging/pom.xml
index 7efd83edfd9a8..166a64af037ed 100644
--- a/community/logging/pom.xml
+++ b/community/logging/pom.xml
@@ -88,5 +88,15 @@ the relevant Commercial Agreement.
       <artifactId>commons-lang3</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <version>3.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>annotations</artifactId>
+      <version>3.0.0</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/enterprise/pom.xml b/enterprise/pom.xml
index 18dbf9f5917d2..4b8840fa38e90 100644
--- a/enterprise/pom.xml
+++ b/enterprise/pom.xml
@@ -76,8 +76,8 @@ terms of the relevant Commercial Agreement.
       <build>
         <plugins>
           <plugin>
-          <groupId>org.neo4j.build.plugins</groupId>
-          <artifactId>ease-maven-plugin</artifactId>
+            <groupId>org.neo4j.build.plugins</groupId>
+            <artifactId>ease-maven-plugin</artifactId>
             <executions>
               <execution>
                 <id>aggregate-artifacts</id>
diff --git a/pom.xml b/pom.xml
index a2898e27b4f17..b4036da852063 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
@@ -99,7 +103,33 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>findbugs-maven-plugin</artifactId>
-          <version>2.5.2</version>
+          <version>3.0.3</version>
+          <configuration>
+            <!--
+                Enables analysis which takes more memory but finds more bugs.
+                If you run out of memory, changes the value of the effort element
+                to 'Low'.
+            -->
+            <effort>Max</effort>
+            <!-- (values are low, medium, and max) -->
+            <threshold>Medium</threshold>
+            <!-- Fail the build or only generate report -->
+            <failOnError>false</failOnError>
+            <!-- Produces XML report -->
+            <xmlOutput>true</xmlOutput>
+            <includeTests>true</includeTests>
+            <!-- Configures the directory in which the XML report is created -->
+            <findbugsXmlOutputDirectory>${project.build.directory}/findbugs</findbugsXmlOutputDirectory>
+          </configuration>
+          <executions>
+            <!-- Run with as part of the build -->
+              <execution>
+                <phase>verify</phase>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+          </executions>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -312,15 +342,6 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>findbugs-maven-plugin</artifactId>
-            <configuration>
-              <xmlOutput>true</xmlOutput>
-              <findbugsXmlOutput>true</findbugsXmlOutput>
-              <!-- For jenkins to pick stuff up -->
-            </configuration>
-          </plugin>
         </plugins>
       </build>
     </profile>
@@ -542,6 +563,12 @@
       </dependency>
 
       <!-- other -->
+      <dependency>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>3.0.3</version>
+        <type>maven-plugin</type>
+      </dependency>
       <dependency>
         <groupId>com.google.code.gson</groupId>
         <artifactId>gson</artifactId>
diff --git a/tools/pom.xml b/tools/pom.xml
index e6a5df5b8657a..96d4779600bd1 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -121,60 +121,59 @@
     </dependency>
   </dependencies>
 
-    <build>
-        <plugins>
-            <!-- Disable the ComponentVersion generation -->
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-version</id>
-                        <phase>none</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.3</version>
-                <executions>
+  <build>
+    <plugins>
+      <!-- Disable the ComponentVersion generation -->
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate-version</id>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.3</version>
+        <executions>
 
-                    <execution>
-                        <id>boltalyzer-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <finalName>boltalyzer</finalName>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.neo4j.tools.boltalyzer.Boltalyzer</mainClass>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                            </transformers>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>txlog-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <finalName>checktxlogs</finalName>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.neo4j.tools.txlog.CheckTxLogs</mainClass>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                            </transformers>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+          <execution>
+            <id>boltalyzer-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <finalName>boltalyzer</finalName>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>org.neo4j.tools.boltalyzer.Boltalyzer</mainClass>
+                </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+              </transformers>
+            </configuration>
+          </execution>
 
+          <execution>
+            <id>txlog-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <finalName>checktxlogs</finalName>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>org.neo4j.tools.txlog.CheckTxLogs</mainClass>
+                </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>