From 05647a0cfb4ec03ade1041c8eaf6da42dac9068e Mon Sep 17 00:00:00 2001
From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Tue, 7 May 2019 10:01:06 +0900
Subject: [PATCH] update checkstyle plugin.

---
 config/checkstyle/checkstyle-suppressions.xml | 17 ++++++---
 config/checkstyle/checkstyle.xml              | 53 ++++++++++++++++++---------
 pom.xml                                       |  5 +--
 3 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/config/checkstyle/checkstyle-suppressions.xml b/config/checkstyle/checkstyle-suppressions.xml
index dcb855d..7865862 100644
--- a/config/checkstyle/checkstyle-suppressions.xml
+++ b/config/checkstyle/checkstyle-suppressions.xml
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!DOCTYPE suppressions PUBLIC
-    "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <!--
     Checkstyle suppressions
-    for Checkstyle 6.19(7.4) or later
+    for Checkstyle 8.20 or later
 
-    [ http://checkstyle.sourceforge.net/ ]
+    [ https://checkstyle.org/ ]
 
-    Copyright(c) 2010 olyutorskii
+    Copyright(c) 2019 olyutorskii
 -->
 
 
 <suppressions>
 
+    <!-- Annotations -->
+    <suppress files="" checks="AnnotationOnSameLine" />
+
     <!-- Class Design -->
     <suppress files="" checks="DesignForExtension" />
 
@@ -23,6 +26,7 @@
     <suppress files="" checks="ExplicitInitialization" />
     <suppress files="" checks="FinalLocalVariable" />
     <suppress files="" checks="MagicNumber" />
+    <suppress files="" checks="OneStatementPerLine" />
 
     <!-- Imports -->
     <suppress files="" checks="ImportControl" />
@@ -34,6 +38,9 @@
     <suppress files="" checks="FinalParameters" />
     <suppress files="" checks="TrailingComment" />
 
+    <!-- Modifiers -->
+    <suppress files="" checks="InterfaceMemberImpliedModifier" />
+
     <!-- Whitespace -->
     <suppress files="" checks="SingleSpaceSeparator" />
 
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index dbf68d3..44be546 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <!--
     Checkstyle modules
-    for Checkstyle 6.19(7.4) or later
+    for Checkstyle 8.20 or later
 
-    [ http://checkstyle.sourceforge.net/ ]
+    [ https://checkstyle.org/ ]
 
-    Copyright(c) 2010 olyutorskii
+    Copyright(c) 2019 olyutorskii
 -->
 
 
@@ -26,10 +26,9 @@
 
     <!-- Filters -->
     <module name="SeverityMatchFilter" />
-    <module name="SuppressionCommentFilter" />
-    <module name="SuppressionFilter" />
+    <!--module name="SuppressionFilter" /-->
     <module name="SuppressWarningsFilter" />
-    <module name="SuppressWithNearbyCommentFilter" />
+    <module name="SuppressWithPlainTextCommentFilter" />
 
 
     <!-- Headers -->
@@ -78,15 +77,31 @@
     <module name="FileTabCharacter" />
 
 
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="module\-info\.java$" />
+    </module>
+
+
     <module name="TreeWalker">
 
-        <property name="tabWidth" value="8"/>
-        <property name="fileExtensions" value="java"/>
+        <property name="tabWidth" value="8" />
+        <property name="fileExtensions" value="java" />
+
+        <module name="SuppressWarningsHolder" />
+
+
+    <!-- Filters -->
+
+        <module name="SuppressionCommentFilter" />
+        <module name="SuppressWithNearbyCommentFilter" />
+        <!--module name="SuppressionXpathFilter" /-->
+        <!--module name="SuppressionXpathSingleFilter" /-->
 
 
     <!-- Annotations -->
 
         <module name="AnnotationLocation" />
+        <module name="AnnotationOnSameLine" />
         <module name="AnnotationUseStyle" />
         <module name="MissingDeprecated" />
         <module name="MissingOverride" />
@@ -164,7 +179,7 @@
         <module name="PackageDeclaration" />
         <module name="ParameterAssignment" />
         <module name="RequireThis">
-            <!--property name="checkMethods" value="false" /-->
+            <property name="checkMethods" value="false" />
         </module>
         <module name="ReturnCount" />
         <module name="SimplifyBooleanExpression" />
@@ -182,7 +197,7 @@
         <module name="AvoidStaticImport" />
         <module name="CustomImportOrder" />
         <module name="IllegalImport" />
-        <module name="ImportControl" />
+        <!--module name="ImportControl" /-->
         <module name="ImportOrder" />
         <module name="RedundantImport" />
         <module name="UnusedImports" />
@@ -225,14 +240,13 @@
 
         <module name="ArrayTypeStyle" />
         <module name="AvoidEscapedUnicodeCharacters">
-            <property name="allowEscapesForControlCharacters" value="true"/>
-            <property name="allowByTailComment" value="true"/>
-            <property name="allowIfAllCharactersEscaped" value="true"/>
-            <property name="allowNonPrintableEscapes" value="true"/>
+            <property name="allowEscapesForControlCharacters" value="true" />
+            <property name="allowByTailComment" value="true" />
+            <property name="allowIfAllCharactersEscaped" value="true" />
+            <property name="allowNonPrintableEscapes" value="true" />
         </module>
         <module name="CommentsIndentation" />
         <module name="DescendantToken" />
-        <module name="FileContentsHolder" />
         <module name="FinalParameters" />
         <module name="Indentation">
             <property name="caseIndent" value="0" />
@@ -248,6 +262,8 @@
 
     <!-- Modifiers -->
 
+        <module name="ClassMemberImpliedModifier" />
+        <module name="InterfaceMemberImpliedModifier" />
         <module name="ModifierOrder" />
         <module name="RedundantModifier" />
 
@@ -260,6 +276,7 @@
         <module name="ClassTypeParameterName" />
         <module name="ConstantName" />
         <module name="InterfaceTypeParameterName" />
+        <module name="LambdaParameterName" />
         <module name="LocalFinalVariableName" />
         <module name="LocalVariableName" />
         <module name="MemberName" />
@@ -352,7 +369,7 @@
         <module name="SingleSpaceSeparator" />
         <module name="TypecastParenPad" />
         <module name="WhitespaceAfter" >
-            <property name="tokens" value="COMMA, SEMI,"/>
+            <property name="tokens" value="COMMA, SEMI," />
         </module>
         <module name="WhitespaceAround">
             <property
diff --git a/pom.xml b/pom.xml
index ee0d972..c8e6c9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,8 +98,8 @@
         <surefire-plugin.version>3.0.0-M3</surefire-plugin.version>
         <jacoco-plugin.version>0.8.3</jacoco-plugin.version>
 
-        <checkstyle-plugin.version>2.17</checkstyle-plugin.version>
-        <checkstyleruntime.version>6.19</checkstyleruntime.version>
+        <checkstyle-plugin.version>3.0.0</checkstyle-plugin.version>
+        <checkstyleruntime.version>8.20</checkstyleruntime.version>
         <checkstyle.config.location>${project.basedir}/config/checkstyle/checkstyle.xml</checkstyle.config.location>
         <checkstyle.suppressions.location>${project.basedir}/config/checkstyle/checkstyle-suppressions.xml</checkstyle.suppressions.location>
         <checkstyle.enable.rss>false</checkstyle.enable.rss>
@@ -154,7 +154,6 @@
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <!--artifactId>checkstyle-backport-jre6</artifactId-->
                             <version>${checkstyleruntime.version}</version>
                         </dependency>
                     </dependencies>
-- 
2.11.0