Index: trunk/.classpath
===================================================================
--- trunk/.classpath	(revision 12800)
+++ trunk/.classpath	(revision 12801)
@@ -31,5 +31,5 @@
 	<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>
Index: trunk/.settings/edu.umd.cs.findbugs.core.prefs
===================================================================
--- trunk/.settings/edu.umd.cs.findbugs.core.prefs	(revision 12800)
+++ trunk/.settings/edu.umd.cs.findbugs.core.prefs	(revision 12801)
@@ -203,5 +203,5 @@
 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|
Index: trunk/README
===================================================================
--- trunk/README	(revision 12800)
+++ trunk/README	(revision 12801)
@@ -124,5 +124,5 @@
     - 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
Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 12800)
+++ trunk/build.xml	(revision 12801)
@@ -48,5 +48,5 @@
             <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">
@@ -714,5 +714,5 @@
         <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}"/>
@@ -790,17 +790,17 @@
     </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"
@@ -808,5 +808,5 @@
             <sourcePath path="${base.dir}/src" />
             <class location="${dist.jar}" />
-        </findbugs>
+        </spotbugs>
     </target>
 
Index: trunk/netbeans/nbproject/project.properties
===================================================================
--- trunk/netbeans/nbproject/project.properties	(revision 12800)
+++ trunk/netbeans/nbproject/project.properties	(revision 12801)
@@ -43,5 +43,5 @@
 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
@@ -93,5 +93,5 @@
     ${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=\
Index: trunk/tools/spotbugs/josm-filter.xml
===================================================================
--- trunk/tools/spotbugs/josm-filter.xml	(revision 12801)
+++ trunk/tools/spotbugs/josm-filter.xml	(revision 12801)
@@ -0,0 +1,81 @@
+<FindBugsFilter>
+
+	<Match>
+		<Bug pattern="DM_EXIT" />
+	</Match>
+	<Match>
+		<Bug pattern="DMI_HARDCODED_ABSOLUTE_FILENAME" />
+	</Match>
+	<Match>
+		<Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS" />
+	</Match>
+	<Match>
+		<Bug pattern="IL_INFINITE_LOOP" />
+	</Match>
+	<Match>
+		<Bug pattern="NM_CONFUSING" />
+	</Match>
+	<Match>
+		<Bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE" />
+	</Match>
+	<Match>
+		<Bug pattern="SE_BAD_FIELD" />
+	</Match>
+	<Match>
+		<Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED" />
+	</Match>
+	<Match>
+		<Bug pattern="UI_INHERITANCE_UNSAFE_GETRESOURCE" />
+	</Match>
+	<Match>
+		<Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" />
+	</Match>
+
+	<Match>
+		<Bug pattern="EI_EXPOSE_REP2" />
+		<Class name="org.openstreetmap.josm.tools.CopyList" />
+	</Match>
+	<Match>
+		<Bug pattern="MS_CANNOT_BE_FINAL" />
+		<Class name="org.openstreetmap.josm.Main" />
+	</Match>
+	<Match>
+		<Bug pattern="MS_SHOULD_BE_FINAL" />
+		<Class name="org.openstreetmap.josm.Main" />
+	</Match>
+
+	<Match>
+		<Class name="~com.*" />
+	</Match>
+    <Match>
+        <Class name="~gnu.getopt.*" />
+    </Match>
+    <Match>
+        <Class name="~javax.json.*" />
+    </Match>
+	<Match>
+		<Class name="~oauth.signpost.*" />
+	</Match>
+	<Match>
+		<Class name="~org.apache.*" />
+	</Match>
+    <Match>
+        <Class name="~org.glassfish.json.*" />
+    </Match>
+	<Match>
+		<Class name="~org.jdesktop.swinghelper.debug.*" />
+	</Match>
+	<Match>
+		<Class name="~org.openstreetmap.gui.jmapviewer.*" />
+	</Match>
+    <Match>
+        <Class name="~org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.*" />
+    </Match>
+    <Match>
+        <Class name="~org.openstreetmap.josm.data.imagery.types.*" />
+    </Match>
+    <Match>
+        <Class name="~org.w3._2001.xmlschema.*" />
+    </Match>
+
+</FindBugsFilter>