From 0a24dee1c30d7388af6f50b6c2087ca598bf0f96 Mon Sep 17 00:00:00 2001
From: Trisha Gee <trishagee@github.com>
Date: Fri, 8 Aug 2014 11:44:41 +0200
Subject: [PATCH] [Build] Reduced time to run findbugs by about 25% - upgraded
 to findbugs 3.0; fixed excludes that were incorrect; excluding checks that
 aren't applicable to us; excluding categories that don't give us enough
 value.

---
 build.gradle                | 12 +++++++-----
 config/findbugs-exclude.xml | 34 ++++++++++++++++++----------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/build.gradle b/build.gradle
index c7e734aefee..e7db85bb939 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,6 @@ def slf4jVersion = '1.7.5'
 
 allprojects {
     apply plugin: 'java'
-    apply plugin: 'idea'
     apply plugin: 'eclipse'
     apply plugin: 'checkstyle'
     apply plugin: 'findbugs'
@@ -85,6 +84,9 @@ allprojects {
 
     findbugs {
         excludeFilter = new File("$configDir/findbugs-exclude.xml")
+        toolVersion = '3.0.0'
+        effort = 'min'
+        reportLevel = 'high'
     }
 
     tasks.withType(AbstractCompile) {
@@ -121,10 +123,10 @@ allprojects {
     task testCoverage(dependsOn: check)
 
     tasks.withType(FindBugs) {
-        reports {
-            xml.enabled = project.buildingWith('xmlReports.enabled')
-            html.enabled = !project.buildingWith('xmlReports.enabled')
-        }
+//        reports {
+//            xml.enabled = project.buildingWith('xmlReports.enabled')
+//            html.enabled = !project.buildingWith('xmlReports.enabled')
+//        }
     }
 
     javadoc {
diff --git a/config/findbugs-exclude.xml b/config/findbugs-exclude.xml
index 9074c789a6b..479eb9372c9 100644
--- a/config/findbugs-exclude.xml
+++ b/config/findbugs-exclude.xml
@@ -4,7 +4,13 @@
     <Match>
         <Class name="~.*\.*Test.*"/>
         <Not>
-            <Bug code="IJU, SE_BAD_FIELD, EI_EXPOSE_REP, EI_EXPOSE_REP2"/>
+            <Bug code="IJU"/>
+        </Not>
+    </Match>
+    <Match>
+        <Class name="~.*\.*Test.*"/>
+        <Not>
+            <Bug pattern="SE_BAD_FIELD, EI_EXPOSE_REP, EI_EXPOSE_REP2"/>
         </Not>
     </Match>
     <Match>
@@ -13,33 +19,29 @@
     </Match>
     <Match>
         <Class name="org.mongodb.morphia.testmodel.Hotel"/>
-        <Not>
-            <Bug code="EI_EXPOSE_REP, EI_EXPOSE_REP2"/>
-        </Not>
+        <Bug pattern="EI_EXPOSE_REP, EI_EXPOSE_REP2"/>
     </Match>
     <Match>
         <Class name="org.mongodb.morphia.utils.E1"/>
-        <Not>
-            <Bug code="SS_SHOULD_BE_STATIC"/>
-        </Not>
+        <Bug pattern="SS_SHOULD_BE_STATIC"/>
     </Match>
     <Match>
         <Class name="relocated.morphia.org.apache.commons.collections.ReferenceMap"/>
-        <Not>
-            <Bug code="VO_VOLATILE_INCREMENT, URF_UNREAD_FIELD, WMI_WRONG_MAP_ITERATOR"/>
-        </Not>
+        <Bug pattern="VO_VOLATILE_INCREMENT, URF_UNREAD_FIELD, WMI_WRONG_MAP_ITERATOR"/>
     </Match>
     <Match>
         <Class name="relocated.morphia.org.apache.commons.collections.ReferenceMap$EntryIterator"/>
-        <Not>
-            <Bug code="VO_VOLATILE_INCREMENT, URF_UNREAD_FIELD, WMI_WRONG_MAP_ITERATOR"/>
-        </Not>
+        <Bug pattern="VO_VOLATILE_INCREMENT, URF_UNREAD_FIELD, WMI_WRONG_MAP_ITERATOR"/>
     </Match>
     <Match>
         <Class name="org.mongodb.morphia.mapping.MappedClass"/>
-        <Not>
-            <Bug code="WMI_WRONG_MAP_ITERATOR"/>
-        </Not>
+        <Bug pattern="WMI_WRONG_MAP_ITERATOR"/>
+    </Match>
+    <Match>
+        <Bug code="SQL,XSS,J2EE,SW,STI,DL,JLM,MWN,NN,RS,UL,HRS,PT,MTIA,XFB"/>
+    </Match>
+    <Match>
+        <Bug category="I18N,MT_CORRECTNESS,SECURITY,PERFORMANCE"/>
     </Match>
 
 </FindBugsFilter>