Index: trunk/tools/checkstyle/META-INF/MANIFEST.MF
===================================================================
--- trunk/tools/checkstyle/META-INF/MANIFEST.MF	(revision 14606)
+++ trunk/tools/checkstyle/META-INF/MANIFEST.MF	(revision 15588)
@@ -3,5 +3,5 @@
 Bundle-Name: JOSM Checkstyle Eclipse Plugin
 Bundle-SymbolicName: org.openstreetmap.josm.checkstyle-eclipse-plugin;singleton:=true
-Bundle-Version: 8.12.0.qualifier
+Bundle-Version: 8.27.0.qualifier
 Require-Bundle: net.sf.eclipsecs.checkstyle,
  net.sf.eclipsecs.core,
Index: trunk/tools/checkstyle/josm_checks.xml
===================================================================
--- trunk/tools/checkstyle/josm_checks.xml	(revision 14606)
+++ trunk/tools/checkstyle/josm_checks.xml	(revision 15588)
@@ -45,8 +45,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">
@@ -116,4 +112,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"/>
@@ -123,3 +124,8 @@
     <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: trunk/tools/checkstyle/josm_filters.xml
===================================================================
--- trunk/tools/checkstyle/josm_filters.xml	(revision 14606)
+++ trunk/tools/checkstyle/josm_filters.xml	(revision 15588)
@@ -29,4 +29,5 @@
   <suppress checks="." files="[\\/]tools[\\/]pmd[\\/]" />
   <suppress checks="." files="[\\/]windows[\\/]" />
+  <suppress checks="HeaderCheck" files="josm[\\/]tools[\\/]commons[\\/]" />
   <suppress checks="HeaderCheck" files="Ellipsoid\.java" />
   <suppress checks="HeaderCheck" files="NTV2GridShift\.java" />
@@ -48,4 +49,5 @@
   <suppress checks="HeaderCheck" files="ParallelScheduler\.java" />
   <suppress checks="FileLengthCheck" files="DomainValidator\.java" />
+  <suppress checks="MissingDeprecatedCheck" files="package-info\.java" />
   <suppress checks="org.openstreetmap.josm.TopLevelJavadocCheck" files="package-info\.java" />
   <suppress checks="org.openstreetmap.josm.TopLevelJavadocCheck" files="[\\/]test[\\/]" />