Update Checkstyle

apache · Jan 11, 2020 · 5df17df · 5df17df
1 parent 2aaf01b
commit 5df17df
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/build.xml b/build.xml
@@ -595,7 +595,7 @@
     </target>
 
     <target name="init-checkstyle" depends="jar">
-        <ivy:cachepath organisation="com.puppycrawl.tools" module="checkstyle" revision="8.0"
+        <ivy:cachepath organisation="com.puppycrawl.tools" module="checkstyle" revision="8.28"
                        inline="true" conf="default" pathid="checkstyle.classpath" log="download-only"/>
         <taskdef uri="antlib:com.puppycrawl.tools.checkstyle.ant"
                  resource="com/puppycrawl/tools/checkstyle/ant/antlib.xml" classpathref="checkstyle.classpath"/>

diff --git a/src/etc/checkstyle/checkstyle-config b/src/etc/checkstyle/checkstyle-config
@@ -28,6 +28,16 @@
   <!-- Items moved out of TreeWalker for new versions of Checkstyle -->
   <module name="FileLength"/>
   <module name="FileTabCharacter"/>
+  <module name="LineLength">
+    <property name="max" value="100"/>
+    <property name="ignorePattern" value="^ *\* *[^ ]+$"/>
+    <property name="tabWidth" value="4"/>
+  </module>
+
+  <module name="RegexpSingleline">
+    <!-- \s matches whitespace character, $ matches end of line. -->
+    <property name="format" value="\s+$"/>
+  </module>
 
   <module name="TreeWalker">
     <!-- Javadoc requirements -->
@@ -36,7 +46,7 @@
     </module>
     <module name="JavadocMethod">
       <property name="scope" value="protected"/>
-      <property name="allowUndeclaredRTE" value="true"/>
+      <!-- <property name="allowUndeclaredRTE" value="true"/> -->
     </module>
     <module name="JavadocVariable">
        <property name="scope" value="public"/>
@@ -60,11 +70,6 @@
     <module name="UnusedImports"/>
 
     <!-- size limits -->
-    <module name="LineLength">
-      <property name="max" value="100"/>
-      <property name="ignorePattern" value="^ *\* *[^ ]+$"/>
-      <property name="tabWidth" value="4"/>
-    </module>
     <module name="MethodLength"/>
     <module name="ParameterNumber"/>
 
@@ -121,29 +126,22 @@
     <!-- <module name="TodoComment"/> -->
     <module name="UpperEll"/>
     <!-- allow comment suppression of checks -->
-    <module name="FileContentsHolder"/>
+    <!-- <module name="FileContentsHolder"/> --><!-- removed in 8.2 -->
     <!--
     <module name="GenericIllegalRegexp">
       <property name="format" value="\s+$"/>
       <property name="message" value="Line has trailing spaces."/>
     </module>
     -->
-  </module>
-
-  <module name="RegexpSingleline">
-    <!-- \s matches whitespace character, $ matches end of line. -->
-    <property name="format" value="\s+$"/>
+    <module name="SuppressionCommentFilter">
+      <property name="offCommentFormat" value="CheckStyle\:([\w\|]+) *OFF"/>
+      <property name="onCommentFormat" value="CheckStyle\:([\w\|]+) *ON"/>
+      <property name="checkFormat" value="$1"/>
+    </module>
   </module>
 
   <!-- <module name="au.com.redhillconsulting.simian.SimianCheck"/> -->
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CheckStyle\:([\w\|]+) *OFF"/>
-    <property name="onCommentFormat" value="CheckStyle\:([\w\|]+) *ON"/>
-    <property name="checkFormat" value="$1"/>
-  </module>
-
   <module name="SuppressionFilter">
     <property name="file" value="${checkstyle.src.dir}/checkstyle-suppress.xml"/>
   </module>
-
 </module>