OSDN Git Service

Merge branch 'pomconfig' into develop
authorOlyutorskii <olyutorskii@users.osdn.me>
Sat, 18 Sep 2021 01:33:34 +0000 (10:33 +0900)
committerOlyutorskii <olyutorskii@users.osdn.me>
Sat, 18 Sep 2021 01:33:34 +0000 (10:33 +0900)
config/checkstyle/checkstyle.xml
config/pmd/pmdrules.xml
pom.xml

index 896d73d..211f5c9 100644 (file)
@@ -6,7 +6,7 @@
 
 <!--
     Checkstyle modules
-    for Checkstyle 8.36 or later
+    for Checkstyle 8.45 or later
 
     [ https://checkstyle.org/ ]
 
@@ -81,7 +81,7 @@
     <module name="FileLength" />
     <module name="LineLength">
         <property name="fileExtensions" value="java" />
-        <property name="max" value="78" />
+        <property name="max" value="100" />
     </module>
 
 
         <module name="IllegalType" />
         <module name="InnerAssignment" />
         <module name="MagicNumber" />
+        <module name="MatchXpath" />
         <module name="MissingCtor" />
         <module name="MissingSwitchDefault" />
         <module name="ModifiedControlVariable" />
         <module name="JavadocBlockTagLocation" />
         <module name="JavadocContentLocationCheck" />
         <module name="JavadocMethod" />
+        <module name="JavadocMissingLeadingAsterisk" />
         <module name="JavadocMissingWhitespaceAfterAsterisk" />
         <module name="JavadocParagraph" />
         <module name="JavadocStyle">
         <module name="PackageName" />
         <module name="ParameterName" />
         <module name="PatternVariableName" />
+        <module name="RecordComponentName" />
         <module name="RecordTypeParameterName" />
         <module name="StaticVariableName" />
         <module name="TypeName" />
 
         <module name="AnonInnerLength" />
         <module name="ExecutableStatementCount" />
+        <module name="LambdaBodyLength" />
         <module name="MethodCount" />
         <module name="MethodLength" />
         <module name="OuterTypeNumber" />
         <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,
-                       "
-            />
+            <property name="allowNoEmptyLineBetweenFields" value="true" />
         </module>
         <module name="GenericWhitespace" />
         <module name="MethodParamPad">
             <property name="allowLineBreaks" value="false" />
             <property name="tokens" value="COMMA, POST_INC, POST_DEC" />
         </module>
+        <module name="NoWhitespaceBeforeCaseDefaultColon" />
         <module name="OperatorWrap" />
         <module name="ParenPad">
             <property name="option" value="nospace" />
index ecf9fa0..a82c723 100644 (file)
@@ -2,7 +2,7 @@
 
 <!--
     Custom rule set
-    for PMD [ https://pmd.github.io/ ] 6.21.0 or later
+    for PMD [ https://pmd.github.io/ ] 6.28.0 or later
 
     Copyright(c) 2019 olyutorskii
 -->
@@ -23,9 +23,6 @@
 
     <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" />
             <property name="checkSingleIfStmt" value="false"/>
         </properties>
     </rule>
-    <rule ref="category/java/codestyle.xml/ShortVariable" >
-        <properties>
-            <property name="minimum" value="2"/>
-        </properties>
-    </rule>
 
     <rule ref="category/java/design.xml" >
-        <exclude name="AvoidThrowingNullPointerException" />
         <exclude name="AvoidUncheckedExceptionsInSignatures" />
         <exclude name="LawOfDemeter" />
         <exclude name="LoosePackageCoupling" />
     </rule>
-    <rule ref="category/java/design.xml/NcssCount" >
-        <properties>
-            <property name="methodReportLevel" value="50"/>
-        </properties>
-    </rule>
 
     <rule ref="category/java/documentation.xml" />
     <rule ref="category/java/documentation.xml/CommentRequired" >
     <rule ref="category/java/documentation.xml/CommentSize" >
         <properties>
             <property name="maxLines" value="25"/>
+            <property name="maxLineLength" value="100"/>
         </properties>
     </rule>
 
     <rule ref="category/java/errorprone.xml" >
         <exclude name="AvoidLiteralsInIfCondition" />
         <exclude name="BeanMembersShouldSerialize" />
-        <exclude name="DataflowAnomalyAnalysis" />
     </rule>
 
     <rule ref="category/java/multithreading.xml" />
diff --git a/pom.xml b/pom.xml
index 489538c..0a4c63f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.0.0-M3</version>
+                    <version>3.0.0</version>
                 </plugin>
 
                 <plugin>
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.6</version>
+                    <version>0.8.7</version>
                 </plugin>
 
                 <plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-project-info-reports-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.1.2</version>
                 </plugin>
 
                 <plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jxr-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.1.1</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.1.2</version>
                     <dependencies>
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>8.36.2</version>
+                            <version>9.0</version>
                         </dependency>
                     </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
-                    <version>3.13.0</version>
+                    <version>3.15.0</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>net.sourceforge.pmd</groupId>
+                            <artifactId>pmd-core</artifactId>
+                            <version>6.38.0</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>net.sourceforge.pmd</groupId>
+                            <artifactId>pmd-java</artifactId>
+                            <version>6.38.0</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
 
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>
                     <artifactId>spotbugs-maven-plugin</artifactId>
-                    <version>4.1.3</version>
+                    <version>4.3.0</version>
                     <dependencies>
                         <dependency>
                             <groupId>com.github.spotbugs</groupId>
                             <artifactId>spotbugs</artifactId>
-                            <version>4.1.3</version>
+                            <version>4.4.1</version>
                         </dependency>
                     </dependencies>
                 </plugin>