From 53327753434051764797a3acdd4e4fa9413396a5 Mon Sep 17 00:00:00 2001
From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Fri, 19 Apr 2013 00:30:31 +0900
Subject: [PATCH] =?utf8?q?pmd-plugin=203.0.1(PMD=205.0.2)=20=E5=AF=BE?=
 =?utf8?q?=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 pom.xml                      | 10 ++---
 src/main/config/pmdrules.xml | 92 ++++++++++++++++++++++++++++++--------------
 2 files changed, 69 insertions(+), 33 deletions(-)

diff --git a/pom.xml b/pom.xml
index 829fa97..73470b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,7 +165,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
+                <version>3.1</version>
                 <configuration>
                     <source>1.6</source>  <!-- for NetBeans IDE -->
                     <target>1.6</target>
@@ -233,7 +233,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.14</version>
+                <version>2.14.1</version>
                 <configuration>
                     <skipTests>false</skipTests>
                     <enableAssertions>true</enableAssertions>
@@ -262,7 +262,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.7.1</version>  <!-- 3.0 is buggy -->
+                <version>3.0.1</version>
                 <configuration>
                     <targetJdk>${maven.compiler.target}</targetJdk>
                     <rulesets>
@@ -416,7 +416,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.14</version>
+                <version>2.14.1</version>
                 <configuration>
                     <showSuccess>false</showSuccess>
                 </configuration>
@@ -462,7 +462,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.7.1</version>  <!-- 3.0 is buggy -->
+                <version>3.0.1</version>
                 <configuration>
                     <skip>false</skip>
                     <targetJdk>${maven.compiler.target}</targetJdk>
diff --git a/src/main/config/pmdrules.xml b/src/main/config/pmdrules.xml
index a77bfcc..0b76658 100644
--- a/src/main/config/pmdrules.xml
+++ b/src/main/config/pmdrules.xml
@@ -3,17 +3,16 @@
 <!--
     PMD用ルールセット定義
 
-    PMD [ http://pmd.sourceforge.net/ ] 4.3 以降用に記述されています。
+    PMD [ http://pmd.sourceforge.net/ ] 5.0 以降用に記述されています。
 
     Copyright(c) 2010 olyutorskii
 -->
 
 <ruleset
-  xmlns="http://pmd.sf.net/ruleset/1.0.0"
+  xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0
-  http://pmd.sf.net/ruleset_xml_schema.xsd"
-  xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"
+  xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0
+  http://pmd.sourceforge.net/ruleset_2_0_0.xsd"
   name="Custom ruleset"
 >
 
@@ -21,78 +20,115 @@
         custom rulesets for project
     </description>
 
-    <rule ref="rulesets/basic.xml">
-        <exclude name="UnnecessaryReturn" />
-    </rule>
+<!--
+    <rule ref="rulesets/java/android.xml" />
+-->
+
+    <rule ref="rulesets/java/basic.xml" />
 
-    <rule ref="rulesets/braces.xml">
+    <rule ref="rulesets/java/braces.xml">
         <exclude name="IfElseStmtsMustUseBraces" />
         <exclude name="IfStmtsMustUseBraces" />
     </rule>
 
-    <rule ref="rulesets/codesize.xml">
+    <rule ref="rulesets/java/clone.xml" />
+
+    <rule ref="rulesets/java/codesize.xml">
         <exclude name="TooManyMethods" />
     </rule>
-    <rule ref="rulesets/codesize.xml/TooManyMethods">
+    <rule ref="rulesets/java/codesize.xml/TooManyMethods">
         <properties>
             <property name="maxmethods" value="25"/>
         </properties>
     </rule>
 
-    <rule ref="rulesets/clone.xml" />
+    <rule ref="rulesets/java/comments.xml">
+        <exclude name="CommentSize" />
+    </rule>
+    <rule ref="rulesets/java/comments.xml/CommentSize" >
+        <properties>
+            <property name="maxLines" value="25"/>
+        </properties>
+    </rule>
 
-    <rule ref="rulesets/controversial.xml">
+    <rule ref="rulesets/java/controversial.xml">
         <exclude name="NullAssignment" />
         <exclude name="OnlyOneReturn" />
         <exclude name="DefaultPackage" />
         <exclude name="DataflowAnomalyAnalysis" />
         <exclude name="AvoidUsingShortType" />
         <exclude name="AvoidLiteralsInIfCondition" />
+        <exclude name="UseConcurrentHashMap" />
     </rule>
 
-    <rule ref="rulesets/coupling.xml" />
+    <rule ref="rulesets/java/coupling.xml">
+        <exclude name="LawOfDemeter" />
+        <exclude name="LoosePackageCoupling" /> <!-- 3.0.1 では読めない -->
+    </rule>
 
-    <rule ref="rulesets/design.xml">
+    <rule ref="rulesets/java/design.xml">
         <exclude name="ConfusingTernary" />
         <exclude name="UnnecessaryLocalBeforeReturn" />
+        <exclude name="FieldDeclarationsShouldBeAtStartOfClass" />
     </rule>
 
-    <rule ref="rulesets/finalizers.xml" />
+    <rule ref="rulesets/java/empty.xml" />
+
+    <rule ref="rulesets/java/finalizers.xml" />
 
-    <rule ref="rulesets/imports.xml" />
+    <rule ref="rulesets/java/imports.xml" />
 
-    <rule ref="rulesets/logging-java.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/migrating.xml" />
-    <rule ref="rulesets/migrating_to_15.xml" />
+    <rule ref="rulesets/java/logging-java.xml" />
 
-    <rule ref="rulesets/naming.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/naming.xml/LongVariable">
+    <rule ref="rulesets/java/naming.xml/LongVariable">
         <properties>
             <property name="minimum" value="25"/>
         </properties>
     </rule>
 
-    <rule ref="rulesets/optimizations.xml">
+    <rule ref="rulesets/java/optimizations.xml">
         <exclude name="LocalVariableCouldBeFinal" />
         <exclude name="MethodArgumentCouldBeFinal" />
+        <exclude name="RedundantFieldInitializer" />
     </rule>
 
-    <rule ref="rulesets/strictexception.xml">
+    <rule ref="rulesets/java/strictexception.xml">
         <exclude name="AvoidThrowingNullPointerException" />
     </rule>
 
-    <rule ref="rulesets/strings.xml" />
+    <rule ref="rulesets/java/strings.xml" />
 
-    <rule ref="rulesets/sunsecure.xml" />
+    <rule ref="rulesets/java/sunsecure.xml" />
 
-    <rule ref="rulesets/typeresolution.xml" />
+    <rule ref="rulesets/java/typeresolution.xml" />
+
+    <rule ref="rulesets/java/unnecessary.xml">
+        <exclude name="UnnecessaryReturn" />
+        <exclude name="UselessParentheses" />
+    </rule>
 
-    <rule ref="rulesets/unusedcode.xml" />
+    <rule ref="rulesets/java/unusedcode.xml" />
 
 </ruleset>
 
-- 
2.11.0