Maven plugin 更新

diff --git a/pom.xml b/pom.xml
index c0ad319..6f6f620 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
-    Maven2(or3) POM definition file
+    Maven3 POM definition file
 -->
 
 <project
@@ -36,7 +36,7 @@
     <licenses>
         <license>
             <name>The MIT License</name>
-            <url>http://www.opensource.org/licenses/mit-license.php</url>
+            <url>https://opensource.org/licenses/mit-license.php</url>
             <distribution>manual</distribution>
         </license>
     </licenses>
@@ -44,7 +44,7 @@
     <developers>
         <developer>
             <id>olyutorskii</id>
-            <url>http://sites.google.com/site/olyutorskiipit/</url>
+            <url>https://sites.google.com/site/olyutorskiipit/</url>
             <organization>Jovsonz Partners</organization>
             <organizationUrl>http://sourceforge.jp/projects/jovsonz/</organizationUrl>
             <roles>
@@ -58,7 +58,7 @@
     <mailingLists/>
 
     <prerequisites>
-        <maven>2.2</maven>
+        <maven>3.0.1</maven>
     </prerequisites>
 
     <modules/>
@@ -120,11 +120,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.1.1</version>
+                <version>1.4.1</version>
                 <configuration>
                     <rules>
                         <requireMavenVersion>
-                            <version>[2.2,)</version>
+                            <version>[3.0.1,)</version>
                         </requireMavenVersion>
                         <requireJavaVersion>
                             <version>[1.7,)</version>
@@ -136,13 +136,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
-                <version>2.4</version>
+                <version>2.5.2</version>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>2.5</version>
+                <version>3.0.0</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -164,7 +164,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
+                <version>3.5.1</version>
                 <configuration>
                     <source>1.7</source>  <!-- for NetBeans IDE -->
                     <target>1.7</target>
@@ -179,7 +179,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
+                <version>3.0.0</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -192,8 +192,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.4</version>
+                <version>2.6</version>
                 <configuration>
+                    <archiveBaseDirectory>.</archiveBaseDirectory>
                     <descriptors>
                         <descriptor>src/main/assembly/descriptor.xml</descriptor>
                     </descriptors>
@@ -203,7 +204,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
+                <version>3.0.0</version>
                 <configuration>
                     <includePom>true</includePom>
                     <archive>
@@ -226,13 +227,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
+                <version>3.0.0</version>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12.4</version>
+                <version>2.19.1</version>
                 <configuration>
                     <skipTests>false</skipTests>
                     <enableAssertions>true</enableAssertions>
@@ -242,7 +243,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.2</version>
+                <version>3.5.1</version>
                 <configuration>
                     <generateReports>true</generateReports>
                     <locales>ja</locales>
@@ -254,14 +255,14 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>2.15</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.6</version>
                 <configuration>
                     <targetJdk>${maven.compiler.target}</targetJdk>
                     <rulesets>
@@ -273,7 +274,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.5.2</version>
+                <version>3.0.3</version>
                 <configuration>
                     <effort>Max</effort>
                     <threshold>Low</threshold>
@@ -287,7 +288,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.5.2</version>
+                <version>2.7</version>
                 <configuration>
                     <encoding>${project.build.sourceEncoding}</encoding>
                     <formats>
@@ -353,7 +354,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.9</version>
                 <configuration>
                     <linkOnly>true</linkOnly>
                     <offline>true</offline>
@@ -386,13 +387,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9</version>
+                <version>2.10.3</version>
                 <configuration>
                     <skip>false</skip>
                     <notimestamp>true</notimestamp>
                     <quiet>true</quiet>
                     <show>protected</show>
-                    <stylesheet>maven</stylesheet>
                 </configuration>
                 <reportSets>
                     <reportSet>
@@ -406,7 +406,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.3</version>
+                <version>2.5</version>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
@@ -415,7 +415,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.12.4</version>
+                <version>2.19.1</version>
                 <configuration>
                     <showSuccess>false</showSuccess>
                 </configuration>
@@ -431,7 +431,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.5.2</version>
+                <version>2.7</version>
                 <configuration>
                     <encoding>${project.build.sourceEncoding}</encoding>
                     <formats>
@@ -444,7 +444,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>2.15</version>
                 <configuration>
                     <skip>false</skip>
                     <!-- config from property value -->
@@ -461,7 +461,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.7.1</version>
+                <version>3.6</version>
                 <configuration>
                     <skip>false</skip>
                     <targetJdk>${maven.compiler.target}</targetJdk>
@@ -482,7 +482,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.5.2</version>
+                <version>3.0.3</version>
                 <configuration>
                     <skip>false</skip>
                     <effort>Max</effort>
@@ -498,13 +498,13 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>javancss-maven-plugin</artifactId>
-                <version>2.0</version>
+                <version>2.1</version>
             </plugin>
 
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jdepend-maven-plugin</artifactId>
-                <version>2.0-beta-2</version>
+                <version>2.0</version>
             </plugin>
 
         </plugins>

diff --git a/src/main/assembly/descriptor.xml b/src/main/assembly/descriptor.xml
index 5712cd3..41810c6 100644 (file)
--- a/src/main/assembly/descriptor.xml
+++ b/src/main/assembly/descriptor.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <assembly
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
-  http://maven.apache.org/xsd/assembly-1.1.2.xsd"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3
+  http://maven.apache.org/xsd/assembly-1.1.3.xsd"
 >
 
 <!--
-    SourceForge.JP用リリースファイル構成定義ファイル
+    OSDN.JP用リリースファイル構成定義ファイル
     Maven2(or3) assembly用
 -->
 
@@ -20,6 +20,7 @@
 
     <fileSets>
         <fileSet>
+            <directory>.</directory>
             <includes>
                 <include>pom.xml</include>
                 <include>fixcrlf.xml</include>

diff --git a/src/main/config/checks.xml b/src/main/config/checks.xml
index d5e3ff9..bad583f 100644 (file)
--- a/src/main/config/checks.xml
+++ b/src/main/config/checks.xml
@@ -7,7 +7,7 @@
 <!--
     Checkstyle用チェック項目定義。
 
-    Checkstyle 5.3 以降向けに記述。
+    Checkstyle 6.1 以降向けに記述。
 
     [ http://checkstyle.sourceforge.net/ ]
 
@@ -25,23 +25,19 @@
 
     <!-- Filters -->
     <module name="SeverityMatchFilter" />
+    <module name="SuppressionCommentFilter" />
     <module name="SuppressionFilter">
         <property name="file" value="src/main/config/suppressions.xml" />
     </module>
-    <module name="SuppressionCommentFilter" />
+    <module name="SuppressWarningsFilter" />
     <module name="SuppressWithNearbyCommentFilter" />
 
 
-    <!-- Duplicate Code -->
-    <module name="StrictDuplicateCode">
-        <property name="min" value="20" />
-    </module>
-
-
     <!-- Headers -->
     <module name="RegexpHeader">
         <property name="header" value="^/\*$\n^ \*( .*)?$\n^ \*/$\n" />
         <property name="multiLines" value="2" />
+        <property name="fileExtensions" value="java" />
     </module>
 
 
@@ -50,20 +46,31 @@
 
 
     <!-- Miscellaneous -->
-    <module name="NewlineAtEndOfFile" />
+    <module name="NewlineAtEndOfFile">
+        <property name="fileExtensions" value="java" />
+    </module>
     <module name="Translation" />
+    <module name="UniqueProperties" />
 
 
     <!-- Regexp -->
+    <module name="RegexpMultiline">
+        <property name="format" value="[\u000b\f\u001a]" />
+    </module>
+<!--<module name="RegexpOnFilename" />   6.15 or later -->
     <module name="RegexpSingleline">
         <property name="format" value="\s+$" />
-        <property name="minimum" value="0" />
-        <property name="maximum" value="0" />
+    </module>
+    <module name="RegexpSingleline">
+        <!-- scm conflict -->
+        <property name="format" value="&lt;&lt;&lt;&lt;&lt;" />
     </module>
 
 
     <!-- Size Violations -->
-    <module name="FileLength" />
+    <module name="FileLength">
+        <property name="max" value="2000"/>
+    </module>
 
 
     <!-- Whitespace -->
@@ -72,41 +79,44 @@
 
     <module name="TreeWalker">
 
-        <module name="FileContentsHolder" />
+        <property name="tabWidth" value="8"/>
 
 
     <!-- Annotations -->
 
+        <module name="AnnotationLocation" />
         <module name="AnnotationUseStyle" />
         <module name="MissingDeprecated" />
         <module name="MissingOverride" />
         <module name="PackageAnnotation" />
         <module name="SuppressWarnings" />
+        <module name="SuppressWarningsHolder" />
 
 
     <!-- Block Checks -->
-
+        <module name="AvoidNestedBlocks" />
         <module name="EmptyBlock" />
+<!--    <module name="EmptyCatchBlock" />  6.4 or later  -->
         <module name="LeftCurly" />
         <module name="NeedBraces">
             <property name="tokens" value="LITERAL_DO" />
         </module>
         <module name="RightCurly" />
-        <module name="AvoidNestedBlocks" />
 
 
     <!-- Class Design -->
 
-        <module name="VisibilityModifier" />
+        <module name="DesignForExtension" />
         <module name="FinalClass" />
-        <module name="InterfaceIsType" />
         <module name="HideUtilityClassConstructor" />
-<!--    <module name="DesignForExtension" />  -->
+        <module name="InnerTypeLast" />
+        <module name="InterfaceIsType" />
         <module name="MutableException" />
+        <module name="OneTopLevelClass" />
         <module name="ThrowsCount">
-            <property name="max" value="3" />
+            <property name="max" value="4" />
         </module>
-        <module name="InnerTypeLast" />
+        <module name="VisibilityModifier" />
 
 
     <!-- Coding -->
@@ -114,33 +124,38 @@
         <module name="ArrayTrailingComma" />
         <module name="AvoidInlineConditionals" />
         <module name="CovariantEquals" />
-        <module name="DoubleCheckedLocking" />
+        <module name="DeclarationOrder" />
+        <module name="DefaultComesLast" />
         <module name="EmptyStatement" />
         <module name="EqualsAvoidNull" />
         <module name="EqualsHashCode" />
-<!--    <module name="FinalLocalVariable" />  -->
+        <module name="ExplicitInitialization" />
+        <module name="FallThrough" />
+        <module name="FinalLocalVariable" />
         <module name="HiddenField">
             <property name="ignoreConstructorParameter" value="true" />
             <property name="ignoreSetter" value="true" />
             <property name="ignoreAbstractMethods" value="true" />
         </module>
+        <module name="IllegalCatch" />
         <module name="IllegalInstantiation" />
+        <module name="IllegalThrows" />
         <module name="IllegalToken">
-            <property name="tokens" value="LITERAL_NATIVE, STATIC_IMPORT" />
+            <property name="tokens" value="LITERAL_NATIVE" />
         </module>
         <module name="IllegalTokenText">
             <property name="tokens" value="NUM_INT, NUM_LONG" />
-            <property name="format" value="^0[^lx]" />
-            <property name="ignoreCase" value="true" />
+            <property name="format" value="^0_*[0-7]" />
+            <property name="message" value="inhibit octal number" />
         </module>
+        <module name="IllegalType" />
         <module name="InnerAssignment" />
         <module name="MagicNumber" />
+        <module name="MissingCtor" />
         <module name="MissingSwitchDefault" />
         <module name="ModifiedControlVariable" />
-        <module name="RedundantThrows">
-            <property name="allowUnchecked" value="true" />
-            <property name="allowSubclasses" value="true" />
-        </module>
+        <module name="MultipleStringLiterals" />
+        <module name="MultipleVariableDeclarations" />
         <module name="SimplifyBooleanExpression" />
         <module name="SimplifyBooleanReturn" />
         <module name="StringLiteralEquality" />
@@ -149,51 +164,44 @@
         <module name="NestedTryDepth" />
         <module name="NoClone" />
         <module name="NoFinalizer" />
-        <module name="SuperClone" />
-        <module name="SuperFinalize" />
-        <module name="IllegalCatch" />
-        <module name="IllegalThrows" />
+        <module name="OneStatementPerLine" />
+        <module name="OverloadMethodsDeclarationOrder" />
         <module name="PackageDeclaration" />
-        <module name="JUnitTestCase" />
+        <module name="ParameterAssignment" />
+        <module name="RequireThis">
+            <property name="checkMethods" value="false" />
+        </module>
         <module name="ReturnCount">
             <property name="max" value="5" />
         </module>
-        <module name="IllegalType" />
-        <module name="DeclarationOrder" />
-        <module name="ParameterAssignment" />
-<!--    <module name="ExplicitInitialization" />  -->
-        <module name="DefaultComesLast" />
-        <module name="MissingCtor" />
-        <module name="FallThrough" />
-        <module name="MultipleStringLiterals">
-            <property
-                name="ignoreStringsRegexp"
-                value="^&quot;&quot;$|^&quot;.&quot;$"
-            />
-        </module>
-        <module name="MultipleVariableDeclarations" />
+        <module name="SimplifyBooleanExpression" />
+        <module name="SimplifyBooleanReturn" />
+        <module name="StringLiteralEquality" />
+        <module name="SuperClone" />
+        <module name="SuperFinalize" />
         <module name="UnnecessaryParentheses" />
-        <module name="OneStatementPerLine" />
+        <module name="VariableDeclarationUsageDistance">
+            <property name="allowedDistance" value="5" />
+        </module>
 
 
     <!-- Imports -->
 
         <module name="AvoidStarImport" />
         <module name="AvoidStaticImport" />
+        <module name="CustomImportOrder" />
         <module name="IllegalImport" />
+        <module name="ImportControl" />
+        <module name="ImportOrder" />
         <module name="RedundantImport" />
         <module name="UnusedImports" />
-        <module name="ImportOrder" />
-<!--    <module name="ImportControl" />  -->
 
 
     <!-- Javadoc Comments -->
 
-        <module name="JavadocType" />
+        <module name="AtclauseOrder" />
         <module name="JavadocMethod" />
-        <module name="JavadocVariable">
-            <property name="scope" value="protected" />
-        </module>
+        <module name="JavadocParagraph" />
         <module name="JavadocStyle">
             <property
                 name="endOfSentenceFormat"
@@ -201,7 +209,15 @@
             <property name="checkEmptyJavadoc" value="true" />
             <property name="checkHtml" value="true" />
         </module>
-<!--    <module name="WriteTag" />  -->
+        <module name="JavadocTagContinuationIndentation" />
+        <module name="JavadocType" />
+        <module name="JavadocVariable">
+            <property name="scope" value="protected" />
+        </module>
+        <module name="NonEmptyAtclauseDescription" />
+        <module name="SingleLineJavadoc" />
+        <module name="SummaryJavadocCheck" />
+        <module name="WriteTag" />
 
 
     <!-- Metrics -->
@@ -210,38 +226,33 @@
         <module name="ClassDataAbstractionCoupling" />
         <module name="ClassFanOutComplexity" />
         <module name="CyclomaticComplexity" />
-        <module name="NPathComplexity" />
         <module name="JavaNCSS" />
+        <module name="NPathComplexity" />
 
 
     <!-- Miscellaneous -->
 
-        <module name="TodoComment">
-            <property name="format" value="TODO" />
-        </module>
-        <module name="UncommentedMain" />
-        <module name="UpperEll" />
         <module name="ArrayTypeStyle" />
-<!--    <module name="FinalParameters" />  -->
-<!--    <module name="DescendantToken" />  -->
-<!--
+        <module name="AvoidEscapedUnicodeCharacters">
+            <property name="allowEscapesForControlCharacters" value="true"/>
+            <property name="allowByTailComment" value="true"/>
+            <property name="allowIfAllCharactersEscaped" value="true"/>
+            <property name="allowNonPrintableEscapes" value="true"/>
+        </module>
+<!--    <module name="CommentsIndentation" />  6.10 or later  -->
+        <module name="DescendantToken" />
+        <module name="FileContentsHolder" />
+        <module name="FinalParameters" />
         <module name="Indentation">
             <property name="caseIndent" value="0" />
         </module>
--->
-<!--    <module name="TrailingComment" />  -->
-        <module name="Regexp">
-            <property name="format" value="@author" />
-            <property name="illegalPattern" value="true" />
-        </module>
-        <module name="Regexp">
-            <property name="format" value="^ \* Copyright\(c\)" />
-        </module>
-        <module name="Regexp">
-            <property name="format" value="^ \* License : The MIT License" />
-            <property name="duplicateLimit" value="1" />
-        </module>
         <module name="OuterTypeFilename" />
+        <module name="TodoComment">
+            <property name="format" value="TODO" />
+        </module>
+        <module name="TrailingComment" />
+        <module name="UncommentedMain" />
+        <module name="UpperEll" />
 
 
     <!-- Modifiers -->
@@ -252,14 +263,17 @@
 
     <!-- Naming Conventions -->
 
+        <module name="AbbreviationAsWordInName" />
         <module name="AbstractClassName">
             <property
                 name="format"
                 value="^Abstract.*$|^.*Factory$|^.*Builder$|^.*Adapter$"
             />
         </module>
+<!--    <module name="CatchParameterName" />    6.14 or later -->
         <module name="ClassTypeParameterName" />
         <module name="ConstantName" />
+        <module name="InterfaceTypeParameterName" />
         <module name="LocalFinalVariableName">
             <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
         </module>
@@ -275,41 +289,77 @@
         <module name="ParameterName">
             <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
         </module>
-        <module name="StaticVariableName" />
+        <module name="StaticVariableName">
+            <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
+        </module>
         <module name="TypeName" />
 
 
+    <!-- Regex -->
+
+        <module name="Regexp">
+            <property name="format" value="@author" />
+            <property name="illegalPattern" value="true" />
+        </module>
+        <module name="Regexp">
+            <property name="format" value="^ \* Copyright\(c\)" />
+        </module>
+        <module name="Regexp">
+            <property name="format" value="^ \* License : The MIT License" />
+            <property name="duplicateLimit" value="1" />
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="\u0000" />
+        </module>
+
+
     <!-- Size Violations -->
 
+        <module name="AnonInnerLength" />
         <module name="ExecutableStatementCount" />
         <module name="LineLength">
             <property name="max" value="78" />
         </module>
+        <module name="MethodCount" />
         <module name="MethodLength" />
-        <module name="AnonInnerLength" />
-        <module name="ParameterNumber" />
         <module name="OuterTypeNumber" />
-        <module name="MethodCount" />
+        <module name="ParameterNumber" />
 
 
     <!-- Whitespace -->
 
-        <module name="GenericWhitespace" />
         <module name="EmptyForInitializerPad" />
         <module name="EmptyForIteratorPad" />
+        <module name="EmptyLineSeparator">
+            <property
+                name="tokens"
+                value="PACKAGE_DEF,
+                       IMPORT,
+                       CLASS_DEF,
+                       INTERFACE_DEF,
+                       ENUM_DEF,
+                       STATIC_INIT,
+                       INSTANCE_INIT,
+                       METHOD_DEF,
+                       CTOR_DEF,
+                       "
+            />
+        </module>
+        <module name="GenericWhitespace" />
         <module name="MethodParamPad">
             <property
                 name="tokens"
                 value="CTOR_DEF, LITERAL_NEW, METHOD_DEF, SUPER_CTOR_CALL"
             />
         </module>
+        <module name="NoLineWrap" />
         <module name="NoWhitespaceAfter">
             <property name="allowLineBreaks" value="false" />
-            <property name="tokens" value="DEC, DOT, INC" />
+            <property name="tokens" value="INC, DEC, DOT" />
         </module>
         <module name="NoWhitespaceBefore">
             <property name="allowLineBreaks" value="false" />
-            <property name="tokens" value="POST_DEC, POST_INC" />
+            <property name="tokens" value="COMMA, POST_INC, POST_DEC" />
         </module>
         <module name="NoWhitespaceBefore">
             <property name="allowLineBreaks" value="true" />
@@ -323,17 +373,18 @@
                        BAND_ASSIGN, BOR_ASSIGN, BXOR_ASSIGN,
                        PLUS_ASSIGN, MINUS_ASSIGN,
                        STAR_ASSIGN, DIV_ASSIGN, MOD_ASSIGN,
-                       SL_ASSIGN, SR_ASSIGN"
+                       SL_ASSIGN, SR_ASSIGN, BSR_ASSIGN"
             />
         </module>
         <module name="OperatorWrap">
             <property name="option" value="nl" />
             <property
                 name="tokens"
-                value="BAND, BOR, BXOR,
-                       MINUS, STAR, DIV, MOD,
+                value="QUESTION,
+                       BAND, BOR, BXOR,
+                       PLUS, MINUS, STAR, DIV, MOD,
                        LAND, LOR,
-                       EQUAL"
+                       EQUAL, NOT_EQUAL"
             />
         </module>
         <module name="ParenPad">
@@ -343,10 +394,12 @@
                 value="CTOR_CALL, METHOD_CALL, SUPER_CTOR_CALL"
             />
         </module>
-        <module name="TypecastParenPad" />
-        <module name="WhitespaceAfter">
-            <property name="tokens" value="COMMA, SEMI" />
+        <module name="SeparatorWrap">
+            <property name="tokens" value="DOT" />
+            <property name="option" value="nl" />
         </module>
+        <module name="TypecastParenPad" />
+        <module name="WhitespaceAfter" />
         <module name="WhitespaceAround">
             <property
                 name="tokens"
@@ -365,21 +418,6 @@
         </module>
 
 
-<!-- 代用品で解決
-        <module name="Header" />
-        <module name="RegexpSingleline" />
-        <module name="RegexpMultiline" />
-        <module name="RegexpSinglelineJava" />
--->
-
-<!-- バグ？
-        <module name="RequireThis" />
--->
-
-<!-- Obsolated
-        <module name="TabCharacter" />
--->
-
     </module>
 
 </module>

diff --git a/src/main/config/pmdrules.xml b/src/main/config/pmdrules.xml
index 65d196b..9c10f91 100644 (file)
--- a/src/main/config/pmdrules.xml
+++ b/src/main/config/pmdrules.xml
@@ -3,17 +3,16 @@
 <!--
     PMD用ルールセット定義
 
-    PMD [ http://pmd.sourceforge.net/ ] 4.2.5 以降用に記述されています。
+    PMD [ https://pmd.github.io/ ] 5.3 以降用に記述されています。
 
-    Copyright(c) 2010 olyutorskii
+    Copyright(c) 2016 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,77 +20,122 @@
         custom rulesets for project
     </description>
 
-    <rule ref="rulesets/basic.xml">
-        <exclude name="UnnecessaryReturn" />
-    </rule>
+<!--
+    <rule ref="rulesets/java/android.xml" />
+-->
 
-    <rule ref="rulesets/braces.xml">
+    <rule ref="rulesets/java/basic.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="CommentRequired" />
+        <exclude name="CommentSize" />
+    </rule>
+    <rule ref="rulesets/java/comments.xml/CommentRequired" >
+        <properties>
+            <property name="fieldCommentRequirement" value="Ignored"/>
+        </properties>
+    </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="LoosePackageCoupling" />
+        <exclude name="LawOfDemeter" />
+    </rule>
 
-    <rule ref="rulesets/design.xml">
+    <rule ref="rulesets/java/design.xml">
+        <exclude name="SimplifyBooleanReturns" />
         <exclude name="ConfusingTernary" />
         <exclude name="UnnecessaryLocalBeforeReturn" />
+        <exclude name="FieldDeclarationsShouldBeAtStartOfClass" />
     </rule>
 
-    <rule ref="rulesets/finalizers.xml" />
+    <rule ref="rulesets/java/empty.xml" />
 
-    <rule ref="rulesets/imports.xml" />
+    <rule ref="rulesets/java/finalizers.xml" />
 
-    <rule ref="rulesets/logging-java.xml" />
+    <rule ref="rulesets/java/imports.xml" />
 
-    <rule ref="rulesets/migrating.xml" />
-    <rule ref="rulesets/migrating_to_15.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/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>
 

diff --git a/src/main/config/suppressions.xml b/src/main/config/suppressions.xml
index 728df15..f1500fa 100644 (file)
--- a/src/main/config/suppressions.xml
+++ b/src/main/config/suppressions.xml
@@ -16,20 +16,26 @@
 
 <suppressions>
 
-<!--
-    <suppress files="" checks="ExecutableStatementCount" />
-
-    <suppress files="" checks="ClassDataAbstractionCoupling" />
-    <suppress files="" checks="ClassFanOutComplexity" />
-    <suppress files="" checks="CyclomaticComplexity" />
-    <suppress files="" checks="NPathComplexity" />
-    <suppress files="" checks="JavaNCSS" />
--->
+    <!-- Class Design -->
+    <suppress files="" checks="DesignForExtension" />
 
-<!--
+    <!-- Coding -->
+    <suppress files="" checks="ExplicitInitialization" />
+    <suppress files="" checks="FinalLocalVariable" />
     <suppress files="" checks="MagicNumber" />
-    <suppress files="" checks="MultipleStringLiterals" />
--->
+
+    <!-- Imports -->
+    <suppress files="" checks="ImportControl" />
+
+    <!-- Javadoc Comments -->
+    <suppress files="" checks="SummaryJavadocCheck" />
+        <!-- 句読点対応待ち -->
+    <suppress files="" checks="SingleLineJavadoc" />
+        <!-- ignoredTagsプロパティ対応待ち -->
+
+    <!-- Miscellaneous -->
+    <suppress files="" checks="FinalParameters" />
+    <suppress files="" checks="TrailingComment" />
 
 </suppressions>
 

diff --git a/src/main/java/jp/sourceforge/jovsonz/JsNumber.java b/src/main/java/jp/sourceforge/jovsonz/JsNumber.java
index 8185715..0dec2d1 100644 (file)
--- a/src/main/java/jp/sourceforge/jovsonz/JsNumber.java
+++ b/src/main/java/jp/sourceforge/jovsonz/JsNumber.java
@@ -397,7 +397,7 @@ public class JsNumber
      * スケール値を返す。
      * このインスタンスが整数文字列表記に由来する場合、
      * スケール値は0になるはず。
-     * <p>
+     * 
      * <ul>
      * <li>"99"のスケール値は0
      * <li>"99.0"のスケール値は1
@@ -405,7 +405,7 @@ public class JsNumber
      * <li>"99E+3"のスケール値は-3
      * <li>"99.0E+3"のスケール値は-2
      * </ul>
-     * </p>
+     * 
      * @return スケール値
      * @see java.math.BigDecimal#scale()
      */

diff --git a/src/main/java/jp/sourceforge/jovsonz/JsPair.java b/src/main/java/jp/sourceforge/jovsonz/JsPair.java
index 4e4f5d6..faf856f 100644 (file)
--- a/src/main/java/jp/sourceforge/jovsonz/JsPair.java
+++ b/src/main/java/jp/sourceforge/jovsonz/JsPair.java
@@ -12,16 +12,14 @@ import java.io.IOException;
 /**
  * OBJECT型Value内に列挙される、名前の付いたValueとの組(PAIR)。
  * PAIRはValueではない。
- * <p>
- * <code>
+ * 
  * <pre>
  * {
  *     "PairName1" : 99.9 ,
  *     "PairName2" : "textValue"
  * }
  * </pre>
- * </code>
- * </p>
+ * 
  */
 public class JsPair {
 

diff --git a/src/main/java/jp/sourceforge/jovsonz/UnmodIterator.java b/src/main/java/jp/sourceforge/jovsonz/UnmodIterator.java
index db27e1c..1786e34 100644 (file)
--- a/src/main/java/jp/sourceforge/jovsonz/UnmodIterator.java
+++ b/src/main/java/jp/sourceforge/jovsonz/UnmodIterator.java
@@ -102,7 +102,7 @@ public class UnmodIterator<E> implements Iterator<E> {
     /**
      * {@inheritDoc}
      * 必ず失敗し例外を投げる。
-     * @throws UnsupportedOperationException
+     * @throws UnsupportedOperationException {@inheritDoc}
      */
     @Override
     public void remove() throws UnsupportedOperationException{