move pmd config

diff --git a/pmdrules.xml b/config/pmd/pmdrules.xml
similarity index 50%
rename from pmdrules.xml
rename to config/pmd/pmdrules.xml
index 5863f9f..cfb841b 100644 (file)
--- a/pmdrules.xml
+++ b/config/pmd/pmdrules.xml
@@ -2,7 +2,7 @@
 
 <!--
     Custom rule set
-    for PMD [ https://pmd.github.io/ ] 5.6.1 or later
+    for PMD [ https://pmd.github.io/ ] 6.0.1 or later
 
     Copyright(c) 2016 olyutorskii
 -->
@@ -19,96 +19,54 @@
         custom rulesets
     </description>
 
-    <rule ref="rulesets/java/android.xml" />
+    <rule ref="category/java/bestpractices.xml" />
 
-    <rule ref="rulesets/java/basic.xml" />
-
-    <rule ref="rulesets/java/braces.xml">
+    <rule ref="category/java/codestyle.xml" >
+        <exclude name="CommentDefaultAccessModifier" />
+        <exclude name="DefaultPackage" />
         <exclude name="IfElseStmtsMustUseBraces" />
         <exclude name="IfStmtsMustUseBraces" />
+        <exclude name="LocalVariableCouldBeFinal" />
+        <exclude name="MethodArgumentCouldBeFinal" />
+        <exclude name="OnlyOneReturn" />
+        <exclude name="ShortVariable" />
+        <exclude name="UnnecessaryLocalBeforeReturn" />
+        <exclude name="UnnecessaryReturn" />
     </rule>
 
-    <rule ref="rulesets/java/clone.xml" />
-
-    <rule ref="rulesets/java/codesize.xml" />
-
-    <rule ref="rulesets/java/comments.xml">
-        <exclude name="CommentDefaultAccessModifier" />
+    <rule ref="category/java/design.xml" >
+        <exclude name="LawOfDemeter" />
+        <exclude name="LoosePackageCoupling" />
     </rule>
-    <rule ref="rulesets/java/comments.xml/CommentRequired" >
+
+    <rule ref="category/java/documentation.xml" />
+    <rule ref="category/java/documentation.xml/CommentRequired" >
         <properties>
             <property name="fieldCommentRequirement" value="Ignored"/>
         </properties>
     </rule>
-    <rule ref="rulesets/java/comments.xml/CommentSize" >
+    <rule ref="category/java/documentation.xml/CommentSize" >
         <properties>
             <property name="maxLines" value="25"/>
         </properties>
     </rule>
 
-    <rule ref="rulesets/java/controversial.xml">
-        <exclude name="DefaultPackage" />
-        <exclude name="OnlyOneReturn" />
-        <exclude name="DataflowAnomalyAnalysis" />
+    <rule ref="category/java/errorprone.xml" >
         <exclude name="AvoidLiteralsInIfCondition" />
-    </rule>
-
-    <rule ref="rulesets/java/coupling.xml">
-        <exclude name="LoosePackageCoupling" />
-        <exclude name="LawOfDemeter" />
-    </rule>
-
-    <rule ref="rulesets/java/design.xml">
-        <exclude name="UnnecessaryLocalBeforeReturn" />
-        <exclude name="FieldDeclarationsShouldBeAtStartOfClass" />
-    </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/logging-jakarta-commons.xml" />
-
-    <rule ref="rulesets/java/javabeans.xml">
         <exclude name="BeanMembersShouldSerialize" />
+        <exclude name="DataflowAnomalyAnalysis" />
     </rule>
 
-    <rule ref="rulesets/java/logging-java.xml" />
-
-    <rule ref="rulesets/java/junit.xml" />
-
-    <rule ref="rulesets/java/migrating.xml" />
-
-    <rule ref="rulesets/java/naming.xml">
-        <exclude name="ShortVariable" />
-        <exclude name="LongVariable" />
-    </rule>
-
-    <rule ref="rulesets/java/optimizations.xml">
-        <exclude name="LocalVariableCouldBeFinal" />
-        <exclude name="MethodArgumentCouldBeFinal" />
-        <exclude name="RedundantFieldInitializer" />
-    </rule>
-
-    <rule ref="rulesets/java/strictexception.xml" />
+    <rule ref="category/java/multithreading.xml" />
 
-    <rule ref="rulesets/java/strings.xml">
+    <rule ref="category/java/performance.xml" >
         <exclude name="ConsecutiveAppendsShouldReuse" />
+        <exclude name="RedundantFieldInitializer" />
     </rule>
 
-    <rule ref="rulesets/java/sunsecure.xml" />
-
-    <rule ref="rulesets/java/typeresolution.xml" />
-
-    <rule ref="rulesets/java/unnecessary.xml">
-        <exclude name="UnnecessaryReturn" />
-    </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 baccd51..3c6aeac 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -514,7 +514,7 @@
                 <version>${pmd-plugin.version}</version>
                 <configuration>
                     <rulesets>
-                        <ruleset>${project.basedir}/pmdrules.xml</ruleset>
+                        <ruleset>${project.basedir}/config/pmd/pmdrules.xml</ruleset>
                     </rulesets>
                 </configuration>
                 <reportSets>