Index: /applications/viewer/jmapviewer/tools/checkstyle/jmapviewer_checks.xml
===================================================================
--- /applications/viewer/jmapviewer/tools/checkstyle/jmapviewer_checks.xml	(revision 35318)
+++ /applications/viewer/jmapviewer/tools/checkstyle/jmapviewer_checks.xml	(revision 35319)
@@ -12,4 +12,5 @@
 <module name="Checker">
   <property name="severity" value="warning"/>
+  <property name="charset" value="UTF-8"/>
   <module name="TreeWalker">
     <module name="MissingDeprecated"/>
@@ -37,8 +38,4 @@
       <property name="max" value="150"/>
       <property name="tokens" value="INSTANCE_INIT,STATIC_INIT,METHOD_DEF,CTOR_DEF"/>
-    </module>
-    <module name="LineLength">
-      <property name="max" value="145"/>
-      <property name="tabWidth" value="4"/>
     </module>
     <module name="MethodLength">
@@ -107,4 +104,9 @@
   </module>
   <module name="FileTabCharacter"/>
+  <module name="LineLength">
+    <property name="fileExtensions" value="java" />
+    <property name="max" value="145"/>
+    <property name="tabWidth" value="4"/>
+  </module>
   <module name="NewlineAtEndOfFile">
     <property name="lineSeparator" value="lf"/>
@@ -112,4 +114,10 @@
   <module name="SuppressionFilter">
     <property name="file" value="${basedir}/tools/checkstyle/jmapviewer_filters.xml"/>
+    <property name="optional" value="true"/>
+  </module>
+  <module name="SuppressWithPlainTextCommentFilter">
+    <property name="offCommentFormat" value="CHECKSTYLE\.OFF\: ([\w\|]+)"/>
+    <property name="onCommentFormat" value="CHECKSTYLE\.ON\: ([\w\|]+)"/>
+    <property name="checkFormat" value="$1"/>
   </module>
 </module>
Index: /applications/viewer/jmapviewer/tools/checkstyle/jmapviewer_filters.xml
===================================================================
--- /applications/viewer/jmapviewer/tools/checkstyle/jmapviewer_filters.xml	(revision 35318)
+++ /applications/viewer/jmapviewer/tools/checkstyle/jmapviewer_filters.xml	(revision 35319)
@@ -4,4 +4,6 @@
      "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
 <suppressions>
+  <suppress checks="." files="\.classpath" />
+  <suppress checks="." files="\.project" />
   <suppress checks="HeaderCheck" files="ScanexTileSource\.java" />
 </suppressions>
Index: /applications/viewer/jmapviewer/tools/spotbugs/config/log4j2.xml
===================================================================
--- /applications/viewer/jmapviewer/tools/spotbugs/config/log4j2.xml	(revision 35319)
+++ /applications/viewer/jmapviewer/tools/spotbugs/config/log4j2.xml	(revision 35319)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+  <Appenders>
+    <Console name="Console" target="SYSTEM_OUT">
+      <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+    </Console>
+  </Appenders>
+  <Loggers>
+    <Root level="error">
+      <AppenderRef ref="Console"/>
+    </Root>
+  </Loggers>
+</Configuration>