OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Jindolf: Commit

Jindolfプロジェクトは、CGIゲーム「人狼BBS」を快適にプレイするための専用クライアントを製作するために発足したオープンソースプロジェクトです。


Commit MetaInfo

Revision4930c39b2ba13bafd6c0124ac2018f9626c58e3c (tree)
Time2021-09-18 10:33:34
AuthorOlyutorskii <olyutorskii@user...>
CommiterOlyutorskii

Log Message

Merge branch 'pomconfig' into develop

Change Summary

Incremental Difference

--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -6,7 +6,7 @@
66
77 <!--
88 Checkstyle modules
9- for Checkstyle 8.36 or later
9+ for Checkstyle 8.45 or later
1010
1111 [ https://checkstyle.org/ ]
1212
@@ -81,7 +81,7 @@
8181 <module name="FileLength" />
8282 <module name="LineLength">
8383 <property name="fileExtensions" value="java" />
84- <property name="max" value="78" />
84+ <property name="max" value="100" />
8585 </module>
8686
8787
@@ -179,6 +179,7 @@
179179 <module name="IllegalType" />
180180 <module name="InnerAssignment" />
181181 <module name="MagicNumber" />
182+ <module name="MatchXpath" />
182183 <module name="MissingCtor" />
183184 <module name="MissingSwitchDefault" />
184185 <module name="ModifiedControlVariable" />
@@ -235,6 +236,7 @@
235236 <module name="JavadocBlockTagLocation" />
236237 <module name="JavadocContentLocationCheck" />
237238 <module name="JavadocMethod" />
239+ <module name="JavadocMissingLeadingAsterisk" />
238240 <module name="JavadocMissingWhitespaceAfterAsterisk" />
239241 <module name="JavadocParagraph" />
240242 <module name="JavadocStyle">
@@ -319,6 +321,7 @@
319321 <module name="PackageName" />
320322 <module name="ParameterName" />
321323 <module name="PatternVariableName" />
324+ <module name="RecordComponentName" />
322325 <module name="RecordTypeParameterName" />
323326 <module name="StaticVariableName" />
324327 <module name="TypeName" />
@@ -346,6 +349,7 @@
346349
347350 <module name="AnonInnerLength" />
348351 <module name="ExecutableStatementCount" />
352+ <module name="LambdaBodyLength" />
349353 <module name="MethodCount" />
350354 <module name="MethodLength" />
351355 <module name="OuterTypeNumber" />
@@ -358,19 +362,7 @@
358362 <module name="EmptyForInitializerPad" />
359363 <module name="EmptyForIteratorPad" />
360364 <module name="EmptyLineSeparator">
361- <property
362- name="tokens"
363- value="PACKAGE_DEF,
364- IMPORT,
365- CLASS_DEF,
366- INTERFACE_DEF,
367- ENUM_DEF,
368- STATIC_INIT,
369- INSTANCE_INIT,
370- METHOD_DEF,
371- CTOR_DEF,
372- "
373- />
365+ <property name="allowNoEmptyLineBetweenFields" value="true" />
374366 </module>
375367 <module name="GenericWhitespace" />
376368 <module name="MethodParamPad">
@@ -388,6 +380,7 @@
388380 <property name="allowLineBreaks" value="false" />
389381 <property name="tokens" value="COMMA, POST_INC, POST_DEC" />
390382 </module>
383+ <module name="NoWhitespaceBeforeCaseDefaultColon" />
391384 <module name="OperatorWrap" />
392385 <module name="ParenPad">
393386 <property name="option" value="nospace" />
--- a/config/pmd/pmdrules.xml
+++ b/config/pmd/pmdrules.xml
@@ -2,7 +2,7 @@
22
33 <!--
44 Custom rule set
5- for PMD [ https://pmd.github.io/ ] 6.21.0 or later
5+ for PMD [ https://pmd.github.io/ ] 6.28.0 or later
66
77 Copyright(c) 2019 olyutorskii
88 -->
@@ -23,9 +23,6 @@
2323
2424 <rule ref="category/java/codestyle.xml" >
2525 <exclude name="CommentDefaultAccessModifier" />
26- <exclude name="DefaultPackage" />
27- <exclude name="IfElseStmtsMustUseBraces" />
28- <exclude name="IfStmtsMustUseBraces" />
2926 <exclude name="LocalVariableCouldBeFinal" />
3027 <exclude name="MethodArgumentCouldBeFinal" />
3128 <exclude name="OnlyOneReturn" />
@@ -40,23 +37,12 @@
4037 <property name="checkSingleIfStmt" value="false"/>
4138 </properties>
4239 </rule>
43- <rule ref="category/java/codestyle.xml/ShortVariable" >
44- <properties>
45- <property name="minimum" value="2"/>
46- </properties>
47- </rule>
4840
4941 <rule ref="category/java/design.xml" >
50- <exclude name="AvoidThrowingNullPointerException" />
5142 <exclude name="AvoidUncheckedExceptionsInSignatures" />
5243 <exclude name="LawOfDemeter" />
5344 <exclude name="LoosePackageCoupling" />
5445 </rule>
55- <rule ref="category/java/design.xml/NcssCount" >
56- <properties>
57- <property name="methodReportLevel" value="50"/>
58- </properties>
59- </rule>
6046
6147 <rule ref="category/java/documentation.xml" />
6248 <rule ref="category/java/documentation.xml/CommentRequired" >
@@ -67,13 +53,13 @@
6753 <rule ref="category/java/documentation.xml/CommentSize" >
6854 <properties>
6955 <property name="maxLines" value="25"/>
56+ <property name="maxLineLength" value="100"/>
7057 </properties>
7158 </rule>
7259
7360 <rule ref="category/java/errorprone.xml" >
7461 <exclude name="AvoidLiteralsInIfCondition" />
7562 <exclude name="BeanMembersShouldSerialize" />
76- <exclude name="DataflowAnomalyAnalysis" />
7763 </rule>
7864
7965 <rule ref="category/java/multithreading.xml" />
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
114114 <dependency>
115115 <groupId>junit</groupId>
116116 <artifactId>junit</artifactId>
117- <version>4.13</version>
117+ <version>4.13.2</version>
118118 <scope>test</scope>
119119 </dependency>
120120
@@ -159,7 +159,7 @@
159159 <plugin>
160160 <groupId>org.apache.maven.plugins</groupId>
161161 <artifactId>maven-enforcer-plugin</artifactId>
162- <version>3.0.0-M3</version>
162+ <version>3.0.0</version>
163163 </plugin>
164164
165165 <plugin>
@@ -189,7 +189,7 @@
189189 <plugin>
190190 <groupId>org.jacoco</groupId>
191191 <artifactId>jacoco-maven-plugin</artifactId>
192- <version>0.8.6</version>
192+ <version>0.8.7</version>
193193 </plugin>
194194
195195 <plugin>
@@ -237,7 +237,7 @@
237237 <plugin>
238238 <groupId>org.apache.maven.plugins</groupId>
239239 <artifactId>maven-project-info-reports-plugin</artifactId>
240- <version>3.1.1</version>
240+ <version>3.1.2</version>
241241 </plugin>
242242
243243 <plugin>
@@ -249,18 +249,18 @@
249249 <plugin>
250250 <groupId>org.apache.maven.plugins</groupId>
251251 <artifactId>maven-jxr-plugin</artifactId>
252- <version>3.0.0</version>
252+ <version>3.1.1</version>
253253 </plugin>
254254
255255 <plugin>
256256 <groupId>org.apache.maven.plugins</groupId>
257257 <artifactId>maven-checkstyle-plugin</artifactId>
258- <version>3.1.1</version>
258+ <version>3.1.2</version>
259259 <dependencies>
260260 <dependency>
261261 <groupId>com.puppycrawl.tools</groupId>
262262 <artifactId>checkstyle</artifactId>
263- <version>8.36.2</version>
263+ <version>9.0</version>
264264 </dependency>
265265 </dependencies>
266266 </plugin>
@@ -268,18 +268,30 @@
268268 <plugin>
269269 <groupId>org.apache.maven.plugins</groupId>
270270 <artifactId>maven-pmd-plugin</artifactId>
271- <version>3.13.0</version>
271+ <version>3.15.0</version>
272+ <dependencies>
273+ <dependency>
274+ <groupId>net.sourceforge.pmd</groupId>
275+ <artifactId>pmd-core</artifactId>
276+ <version>6.38.0</version>
277+ </dependency>
278+ <dependency>
279+ <groupId>net.sourceforge.pmd</groupId>
280+ <artifactId>pmd-java</artifactId>
281+ <version>6.38.0</version>
282+ </dependency>
283+ </dependencies>
272284 </plugin>
273285
274286 <plugin>
275287 <groupId>com.github.spotbugs</groupId>
276288 <artifactId>spotbugs-maven-plugin</artifactId>
277- <version>4.1.3</version>
289+ <version>4.3.0</version>
278290 <dependencies>
279291 <dependency>
280292 <groupId>com.github.spotbugs</groupId>
281293 <artifactId>spotbugs</artifactId>
282- <version>4.1.3</version>
294+ <version>4.4.1</version>
283295 </dependency>
284296 </dependencies>
285297 </plugin>
Show on old repository browser