Merge branch 'master'

[jindolf/JinParser.git] / config / pmd / pmdrules.xml

diff --git a/config/pmd/pmdrules.xml b/config/pmd/pmdrules.xml
index 369f10e..5dc58c6 100644 (file)
--- a/config/pmd/pmdrules.xml
+++ b/config/pmd/pmdrules.xml
@@ -2,16 +2,16 @@
 
 <!--
     Custom rule set
-    for PMD [ https://pmd.github.io/ ] 6.0.1 or later
+    for PMD [ https://pmd.github.io/ ] 6.21.0 or later
 
-    Copyright(c) 2016 olyutorskii
+    Copyright(c) 2019 olyutorskii
 -->
 
 <ruleset
   xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0
-  http://pmd.sourceforge.net/ruleset_2_0_0.xsd"
+  https://pmd.sourceforge.io/ruleset_2_0_0.xsd"
   name="Custom ruleset"
 >
 
@@ -29,9 +29,17 @@
         <exclude name="LocalVariableCouldBeFinal" />
         <exclude name="MethodArgumentCouldBeFinal" />
         <exclude name="OnlyOneReturn" />
+        <exclude name="ShortVariable" />
         <exclude name="UnnecessaryLocalBeforeReturn" />
+        <exclude name="UnnecessaryModifier" />
         <exclude name="UnnecessaryReturn" />
     </rule>
+    <rule ref="category/java/codestyle.xml/ControlStatementBraces" >
+        <properties>
+            <property name="checkIfElseStmt" value="false"/>
+            <property name="checkSingleIfStmt" value="false"/>
+        </properties>
+    </rule>
     <rule ref="category/java/codestyle.xml/LongVariable" >
         <properties>
             <property name="minimum" value="25"/>
@@ -44,6 +52,8 @@
     </rule>
 
     <rule ref="category/java/design.xml" >
+        <exclude name="AvoidThrowingNullPointerException" />
+        <exclude name="AvoidUncheckedExceptionsInSignatures" />
         <exclude name="LawOfDemeter" />
         <exclude name="LoosePackageCoupling" />
     </rule>
@@ -78,6 +88,8 @@
         <exclude name="RedundantFieldInitializer" />
     </rule>
 
+    <rule ref="category/java/security.xml" />
+
     <!--rule ref="category/pom/errorprone.xml" /-->
 
     <!--rule ref="category/xml/errorprone.xml" /-->