From 05c2fb66552b251567deb1b16be634aa77ad8c55 Mon Sep 17 00:00:00 2001
From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Wed, 5 Jun 2019 23:21:21 +0900
Subject: [PATCH] update pmd plugin.

---
 config/pmd/pmdrules.xml | 130 ++++++++++++++----------------------------------
 pom.xml                 |   9 ++--
 2 files changed, 41 insertions(+), 98 deletions(-)

diff --git a/config/pmd/pmdrules.xml b/config/pmd/pmdrules.xml
index 0b76658..db56675 100644
--- a/config/pmd/pmdrules.xml
+++ b/config/pmd/pmdrules.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
-    PMD用ルールセット定義
+    Custom rule set
+    for PMD [ https://pmd.github.io/ ] 6.13.0 or later
 
-    PMD [ http://pmd.sourceforge.net/ ] 5.0 以降用に記述されています。
-
-    Copyright(c) 2010 olyutorskii
+    Copyright(c) 2019 olyutorskii
 -->
 
 <ruleset
@@ -17,118 +16,63 @@
 >
 
     <description>
-        custom rulesets for project
+        custom rulesets
     </description>
 
-<!--
-    <rule ref="rulesets/java/android.xml" />
--->
-
-    <rule ref="rulesets/java/basic.xml" />
-
-    <rule ref="rulesets/java/braces.xml">
-        <exclude name="IfElseStmtsMustUseBraces" />
-        <exclude name="IfStmtsMustUseBraces" />
-    </rule>
-
-    <rule ref="rulesets/java/clone.xml" />
+    <rule ref="category/java/bestpractices.xml" />
 
-    <rule ref="rulesets/java/codesize.xml">
-        <exclude name="TooManyMethods" />
+    <rule ref="category/java/codestyle.xml" >
+        <exclude name="CommentDefaultAccessModifier" />
+        <exclude name="DefaultPackage" />
+        <exclude name="LocalVariableCouldBeFinal" />
+        <exclude name="MethodArgumentCouldBeFinal" />
+        <exclude name="OnlyOneReturn" />
+        <exclude name="ShortVariable" />
+        <exclude name="UnnecessaryLocalBeforeReturn" />
+        <exclude name="UnnecessaryReturn" />
     </rule>
-    <rule ref="rulesets/java/codesize.xml/TooManyMethods">
+    <rule ref="category/java/codestyle.xml/ControlStatementBraces" >
         <properties>
-            <property name="maxmethods" value="25"/>
+            <property name="checkIfElseStmt" value="false"/>
+            <property name="checkSingleIfStmt" value="false"/>
         </properties>
     </rule>
 
-    <rule ref="rulesets/java/comments.xml">
-        <exclude name="CommentSize" />
+    <rule ref="category/java/design.xml" >
+        <exclude name="LawOfDemeter" />
+        <exclude name="LoosePackageCoupling" />
     </rule>
-    <rule ref="rulesets/java/comments.xml/CommentSize" >
+
+    <rule ref="category/java/documentation.xml" />
+    <rule ref="category/java/documentation.xml/CommentRequired" >
+        <properties>
+            <property name="fieldCommentRequirement" value="Ignored"/>
+        </properties>
+    </rule>
+    <rule ref="category/java/documentation.xml/CommentSize" >
         <properties>
             <property name="maxLines" value="25"/>
         </properties>
     </rule>
 
-    <rule ref="rulesets/java/controversial.xml">
-        <exclude name="NullAssignment" />
-        <exclude name="OnlyOneReturn" />
-        <exclude name="DefaultPackage" />
-        <exclude name="DataflowAnomalyAnalysis" />
-        <exclude name="AvoidUsingShortType" />
+    <rule ref="category/java/errorprone.xml" >
         <exclude name="AvoidLiteralsInIfCondition" />
-        <exclude name="UseConcurrentHashMap" />
-    </rule>
-
-    <rule ref="rulesets/java/coupling.xml">
-        <exclude name="LawOfDemeter" />
-        <exclude name="LoosePackageCoupling" /> <!-- 3.0.1 では読めない -->
-    </rule>
-
-    <rule ref="rulesets/java/design.xml">
-        <exclude name="ConfusingTernary" />
-        <exclude name="UnnecessaryLocalBeforeReturn" />
-        <exclude name="FieldDeclarationsShouldBeAtStartOfClass" />
+        <exclude name="BeanMembersShouldSerialize" />
+        <exclude name="DataflowAnomalyAnalysis" />
     </rule>
 
-    <rule ref="rulesets/java/empty.xml" />
-
-    <rule ref="rulesets/java/finalizers.xml" />
-
-    <rule ref="rulesets/java/imports.xml" />
-
-<!--
-    <rule ref="rulesets/java/j2ee.xml" />
-    <rule ref="rulesets/java/javabeans.xml" />
--->
-
-    <rule ref="rulesets/java/junit.xml" />
-
-<!--
-    <rule ref="rulesets/java/logging-jakarta-commons.xml" />
--->
-
-    <rule ref="rulesets/java/logging-java.xml" />
-
-    <rule ref="rulesets/java/migrating.xml" />
-<!--
-    <rule ref="rulesets/java/migrating_to_XX.xml" />
--->
-
-    <rule ref="rulesets/java/naming.xml">
-        <exclude name="ShortVariable" />
-        <exclude name="LongVariable" />
-        <exclude name="AvoidFieldNameMatchingMethodName" />
-    </rule>
-    <rule ref="rulesets/java/naming.xml/LongVariable">
-        <properties>
-            <property name="minimum" value="25"/>
-        </properties>
-    </rule>
+    <rule ref="category/java/multithreading.xml" />
 
-    <rule ref="rulesets/java/optimizations.xml">
-        <exclude name="LocalVariableCouldBeFinal" />
-        <exclude name="MethodArgumentCouldBeFinal" />
+    <rule ref="category/java/performance.xml" >
+        <exclude name="ConsecutiveAppendsShouldReuse" />
         <exclude name="RedundantFieldInitializer" />
     </rule>
 
-    <rule ref="rulesets/java/strictexception.xml">
-        <exclude name="AvoidThrowingNullPointerException" />
-    </rule>
-
-    <rule ref="rulesets/java/strings.xml" />
-
-    <rule ref="rulesets/java/sunsecure.xml" />
+    <rule ref="category/java/security.xml" />
 
-    <rule ref="rulesets/java/typeresolution.xml" />
-
-    <rule ref="rulesets/java/unnecessary.xml">
-        <exclude name="UnnecessaryReturn" />
-        <exclude name="UselessParentheses" />
-    </rule>
+    <!--rule ref="category/pom/errorprone.xml" /-->
 
-    <rule ref="rulesets/java/unusedcode.xml" />
+    <!--rule ref="category/xml/errorprone.xml" /-->
 
 </ruleset>
 
diff --git a/pom.xml b/pom.xml
index bb5bdc5..227ce0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,6 +101,8 @@
         <checkstyle.suppressions.location>${project.basedir}/config/checkstyle/checkstyle-suppressions.xml</checkstyle.suppressions.location>
         <checkstyle.enable.rss>false</checkstyle.enable.rss>
 
+        <pmd-plugin.version>3.12.0</pmd-plugin.version>
+
         <spotbugs-plugin.version>3.1.11</spotbugs-plugin.version>
         <spotbugs.effort>Max</spotbugs.effort>
         <spotbugs.threshold>Low</spotbugs.threshold>
@@ -385,9 +387,8 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>${pmd-plugin.version}</version>
                 <configuration>
-                    <!--targetJdk>${maven.compiler.target}</targetJdk-->
                     <rulesets>
                         <ruleset>${project.basedir}/config/pmd/pmdrules.xml</ruleset>
                     </rulesets>
@@ -556,10 +557,8 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>${pmd-plugin.version}</version>
                 <configuration>
-                    <skip>false</skip>
-                    <!--targetJdk>${maven.compiler.target}</targetJdk-->
                     <rulesets>
                         <ruleset>${project.basedir}/config/pmd/pmdrules.xml</ruleset>
                     </rulesets>
-- 
2.11.0