Merge branch 'findbugs' into spotbugs

 Conflicts:
	README.md
	build.xml
	pom.xml

Author: mebigfatguy

README.md

@@ -15,7 +15,7 @@ for FindBugs:
 
        GroupId: com.mebigfatguy.fb-contrib
     ArtifactId: fb-contrib
-       Version: 7.4.7
+       Version: 7.6.0
        
 For SpotBugs
 
@@ -85,7 +85,7 @@ The group ID for fb-contrib is com.mebigfatguy.fb-contrib, and the artifact ID i
             <plugin>
                 <groupId>com.mebigfatguy.fb-contrib</groupId>
                 <artifactId>fb-contrib</artifactId>
-                <version>7.4.7</version>
+                <version>7.6.0</version>
             </plugin>
         </plugins>
     </configuration>
@@ -112,7 +112,7 @@ The group ID for sb-contrib is com.mebigfatguy.sb-contrib, and the artifact ID i
             <plugin>
                 <groupId>com.mebigfatguy.sb-contrib</groupId>
                 <artifactId>sb-contrib</artifactId>
-                <version>7.4.7</version>
+                <version>7.6.0</version>
             </plugin>
         </plugins>
     </configuration>
@@ -138,7 +138,7 @@ dependencies {
     findbugs configurations.findbugsPlugins.dependencies
 
     // To keep everything tidy, we set these apart
-    findbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.7'
+    findbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.6.0'
 }
 
 task findbugs(type: FindBugs) {

build.xml

@@ -31,7 +31,7 @@
 	<property name="javac.debug" value="on" />
 	<property name="test_reports.dir" value="${target.dir}/reports/test"/>
 
-	<property name="fb-contrib.version" value="7.4.8-SNAPSHOT" />
+	<property name="fb-contrib.version" value="7.6.0" />
 	<property name="sb-contrib.version" value="7.4.8-SNAPSHOT" />
 
 	<property name="sonatype.dir" value="${user.home}/.sb-contrib-${sb-contrib.version}-sonatype" />

etc/findbugs.xml

@@ -23,15 +23,15 @@
 
 	<!-- Detectors -->
 
-    <!-- COMMENT OUT FOR RELEASE -->
+    <!-- COMMENT OUT FOR RELEASE
 
     <Detector class="com.mebigfatguy.fbcontrib.debug.OCSDebugger" speed="fast"/>
 
     <Detector class="com.mebigfatguy.fbcontrib.detect.BloatedSynchronizedBlock" speed="fast" reports="BSB_BLOATED_SYNCHRONIZED_BLOCK" hidden="true" /> 
 
     <Detector class="com.mebigfatguy.fbcontrib.detect.BloatedAssignmentScope" speed="fast" reports="BAS_BLOATED_ASSIGNMENT_SCOPE" hidden="true" />
 
-    <!-- COMMENT OUT FOR RELEASE -->
+    COMMENT OUT FOR RELEASE -->
 
 	<Detector class="com.mebigfatguy.fbcontrib.collect.CollectStatistics" speed="fast" reports="" hidden="true" />
 
@@ -330,15 +330,14 @@
 
     <Detector class="com.mebigfatguy.fbcontrib.detect.SetUsageIssues" speed="fast" reports="SUI_CONTAINS_BEFORE_ADD,SUI_CONTAINS_BEFORE_REMOVE"/>
 
-    <Detector class="com.mebigfatguy.fbcontrib.detect.ClassEnvy" speed="slow" reports="CE_CLASS_ENVY" />
-    
-    <!-- COMMENT OUT FOR POINT RELEASE -->
+    <Detector class="com.mebigfatguy.fbcontrib.detect.ClassEnvy" speed="slow" reports="CE_CLASS_ENVY" />  
 
     <Detector class="com.mebigfatguy.fbcontrib.detect.SuspiciousArgumentTypes" speed="fast" reports="SAT_SUSPICIOUS_ARGUMENT_TYPES" />
 
     <Detector class="com.mebigfatguy.fbcontrib.detect.EnumIssues" speed="fast" reports="ENMI_EQUALS_ON_ENUM,ENMI_NULL_ENUM_VALUE,ENMI_ONE_ENUM_VALUE" />
 
     <Detector class="com.mebigfatguy.fbcontrib.detect.AkkaIssues" speed="fast" reports="AKI_SUPERFLUOUS_ROUTE_SPECIFICATION" />
+    <!-- COMMENT OUT FOR POINT RELEASE -->
     <!-- COMMENT OUT FOR POINT RELEASE -->
 
 	<!-- BugPattern -->

htdocs/index.shtml

@@ -68,7 +68,7 @@ function toggleBlock(divId, imgId)
 			</li>
 			</ul>
 		</p>
-		<p style="font-weight: bold;">The latest version of fb-contrib is 7.4.7 available for download 
+		<p style="font-weight: bold;">The latest version of fb-contrib is 7.6.0 available for download 
 		<a href="http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22fb-contrib%22">here</a>.</p>
 		<p style="font-weight: bold;">This version requires SpotBugs 3.1.0 or better</p>
 		<p style="font-weight: bold;">Please note that active development for this project is now done on 
@@ -83,9 +83,22 @@ function toggleBlock(divId, imgId)
             </ul>
         </div>  
 		<hr/>
-        <img id="v7_4_0_image" src="flip2.gif" onClick="toggleBlock('v7_4_0', 'v7_4_0_image');" align="top"/>
+        <img id="v7_6_0_image" src="flip2.gif" onClick="toggleBlock('v7_6_0', 'v7_6_0_image');" align="top"/>
+        Detectors added in v7.6.0<br/>
+        <div id="v7_6_0" style="display:block;">
+			<ul>
+				<li><b>[SAT] Suspicious Argument Types</b><br/>
+            	Looks for method parameters that seem to be passed incorrectly
+            	</li>
+            	<li><b>[ENMI] Enum Issues</b><br/>
+                Looks for issues around use Enums
+                </li>
+			</ul>
+		</div>	
+		<hr/>
+        <img id="v7_4_0_image" src="flip1.gif" onClick="toggleBlock('v7_4_0', 'v7_4_0_image');" align="top"/>
         Detectors added in v7.4.0<br/>
-        <div id="v7_4_0" style="display:block;">
+        <div id="v7_4_0" style="display:none;">
 			<ul>
 				<li><b>[LUI] List Usage Issues</b><br/>
             	Looks for odd usage patterns when using Lists

htdocs/repository.html

@@ -22,7 +22,7 @@ <h1>fb-contrib: Maven Repository</h1>
     <table style="margin-left: 40px; background-color: #A0A0FF; padding: 20px; border-width: 1px; border-style: outset; border-color: #000000;">
         <tr><td><b>GroupId:</b></td><td>com.mebigfatguy.fb-contrib</td></tr>
         <tr><td><b>ArtifactId:</b></td><td>fb-contrib or sb-contrib</td></tr>
-        <tr><td><b>Version:</b></td><td>7.4.7</td></tr>
+        <tr><td><b>Version:</b></td><td>7.6.0</td></tr>
     </table>
 </div>
 

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.mebigfatguy.sb-contrib</groupId>
     <artifactId>sb-contrib</artifactId>
-    <version>7.4.8-SNAPSHOT</version>
+    <version>7.6.0</version>
 
     <!-- TODO: Oss parent is obsolete, define items directly for releasing -->
     <parent>