FindBugs is dead. Long live SpotBugs!

git-svn-id: http://josm.openstreetmap.de/svn/trunk@12801 0c6e7542-c601-0410-84e7-c038aed88b3b

.classpath

@@ -30,6 +30,6 @@
 	<classpathentry kind="lib" path="test/lib/unitils-core/ognl-2.6.9.jar"/>
 	<classpathentry kind="lib" path="test/lib/fest/debug-1.0.jar"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
-	<classpathentry kind="lib" path="tools/findbugs/annotations.jar"/>
+	<classpathentry kind="lib" path="tools/spotbugs/spotbugs-annotations.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.settings/edu.umd.cs.findbugs.core.prefs

@@ -202,7 +202,7 @@ detectorXssServletDetector=XssServletDetector|true
 detectorXxeDetector=XxeDetector|true
 detector_threshold=3
 effort=max
-excludefilter0=tools/findbugs/josm-filter.xml|true
+excludefilter0=tools/spotbugs/josm-filter.xml|true
 filter_settings=Low|BAD_PRACTICE,CORRECTNESS,EXPERIMENTAL,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|20
 filter_settings_neg=NOISE|
 run_at_full_build=true

README

@@ -123,7 +123,7 @@ This is an overview of the files and directories in the JOSM code repository:
                             problems in source code); can be launched as an ant target in build.xml
     - commons-cli-1.3.1.jar dependency of Groovy Ant task
     - error_prone_ant.jar   used to detect code errors during compilation
-    - findbugs/             libs and config files for findbugs (automatically detects common bugs and potential
+    - spotbugs/             libs and config files for spotbugs (automatically detects common bugs and potential
                             problems in source code); can be launched as an ant target in build.xml
     - groovy-all.jar        used for some unit tests and various scripts
     - jacocoant.jar         used to include coverage data into JUnit test reports

build.xml

@@ -47,7 +47,7 @@
             </fileset>
             <pathelement path="${dist.jar}"/>
             <pathelement path="${groovy.jar}"/>
-            <pathelement path="tools/findbugs/annotations.jar"/>
+            <pathelement path="tools/spotbugs/spotbugs-annotations.jar"/>
         </path>
         <path id="pmd.classpath">
             <fileset dir="${base.dir}/tools/pmd/">
@@ -713,7 +713,7 @@ Build-Date: ${build.tstamp}
         <attribute name="output"/>
         <sequential>
             <echo message="Generating Taginfo for type @{type} to @{output}"/>
-            <groovy src="${taginfoextract}" classpath="${dist.jar}:tools/findbugs/annotations.jar">
+            <groovy src="${taginfoextract}" classpath="${dist.jar}:tools/spotbugs/spotbugs-annotations.jar">
                 <arg value="-t"/>
                 <arg value="@{type}"/>
                 <arg value="--noexit"/>
@@ -789,25 +789,25 @@ Build-Date: ${build.tstamp}
         </checkstyle>
     </target>
 
-    <target name="findbugs" depends="dist">
-        <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="tools/findbugs/findbugs-ant.jar"/>
-        <path id="findbugs-classpath">
-            <fileset dir="${base.dir}/tools/findbugs/">
+    <target name="spotbugs" depends="dist">
+        <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="tools/spotbugs/spotbugs-ant.jar"/>
+        <path id="spotbugs-classpath">
+            <fileset dir="${base.dir}/tools/spotbugs/">
                 <include name="*.jar"/>
             </fileset>
         </path>
-        <property name="findbugs-classpath" refid="findbugs-classpath"/>
-        <findbugs output="xml"
-                outputFile="findbugs-josm.xml"
-                classpath="${findbugs-classpath}"
+        <property name="spotbugs-classpath" refid="spotbugs-classpath"/>
+        <spotbugs output="xml"
+                outputFile="spotbugs-josm.xml"
+                classpath="${spotbugs-classpath}"
                 pluginList=""
-                excludeFilter="tools/findbugs/josm-filter.xml"
+                excludeFilter="tools/spotbugs/josm-filter.xml"
                 effort="max"
                 reportLevel="low"
                 >
             <sourcePath path="${base.dir}/src" />
             <class location="${dist.jar}" />
-        </findbugs>
+        </spotbugs>
     </target>
 
     <target name="pmd" depends="init-properties">

netbeans/nbproject/project.properties

@@ -42,7 +42,7 @@ file.reference.fest-assert-1.0.jar=../test/lib/fest/fest-assert-1.0.jar
 file.reference.fest-reflect-1.1.jar=../test/lib/fest/fest-reflect-1.1.jar
 file.reference.fest-swing-1.1.jar=../test/lib/fest/fest-swing-1.1.jar
 file.reference.fest-util-1.0.jar=../test/lib/fest/fest-util-1.0.jar
-file.reference.findbugs.jar=../tools/findbugs/findbugs.jar
+file.reference.spotbugs.jar=../tools/spotbugs/spotbugs.jar
 file.reference.guava-21.0.jar=../test/lib/reflections/guava-21.0.jar
 file.reference.hamcrest-core-1.3.jar=../test/lib/junit/hamcrest-core-1.3.jar
 file.reference.javassist-3.21.0-GA.jar=../test/lib/reflections/javassist-3.21.0-GA.jar
@@ -92,7 +92,7 @@ javac.test.classpath=\
     ${file.reference.unitils-core-3.4.6.jar}:\
     ${file.reference.system-rules-1.16.1.jar}:\
     ${file.reference.wiremock-standalone-2.7.1.jar}:\
-    ${file.reference.findbugs.jar}:\
+    ${file.reference.spotbugs.jar}:\
     ${file.reference.commons-testing-2.1.0.jar}
 javac.test.processorpath=\
     ${javac.test.classpath}