From 664315e45c258631f65c6d7e601823126a5c6fb4 Mon Sep 17 00:00:00 2001
From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Sun, 25 Aug 2013 20:55:33 +0900
Subject: [PATCH] =?utf8?q?Maven=E3=83=97=E3=83=A9=E3=82=B0=E3=82=A4?=
 =?utf8?q?=E3=83=B3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 pom.xml                      | 26 ++++++-------
 src/main/config/checks.xml   |  7 +++-
 src/main/config/pmdrules.xml | 92 ++++++++++++++++++++++++++++++--------------
 3 files changed, 82 insertions(+), 43 deletions(-)

diff --git a/pom.xml b/pom.xml
index 96e0b33..e2491ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,11 +138,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.1.1</version>
+                <version>1.3.1</version>
                 <configuration>
                     <rules>
                         <requireMavenVersion>
-                            <version>[2.2,)</version>
+                            <version>[3.0,)</version>
                         </requireMavenVersion>
                         <requireJavaVersion>
                             <version>[1.6,)</version>
@@ -182,7 +182,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>
@@ -214,7 +214,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.0</version>
+                <version>2.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -282,7 +282,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12.4</version>
+                <version>2.16</version>
                 <configuration>
                     <skipTests>false</skipTests>
                     <enableAssertions>true</enableAssertions>
@@ -292,7 +292,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.2</version>
+                <version>3.3</version>
                 <configuration>
                     <generateReports>true</generateReports>
                     <locales>ja</locales>
@@ -304,14 +304,14 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>2.10</version>
                 <!-- config from property value -->
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.7.1</version>
+                <version>3.0.1</version>
                 <configuration>
                     <targetJdk>${maven.compiler.target}</targetJdk>
                     <rulesets>
@@ -403,7 +403,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.7</version>
                 <configuration>
                     <linkOnly>true</linkOnly>
                     <offline>true</offline>
@@ -436,7 +436,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9</version>
+                <version>2.9.1</version>
                 <configuration>
                     <skip>false</skip>
                     <notimestamp>true</notimestamp>
@@ -464,7 +464,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.12.4</version>
+                <version>2.16</version>
                 <configuration>
                     <showSuccess>false</showSuccess>
                 </configuration>
@@ -493,7 +493,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>2.10</version>
                 <configuration>
                     <skip>false</skip>
                     <!-- config from property value -->
@@ -510,7 +510,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.7.1</version>
+                <version>3.0.1</version>
                 <configuration>
                     <skip>false</skip>
                     <targetJdk>${maven.compiler.target}</targetJdk>
diff --git a/src/main/config/checks.xml b/src/main/config/checks.xml
index cf55cf6..3e31cbb 100644
--- a/src/main/config/checks.xml
+++ b/src/main/config/checks.xml
@@ -42,6 +42,7 @@
     <module name="RegexpHeader">
         <property name="header" value="^/\*$\n^ \*( .*)?$\n^ \*/$\n" />
         <property name="multiLines" value="2" />
+        <property name="fileExtensions" value="java" />
     </module>
 
 
@@ -50,7 +51,9 @@
 
 
     <!-- Miscellaneous -->
-    <module name="NewlineAtEndOfFile" />
+    <module name="NewlineAtEndOfFile">
+        <property name="fileExtensions" value="java" />
+    </module>
     <module name="Translation" />
 
 
@@ -114,7 +117,7 @@
         <module name="ArrayTrailingComma" />
         <module name="AvoidInlineConditionals" />
         <module name="CovariantEquals" />
-        <module name="DoubleCheckedLocking" />
+<!--    <module name="DoubleCheckedLocking" />  5.6 obsolete -->
         <module name="EmptyStatement" />
         <module name="EqualsAvoidNull" />
         <module name="EqualsHashCode" />
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