• R/O
  • HTTP
  • SSH
  • HTTPS

Pmd2XML: コミット

Pmd2XMLは、3D動画制作ツール、MikuMikuDance(MMD)で用いられるモデルデータファイル(*.pmd)の内容を、XML形式のデータファイルと交換するためのアプリケーションです。


コミットメタ情報

リビジョンa1cb138cfa1a2c2d84c3971d2660575ca5eb7291 (tree)
日時2019-06-06 13:58:50
作者Olyutorskii <olyutorskii@user...>
コミッターOlyutorskii

ログメッセージ

Merge release/v1.202.2

変更サマリ

差分

--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,9 +4,12 @@
44 Pmd2XML 変更履歴
55
66
7-X.XXX.X (20XX-XX-XX)
7+1.202.2 (2019-06-06)
8+ ・必須環境をJavaSE8に引き上げ。
89 ・デフォルトロケールによる出力揺らぎを解消。
910 ・プロセス終了コードの変更。
11+ ・Mercurial(1.201.5-SNAPSHOT)からGit(1.201.105-SNAPSHOT)へSCMを移行。
12+ ・JAXBへの依存を解消。
1013
1114 1.201.2B (2013-09-01)
1215 ・1.201.2版リリース配布物にビルド設定が含まれていなかった件に対処。
--- a/README.txt
+++ b/README.txt
@@ -25,14 +25,14 @@ Pmd2XMLは、同じMikuTogaプロジェクト内のTogaGemライブラリを用
2525
2626 === 実行環境 ===
2727
28- - Pmd2XMLはJava言語(JLS3)で記述されたプログラムです。
29- - Pmd2XMLはJRE1.6に準拠したJava実行環境で利用できるように作られています。
30- 原則として、JRE1.6に準拠した実行系であれば、プラットフォームを選びません。
28+ - Pmd2XMLはJava言語(JavaSE8)で記述されたプログラムです。
29+ - Pmd2XMLはJavaSE8に準拠したJava実行環境で利用できるように作られています。
30+ 原則として、JavaSE8に準拠した実行系であれば、プラットフォームを選びません。
3131
3232
3333 === 開発プロジェクト運営元 ===
3434
35- http://sourceforge.jp/projects/mikutoga/ まで。
35+ https://ja.osdn.net/projects/mikutoga/ まで。
3636
3737
3838 === ディレクトリ内訳構成 ===
@@ -48,9 +48,6 @@ Pmd2XMLは、同じMikuTogaプロジェクト内のTogaGemライブラリを用
4848 ./LICENSE.txt
4949 ライセンスに関して。
5050
51-./SCM.txt
52- ソースコード管理に関して。
53-
5451 ./pom.xml
5552 Maven3用プロジェクト構成定義ファイル。
5653
--- a/SCM.txt
+++ /dev/null
@@ -1,48 +0,0 @@
1-[UTF-8 Japanese]
2-
3- P m d 2 X M L
4- バージョン管理システムに関する情報
5-
6- Copyright(c) 2011 olyutorskii
7-
8-
9-=== バージョン管理体制 ===
10-
11- このアーカイブの原本は、Mercurial(hg)でバージョン管理されています。
12- このアーカイブの原本となる開発資産は、
13- http://hg.sourceforge.jp/view/mikutoga/Pmd2XML
14- を上位に持つMercurialリポジトリで管理されています。
15- アーカイブの代わりにMercurialを通じての開発資産へのアクセスが可能です。
16- # hg clone http://hg.sourceforge.jp/view/mikutoga/Pmd2XML
17-
18-
19-=== 各種設定ファイル ===
20-
21-./.hgignore
22-
23-Mercurial 管理の対象外にさせたいファイル群の設定です。
24-IDE独自の設定ファイルは基本的に管理対象外とするつもりです。
25-
26-
27-./.hgeol
28-
29-Mercurial の EOL Extension 用の設定です。
30-非バイナリなテキストファイルの改行コードに関する設定です。
31-・拡張子が *.txt なローカルファイルの改行文字はローカルの環境に合わせる。
32-・拡張子が *.java なローカルファイルの改行文字はローカルの環境に合わせる。
33-・それ以外の非バイナリなローカルファイルの改行文字は基本LFで統一。
34-・リポジトリ上の全ての非バイナリファイルの改行文字は基本LFで統一。
35-というポリシーで運用しています。
36-EOL Extensionを有効にしないと設定が反映されません。
37-
38-
39-=== リンク ===
40-
41-・http://mercurial.selenic.com/
42-・http://mercurial.selenic.com/wiki/.hgignore
43-・http://www.selenic.com/mercurial/hgignore.5.html
44-・http://mercurial.selenic.com/wiki/EolExtension
45-・http://tortoisehg.bitbucket.org/
46-
47-
48---- EOF ---
--- /dev/null
+++ b/config/checkstyle/checkstyle-suppressions.xml
@@ -0,0 +1,51 @@
1+<?xml version="1.0" encoding="UTF-8" ?>
2+
3+<!DOCTYPE suppressions PUBLIC
4+ "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
5+ "https://checkstyle.org/dtds/suppressions_1_2.dtd">
6+
7+<!--
8+ Checkstyle suppressions
9+ for Checkstyle 8.20 or later
10+
11+ [ https://checkstyle.org/ ]
12+
13+ Copyright(c) 2019 olyutorskii
14+-->
15+
16+
17+<suppressions>
18+
19+ <!-- Annotations -->
20+ <suppress files="" checks="AnnotationOnSameLine" />
21+
22+ <!-- Class Design -->
23+ <suppress files="" checks="DesignForExtension" />
24+
25+ <!-- Coding -->
26+ <suppress files="" checks="ExplicitInitialization" />
27+ <suppress files="" checks="FinalLocalVariable" />
28+ <suppress files="" checks="MagicNumber" />
29+
30+ <!-- Imports -->
31+ <suppress files="" checks="ImportControl" />
32+
33+ <!-- Javadoc Comments -->
34+ <suppress files="" checks="JavadocParagraph" />
35+ <suppress files="" checks="JavadocTagContinuationIndentation" />
36+ <suppress files="" checks="SummaryJavadocCheck" />
37+
38+ <!-- Miscellaneous -->
39+ <suppress files="" checks="FinalParameters" />
40+ <suppress files="" checks="TrailingComment" />
41+
42+ <!-- Modifier -->
43+ <suppress files="" checks="InterfaceMemberImpliedModifier" />
44+
45+ <!-- Whitespace -->
46+ <suppress files="" checks="SingleSpaceSeparator" />
47+
48+</suppressions>
49+
50+
51+<!-- EOF -->
--- a/src/main/config/checks.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -1,17 +1,16 @@
11 <?xml version="1.0" encoding="UTF-8" ?>
22
33 <!DOCTYPE module PUBLIC
4- "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
5- "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
4+ "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
5+ "https://checkstyle.org/dtds/configuration_1_3.dtd">
66
77 <!--
8- Checkstyle用チェック項目定義。
8+ Checkstyle modules
9+ for Checkstyle 8.21 or later
910
10- Checkstyle 5.5 以降向けに記述。
11+ [ https://checkstyle.org/ ]
1112
12- [ http://checkstyle.sourceforge.net/ ]
13-
14- Copyright(c) 2010 olyutorskii
13+ Copyright(c) 2019 olyutorskii
1514 -->
1615
1716
@@ -19,26 +18,26 @@
1918
2019 <property name="charset" value="UTF-8" />
2120 <property name="localeCountry" value="JP" />
22- <property name="localeLanguage" value="ja" />
21+ <property name="localeLanguage" value="en" />
22+ <!--property name="localeLanguage" value="ja" /-->
23+ <property name="fileExtensions" value="java, properties, xml, xsd, md, txt" />
2324 <property name="severity" value="error" />
2425
2526
2627 <!-- Filters -->
27- <module name="SeverityMatchFilter" />
28- <module name="SuppressionFilter">
29- <property name="file" value="src/main/config/suppressions.xml" />
30- </module>
31- <module name="SuppressionCommentFilter" />
32- <module name="SuppressWithNearbyCommentFilter" />
3328
34-
35- <!-- Duplicate Code -->
36- <module name="StrictDuplicateCode">
37- <property name="min" value="20" />
38- </module>
29+ <module name="SeverityMatchFilter" />
30+ <!--module name="SuppressionFilter" /-->
31+ <module name="SuppressWarningsFilter" />
32+ <module name="SuppressWithPlainTextCommentFilter" />
3933
4034
4135 <!-- Headers -->
36+
37+ <module name="Header">
38+ <property name="header" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; ?&gt;" />
39+ <property name="fileExtensions" value="xml" />
40+ </module>
4241 <module name="RegexpHeader">
4342 <property name="header" value="^/\*$\n^ \*( .*)?$\n^ \*/$\n" />
4443 <property name="multiLines" value="2" />
@@ -47,69 +46,100 @@
4746
4847
4948 <!-- Javadoc Comments -->
49+
5050 <module name="JavadocPackage" />
5151
5252
5353 <!-- Miscellaneous -->
54+
5455 <module name="NewlineAtEndOfFile">
55- <property name="fileExtensions" value="java" />
56+ <property name="fileExtensions" value="java, properties, xml, xsd, md, txt" />
5657 </module>
5758 <module name="Translation" />
59+ <module name="UniqueProperties" />
5860
5961
6062 <!-- Regexp -->
63+
64+ <module name="RegexpMultiline">
65+ <property name="format" value="[\u000b\f\u001a]" />
66+ </module>
67+ <module name="RegexpOnFilename" />
6168 <module name="RegexpSingleline">
6269 <property name="format" value="\s+$" />
63- <property name="minimum" value="0" />
64- <property name="maximum" value="0" />
70+ </module>
71+ <module name="RegexpSingleline">
72+ <!-- scm conflict -->
73+ <property name="format" value="&lt;&lt;&lt;&lt;&lt;" />
6574 </module>
6675
6776
6877 <!-- Size Violations -->
78+
6979 <module name="FileLength" />
7080
7181
7282 <!-- Whitespace -->
83+
7384 <module name="FileTabCharacter" />
7485
7586
87+ <module name="BeforeExecutionExclusionFileFilter">
88+ <property name="fileNamePattern" value="module\-info\.java$" />
89+ </module>
90+
91+
7692 <module name="TreeWalker">
7793
78- <module name="FileContentsHolder" />
94+ <property name="tabWidth" value="8" />
95+ <property name="fileExtensions" value="java" />
96+
97+ <module name="SuppressWarningsHolder" />
98+
99+
100+ <!-- Filters -->
101+
102+ <module name="SuppressionCommentFilter" />
103+ <module name="SuppressWithNearbyCommentFilter" />
104+ <!--module name="SuppressionXpathFilter" /-->
105+ <!--module name="SuppressionXpathSingleFilter" /-->
79106
80107
81108 <!-- Annotations -->
82109
110+ <module name="AnnotationLocation" />
111+ <module name="AnnotationOnSameLine" />
83112 <module name="AnnotationUseStyle" />
84113 <module name="MissingDeprecated" />
85114 <module name="MissingOverride" />
86115 <module name="PackageAnnotation" />
87116 <module name="SuppressWarnings" />
117+ <module name="SuppressWarningsHolder" />
88118
89119
90120 <!-- Block Checks -->
91121
122+ <module name="AvoidNestedBlocks" />
92123 <module name="EmptyBlock" />
124+ <module name="EmptyCatchBlock" />
93125 <module name="LeftCurly" />
94126 <module name="NeedBraces">
95- <property name="tokens" value="LITERAL_DO" />
127+ <property name="allowSingleLineStatement" value="true" />
96128 </module>
97129 <module name="RightCurly" />
98- <module name="AvoidNestedBlocks" />
99130
100131
101132 <!-- Class Design -->
102133
103- <module name="VisibilityModifier" />
134+ <module name="DesignForExtension" />
104135 <module name="FinalClass" />
105- <module name="InterfaceIsType" />
106136 <module name="HideUtilityClassConstructor" />
107-<!-- <module name="DesignForExtension" /> -->
108- <module name="MutableException" />
109- <module name="ThrowsCount">
110- <property name="max" value="4" />
111- </module>
112137 <module name="InnerTypeLast" />
138+ <module name="InterfaceIsType" />
139+ <module name="MutableException" />
140+ <module name="OneTopLevelClass" />
141+ <module name="ThrowsCount" />
142+ <module name="VisibilityModifier" />
113143
114144
115145 <!-- Coding -->
@@ -117,84 +147,76 @@
117147 <module name="ArrayTrailingComma" />
118148 <module name="AvoidInlineConditionals" />
119149 <module name="CovariantEquals" />
120-<!-- <module name="DoubleCheckedLocking" /> 5.6 obsolete -->
150+ <module name="DeclarationOrder" />
151+ <module name="DefaultComesLast" />
121152 <module name="EmptyStatement" />
122153 <module name="EqualsAvoidNull" />
123154 <module name="EqualsHashCode" />
124-<!-- <module name="FinalLocalVariable" /> -->
155+ <module name="ExplicitInitialization" />
156+ <module name="FallThrough" />
157+ <module name="FinalLocalVariable" />
125158 <module name="HiddenField">
126159 <property name="ignoreConstructorParameter" value="true" />
127160 <property name="ignoreSetter" value="true" />
161+ <property name="setterCanReturnItsClass" value="true" />
128162 <property name="ignoreAbstractMethods" value="true" />
129163 </module>
164+ <module name="IllegalCatch" />
130165 <module name="IllegalInstantiation" />
166+ <module name="IllegalThrows" />
131167 <module name="IllegalToken">
132- <property name="tokens" value="LITERAL_NATIVE, STATIC_IMPORT" />
133- </module>
134- <module name="IllegalTokenText">
135- <property name="tokens" value="NUM_INT, NUM_LONG" />
136- <property name="format" value="^0[^lx]" />
137- <property name="ignoreCase" value="true" />
168+ <property name="tokens" value="LITERAL_NATIVE" />
138169 </module>
170+ <module name="IllegalTokenText" />
171+ <module name="IllegalType" />
139172 <module name="InnerAssignment" />
140173 <module name="MagicNumber" />
174+ <module name="MissingCtor" />
141175 <module name="MissingSwitchDefault" />
142176 <module name="ModifiedControlVariable" />
143- <module name="RedundantThrows">
144- <property name="allowUnchecked" value="true" />
145- <property name="allowSubclasses" value="true" />
146- </module>
147- <module name="SimplifyBooleanExpression" />
148- <module name="SimplifyBooleanReturn" />
149- <module name="StringLiteralEquality" />
177+ <module name="MultipleStringLiterals" />
178+ <module name="MultipleVariableDeclarations" />
150179 <module name="NestedForDepth" />
151180 <module name="NestedIfDepth" />
152181 <module name="NestedTryDepth" />
153182 <module name="NoClone" />
154183 <module name="NoFinalizer" />
155- <module name="SuperClone" />
156- <module name="SuperFinalize" />
157- <module name="IllegalCatch" />
158- <module name="IllegalThrows" />
184+ <module name="OneStatementPerLine" />
185+ <module name="OverloadMethodsDeclarationOrder" />
159186 <module name="PackageDeclaration" />
160- <module name="JUnitTestCase" />
161- <module name="ReturnCount">
162- <property name="max" value="5" />
163- </module>
164- <module name="IllegalType" />
165- <module name="DeclarationOrder" />
166187 <module name="ParameterAssignment" />
167-<!-- <module name="ExplicitInitialization" /> -->
168- <module name="DefaultComesLast" />
169- <module name="MissingCtor" />
170- <module name="FallThrough" />
171- <module name="MultipleStringLiterals" />
172- <module name="MultipleVariableDeclarations" />
173188 <module name="RequireThis">
174189 <property name="checkMethods" value="false" />
175190 </module>
191+ <module name="ReturnCount" />
192+ <module name="SimplifyBooleanExpression" />
193+ <module name="SimplifyBooleanReturn" />
194+ <module name="StringLiteralEquality" />
195+ <module name="SuperClone" />
196+ <module name="SuperFinalize" />
176197 <module name="UnnecessaryParentheses" />
177- <module name="OneStatementPerLine" />
198+ <module name="VariableDeclarationUsageDistance">
199+ <property name="allowedDistance" value="5"/>
200+ </module>
178201
179202
180203 <!-- Imports -->
181204
182205 <module name="AvoidStarImport" />
183206 <module name="AvoidStaticImport" />
207+ <module name="CustomImportOrder" />
184208 <module name="IllegalImport" />
209+ <!--module name="ImportControl" /-->
210+ <module name="ImportOrder" />
185211 <module name="RedundantImport" />
186212 <module name="UnusedImports" />
187- <module name="ImportOrder" />
188-<!-- <module name="ImportControl" /> -->
189213
190214
191215 <!-- Javadoc Comments -->
192216
193- <module name="JavadocType" />
217+ <module name="AtclauseOrder" />
194218 <module name="JavadocMethod" />
195- <module name="JavadocVariable">
196- <property name="scope" value="protected" />
197- </module>
219+ <module name="JavadocParagraph" />
198220 <module name="JavadocStyle">
199221 <property
200222 name="endOfSentenceFormat"
@@ -202,7 +224,17 @@
202224 <property name="checkEmptyJavadoc" value="true" />
203225 <property name="checkHtml" value="true" />
204226 </module>
205-<!-- <module name="WriteTag" /> -->
227+ <module name="JavadocTagContinuationIndentation" />
228+ <module name="JavadocType" />
229+ <module name="JavadocVariable">
230+ <property name="scope" value="protected" />
231+ </module>
232+ <module name="MissingJavadocMethod" />
233+ <module name="MissingJavadocType" />
234+ <module name="NonEmptyAtclauseDescription" />
235+ <module name="SingleLineJavadoc" />
236+ <module name="SummaryJavadocCheck" />
237+ <module name="WriteTag" />
206238
207239
208240 <!-- Metrics -->
@@ -211,134 +243,118 @@
211243 <module name="ClassDataAbstractionCoupling" />
212244 <module name="ClassFanOutComplexity" />
213245 <module name="CyclomaticComplexity" />
214- <module name="NPathComplexity" />
215246 <module name="JavaNCSS" />
247+ <module name="NPathComplexity" />
216248
217249
218250 <!-- Miscellaneous -->
219251
220- <module name="TodoComment">
221- <property name="format" value="TODO" />
222- </module>
223- <module name="UncommentedMain" />
224- <module name="UpperEll" />
225252 <module name="ArrayTypeStyle" />
226-<!-- <module name="FinalParameters" /> -->
227-<!-- <module name="DescendantToken" /> -->
228-<!--
253+ <module name="AvoidEscapedUnicodeCharacters">
254+ <property name="allowEscapesForControlCharacters" value="true" />
255+ <property name="allowByTailComment" value="true" />
256+ <property name="allowIfAllCharactersEscaped" value="true" />
257+ <property name="allowNonPrintableEscapes" value="true" />
258+ </module>
259+ <module name="CommentsIndentation" />
260+ <module name="DescendantToken" />
261+ <module name="FinalParameters" />
229262 <module name="Indentation">
230263 <property name="caseIndent" value="0" />
231264 </module>
232--->
233-<!-- <module name="TrailingComment" /> -->
234- <module name="Regexp">
235- <property name="format" value="@author" />
236- <property name="illegalPattern" value="true" />
237- </module>
238- <module name="Regexp">
239- <property name="format" value="^ \* Copyright\(c\)" />
240- </module>
241- <module name="Regexp">
242- <property name="format" value="^ \* License : The MIT License" />
243- <property name="duplicateLimit" value="1" />
244- </module>
245265 <module name="OuterTypeFilename" />
266+ <module name="TodoComment">
267+ <property name="format" value="TODO" />
268+ </module>
269+ <module name="TrailingComment" />
270+ <module name="UncommentedMain" />
271+ <module name="UpperEll" />
246272
247273
248274 <!-- Modifiers -->
249275
276+ <module name="ClassMemberImpliedModifier" />
277+ <module name="InterfaceMemberImpliedModifier" />
250278 <module name="ModifierOrder" />
251279 <module name="RedundantModifier" />
252280
253281
254282 <!-- Naming Conventions -->
255283
256- <module name="AbstractClassName">
257- <property
258- name="format"
259- value="^Abstract.*$|^.*Factory$|^.*Builder$|^.*Adapter$"
260- />
261- </module>
284+ <module name="AbbreviationAsWordInName" />
285+ <module name="AbstractClassName" />
286+ <module name="CatchParameterName" />
262287 <module name="ClassTypeParameterName" />
263288 <module name="ConstantName" />
264- <module name="LocalFinalVariableName">
265- <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
266- </module>
267- <module name="LocalVariableName">
268- <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
269- </module>
270- <module name="MemberName">
271- <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
272- </module>
289+ <module name="InterfaceTypeParameterName" />
290+ <module name="LambdaParameterName" />
291+ <module name="LocalFinalVariableName" />
292+ <module name="LocalVariableName" />
293+ <module name="MemberName" />
273294 <module name="MethodName" />
274295 <module name="MethodTypeParameterName" />
275296 <module name="PackageName" />
276- <module name="ParameterName">
277- <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
297+ <module name="ParameterName" />
298+ <module name="StaticVariableName" />
299+ <module name="TypeName" />
300+
301+
302+ <!-- Regex -->
303+
304+ <module name="Regexp">
305+ <property name="format" value="@author" />
306+ <property name="illegalPattern" value="true" />
278307 </module>
279- <module name="StaticVariableName">
280- <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
308+ <module name="Regexp">
309+ <property name="format" value="^ \* Copyright\(c\)" />
310+ </module>
311+ <module name="Regexp">
312+ <property name="format" value="^ \* License : The MIT License" />
313+ <property name="duplicateLimit" value="1" />
314+ </module>
315+ <module name="RegexpSinglelineJava">
316+ <property name="format" value="\u0000" />
281317 </module>
282- <module name="TypeName" />
283318
284319
285320 <!-- Size Violations -->
286321
322+ <module name="AnonInnerLength" />
287323 <module name="ExecutableStatementCount" />
288324 <module name="LineLength">
289325 <property name="max" value="78" />
290326 </module>
327+ <module name="MethodCount" />
291328 <module name="MethodLength" />
292- <module name="AnonInnerLength" />
293- <module name="ParameterNumber" />
294329 <module name="OuterTypeNumber" />
295- <module name="MethodCount" />
330+ <module name="ParameterNumber" />
296331
297332
298333 <!-- Whitespace -->
299334
300- <module name="GenericWhitespace" />
301335 <module name="EmptyForInitializerPad" />
302336 <module name="EmptyForIteratorPad" />
303- <module name="MethodParamPad">
337+ <module name="EmptyLineSeparator">
304338 <property
305339 name="tokens"
306- value="CTOR_DEF, LITERAL_NEW, METHOD_DEF, SUPER_CTOR_CALL"
307- />
308- </module>
309- <module name="NoWhitespaceAfter">
310- <property name="allowLineBreaks" value="false" />
311- <property name="tokens" value="DEC, DOT, INC" />
312- </module>
313- <module name="NoWhitespaceBefore">
314- <property name="allowLineBreaks" value="false" />
315- <property name="tokens" value="POST_DEC, POST_INC" />
316- </module>
317- <module name="NoWhitespaceBefore">
318- <property name="allowLineBreaks" value="true" />
319- <property name="tokens" value="SEMI" />
320- </module>
321- <module name="OperatorWrap">
322- <property name="option" value="eol" />
323- <property
324- name="tokens"
325- value="ASSIGN,
326- BAND_ASSIGN, BOR_ASSIGN, BXOR_ASSIGN,
327- PLUS_ASSIGN, MINUS_ASSIGN,
328- STAR_ASSIGN, DIV_ASSIGN, MOD_ASSIGN,
329- SL_ASSIGN, SR_ASSIGN"
330- />
331- </module>
332- <module name="OperatorWrap">
333- <property name="option" value="nl" />
334- <property
335- name="tokens"
336- value="BAND, BOR, BXOR,
337- MINUS, STAR, DIV, MOD,
338- LAND, LOR,
339- EQUAL"
340+ value="PACKAGE_DEF,
341+ IMPORT,
342+ CLASS_DEF,
343+ INTERFACE_DEF,
344+ ENUM_DEF,
345+ STATIC_INIT,
346+ INSTANCE_INIT,
347+ METHOD_DEF,
348+ CTOR_DEF,
349+ "
340350 />
341351 </module>
352+ <module name="GenericWhitespace" />
353+ <module name="MethodParamPad" />
354+ <module name="NoLineWrap" />
355+ <module name="NoWhitespaceAfter" />
356+ <module name="NoWhitespaceBefore" />
357+ <module name="OperatorWrap" />
342358 <module name="ParenPad">
343359 <property name="option" value="nospace" />
344360 <property
@@ -346,9 +362,14 @@
346362 value="CTOR_CALL, METHOD_CALL, SUPER_CTOR_CALL"
347363 />
348364 </module>
365+ <module name="SeparatorWrap">
366+ <property name="tokens" value="DOT"/>
367+ <property name="option" value="nl"/>
368+ </module>
369+ <module name="SingleSpaceSeparator" />
349370 <module name="TypecastParenPad" />
350- <module name="WhitespaceAfter">
351- <property name="tokens" value="COMMA, SEMI" />
371+ <module name="WhitespaceAfter" >
372+ <property name="tokens" value="COMMA, SEMI," />
352373 </module>
353374 <module name="WhitespaceAround">
354375 <property
@@ -368,19 +389,9 @@
368389 </module>
369390
370391
371-<!-- 代用品で解決
372- <module name="Header" />
373- <module name="RegexpSingleline" />
374- <module name="RegexpMultiline" />
375- <module name="RegexpSinglelineJava" />
376--->
392+ </module>
377393
378-<!-- Obsolated
379- <module name="TabCharacter" />
380--->
381394
382395 </module>
383396
384-</module>
385-
386397 <!-- EOF -->
--- /dev/null
+++ b/config/pmd/pmdrules.xml
@@ -0,0 +1,79 @@
1+<?xml version="1.0" encoding="UTF-8" ?>
2+
3+<!--
4+ Custom rule set
5+ for PMD [ https://pmd.github.io/ ] 6.13.0 or later
6+
7+ Copyright(c) 2019 olyutorskii
8+-->
9+
10+<ruleset
11+ xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
12+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
13+ xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0
14+ http://pmd.sourceforge.net/ruleset_2_0_0.xsd"
15+ name="Custom ruleset"
16+>
17+
18+ <description>
19+ custom rulesets
20+ </description>
21+
22+ <rule ref="category/java/bestpractices.xml" />
23+
24+ <rule ref="category/java/codestyle.xml" >
25+ <exclude name="CommentDefaultAccessModifier" />
26+ <exclude name="DefaultPackage" />
27+ <exclude name="LocalVariableCouldBeFinal" />
28+ <exclude name="MethodArgumentCouldBeFinal" />
29+ <exclude name="OnlyOneReturn" />
30+ <exclude name="ShortVariable" />
31+ <exclude name="UnnecessaryLocalBeforeReturn" />
32+ <exclude name="UnnecessaryReturn" />
33+ </rule>
34+ <rule ref="category/java/codestyle.xml/ControlStatementBraces" >
35+ <properties>
36+ <property name="checkIfElseStmt" value="false"/>
37+ <property name="checkSingleIfStmt" value="false"/>
38+ </properties>
39+ </rule>
40+
41+ <rule ref="category/java/design.xml" >
42+ <exclude name="LawOfDemeter" />
43+ <exclude name="LoosePackageCoupling" />
44+ </rule>
45+
46+ <rule ref="category/java/documentation.xml" />
47+ <rule ref="category/java/documentation.xml/CommentRequired" >
48+ <properties>
49+ <property name="fieldCommentRequirement" value="Ignored"/>
50+ </properties>
51+ </rule>
52+ <rule ref="category/java/documentation.xml/CommentSize" >
53+ <properties>
54+ <property name="maxLines" value="25"/>
55+ </properties>
56+ </rule>
57+
58+ <rule ref="category/java/errorprone.xml" >
59+ <exclude name="AvoidLiteralsInIfCondition" />
60+ <exclude name="BeanMembersShouldSerialize" />
61+ <exclude name="DataflowAnomalyAnalysis" />
62+ </rule>
63+
64+ <rule ref="category/java/multithreading.xml" />
65+
66+ <rule ref="category/java/performance.xml" >
67+ <exclude name="ConsecutiveAppendsShouldReuse" />
68+ <exclude name="RedundantFieldInitializer" />
69+ </rule>
70+
71+ <rule ref="category/java/security.xml" />
72+
73+ <!--rule ref="category/pom/errorprone.xml" /-->
74+
75+ <!--rule ref="category/xml/errorprone.xml" /-->
76+
77+</ruleset>
78+
79+<!-- EOF -->
--- a/fixcrlf.xml
+++ /dev/null
@@ -1,65 +0,0 @@
1-<?xml version="1.0" encoding="UTF-8" ?>
2-
3-<!-- ====================================================================== -->
4-<!-- Ant build file (http://ant.apache.org/) for Ant 1.8.0 or later. -->
5-<!-- ====================================================================== -->
6-
7-<project basedir=".">
8-<description>
9-CAUTION : This is not build-file for project-building.
10-It's just adapting project-files for native environment.
11-</description>
12-
13-<!-- ====================================================================== -->
14-<!-- sanitize files for native environment -->
15-<!-- ====================================================================== -->
16-
17- <target description="sanitize files" name="sanitize" >
18- <echo message="sanitize files..." />
19-
20- <fixcrlf
21- srcDir="." includes="*.txt"
22- encoding="UTF-8" outputencoding="UTF-8"
23- tablength="8" tab="remove"
24- eof="remove"
25- />
26-
27- <fixcrlf
28- srcDir="./src/" includes="**/*.java"
29- encoding="UTF-8" outputencoding="UTF-8"
30- tablength="4" tab="remove" javafiles="true"
31- eof="remove"
32- />
33-
34- <fixcrlf
35- srcDir="./src/" includes="**/*.properties"
36- encoding="ISO-8859-1" outputencoding="ISO-8859-1"
37- eol="lf"
38- eof="remove"
39- />
40-
41- <fixcrlf
42- srcDir="./src/" includes="**/*.xml,**/*.xsd,**/*.dtd"
43- encoding="UTF-8" outputencoding="UTF-8"
44- tablength="8" tab="remove"
45- eol="lf"
46- eof="remove"
47- />
48-
49- <fixcrlf
50- srcDir="./src/" includes="**/*.html,**/*.htm,**/*.css"
51- encoding="UTF-8" outputencoding="UTF-8"
52- tablength="8" tab="remove"
53- eol="lf"
54- eof="remove"
55- />
56-
57- <chmod type="file" perm="a-x">
58- <fileset dir="." includes="**/*" excludes="**/*.sh" />
59- </chmod>
60-
61- </target>
62-
63-</project>
64-
65-<!-- EOF -->
--- a/pom.xml
+++ b/pom.xml
@@ -1,14 +1,14 @@
11 <?xml version="1.0" encoding="UTF-8" ?>
22
33 <!--
4- Maven2(or3) POM definition file
4+ Maven3 POM definition file
55 -->
66
77 <project
88 xmlns="http://maven.apache.org/POM/4.0.0"
99 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
11- http://maven.apache.org/maven-v4_0_0.xsd"
11+ http://maven.apache.org/xsd/maven-4.0.0.xsd"
1212 >
1313 <modelVersion>4.0.0</modelVersion>
1414 <!--parent/-->
@@ -16,7 +16,7 @@
1616 <groupId>jp.sourceforge.mikutoga</groupId>
1717 <artifactId>pmd2xml</artifactId>
1818
19- <version>1.201.105-SNAPSHOT</version>
19+ <version>1.202.2</version>
2020
2121 <packaging>jar</packaging>
2222 <name>Pmd2XML</name>
@@ -25,18 +25,18 @@
2525 -->Pmd2XML is a PMD-XML converter for MikuMikuDance.<!--
2626 --></description>
2727
28- <url>http://sourceforge.jp/projects/mikutoga/</url>
28+ <url>https://ja.osdn.net/projects/mikutoga/devel/</url>
2929 <inceptionYear>2010</inceptionYear>
3030
3131 <organization>
3232 <name>MikuToga Partners</name>
33- <url>http://sourceforge.jp/projects/mikutoga/devel/</url>
33+ <url>https://ja.osdn.net/projects/mikutoga/devel/</url>
3434 </organization>
3535
3636 <licenses>
3737 <license>
3838 <name>The MIT License</name>
39- <url>http://www.opensource.org/licenses/mit-license.php</url>
39+ <url>https://opensource.org/licenses/MIT</url>
4040 <distribution>manual</distribution>
4141 </license>
4242 </licenses>
@@ -44,9 +44,9 @@
4444 <developers>
4545 <developer>
4646 <id>olyutorskii</id>
47- <url>http://sites.google.com/site/olyutorskiipit/</url>
47+ <url>https://sites.google.com/site/olyutorskiipit/</url>
4848 <organization>MikuToga Partners</organization>
49- <organizationUrl>http://sourceforge.jp/projects/mikutoga/devel/</organizationUrl>
49+ <organizationUrl>https://ja.osdn.net/projects/mikutoga/devel/</organizationUrl>
5050 <roles>
5151 <role>Project Founder</role>
5252 <role>Java Developer</role>
@@ -57,43 +57,60 @@
5757 <contributors/>
5858 <mailingLists/>
5959
60- <prerequisites>
61- <maven>2.2</maven>
62- </prerequisites>
60+ <!-- prerequisites/ -->
6361
6462 <modules/>
6563
6664 <scm>
67- <connection>scm:hg:http://hg.sourceforge.jp/view/mikutoga/Pmd2XML</connection>
68- <developerConnection>scm:hg:ssh://hg.sourceforge.jp//hgroot/mikutoga/Pmd2XML</developerConnection>
69- <url>http://hg.sourceforge.jp/view/mikutoga/Pmd2XML</url>
65+ <connection>scm:git:git://git.osdn.net/gitroot/mikutoga/Pmd2XML.git</connection>
66+ <developerConnection>scm:git:https://scm.osdn.net/gitroot/mikutoga/Pmd2XML.git</developerConnection>
67+ <url>https://ja.osdn.net/projects/mikutoga/scm/git/Pmd2XML/</url>
7068 </scm>
7169
7270 <issueManagement>
73- <system>SourceForge.JP</system>
74- <url>http://sourceforge.jp/projects/mikutoga/ticket/</url>
71+ <system>OSDN.net</system>
72+ <url>https://ja.osdn.net/projects/mikutoga/ticket/</url>
7573 </issueManagement>
7674
7775 <ciManagement/>
7876 <distributionManagement/>
7977
8078 <properties>
81- <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
82-
83- <maven.compiler.source>1.6</maven.compiler.source>
84- <maven.compiler.target>1.6</maven.compiler.target>
79+ <maven.compiler.source>1.8</maven.compiler.source>
80+ <maven.compiler.target>1.8</maven.compiler.target>
8581
8682 <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
8783 <maven.compiler.showWarnings>true</maven.compiler.showWarnings>
8884
85+ <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
8986 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
9087 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
9188
92- <project.mainconf>${project.basedir}/src/main/config</project.mainconf>
89+ <locale>en</locale>
90+ <site.locales>${locale}</site.locales>
91+ <javadoc.locale>${locale}</javadoc.locale>
92+ <spotbugs.jvmArgs>-Duser.language=${locale}</spotbugs.jvmArgs>
93+
94+ <!-- Walk around: JDK 11 javadoc + Maven -->
95+ <detectJavaApiLink>false</detectJavaApiLink>
96+
97+ <surefire-plugin.version>3.0.0-M3</surefire-plugin.version>
98+ <jacoco-plugin.version>0.8.4</jacoco-plugin.version>
9399
94- <checkstyle.config.location>${project.mainconf}/checks.xml</checkstyle.config.location>
100+ <checkstyle-plugin.version>3.1.0</checkstyle-plugin.version>
101+ <checkstyleruntime.version>8.21</checkstyleruntime.version>
102+ <checkstyle.config.location>${project.basedir}/config/checkstyle/checkstyle.xml</checkstyle.config.location>
103+ <checkstyle.suppressions.location>${project.basedir}/config/checkstyle/checkstyle-suppressions.xml</checkstyle.suppressions.location>
95104 <checkstyle.enable.rss>false</checkstyle.enable.rss>
96105
106+ <pmd-plugin.version>3.12.0</pmd-plugin.version>
107+
108+ <spotbugs-plugin.version>3.1.11</spotbugs-plugin.version>
109+ <spotbugs.effort>Max</spotbugs.effort>
110+ <spotbugs.threshold>Low</spotbugs.threshold>
111+ <!-- for Jenkins -->
112+ <spotbugs.xmlOutput>true</spotbugs.xmlOutput>
113+
97114 <project.mainentry>jp.sfjp.mikutoga.pmd2xml.Pmd2Xml</project.mainentry>
98115
99116 </properties>
@@ -105,14 +122,14 @@
105122 <dependency>
106123 <groupId>junit</groupId>
107124 <artifactId>junit</artifactId>
108- <version>4.11</version>
125+ <version>4.12</version>
109126 <scope>test</scope>
110127 </dependency>
111128
112129 <dependency>
113130 <groupId>jp.sourceforge.mikutoga</groupId>
114131 <artifactId>togagem</artifactId>
115- <version>3.101.5-SNAPSHOT</version>
132+ <version>3.121.2</version>
116133 <scope>compile</scope>
117134 </dependency>
118135
@@ -122,77 +139,166 @@
122139 <pluginRepositories/>
123140
124141 <build>
125- <pluginManagement/>
142+
143+ <pluginManagement>
144+
145+ <plugins>
146+
147+ <plugin>
148+ <groupId>org.apache.maven.plugins</groupId>
149+ <artifactId>maven-checkstyle-plugin</artifactId>
150+ <version>${checkstyle-plugin.version}</version>
151+ <dependencies>
152+ <dependency>
153+ <groupId>com.puppycrawl.tools</groupId>
154+ <artifactId>checkstyle</artifactId>
155+ <version>${checkstyleruntime.version}</version>
156+ </dependency>
157+ </dependencies>
158+ </plugin>
159+
160+ </plugins>
161+
162+ </pluginManagement>
126163
127164 <plugins>
128165
129- <plugin>
130- <groupId>org.apache.maven.plugins</groupId>
131- <artifactId>maven-enforcer-plugin</artifactId>
132- <version>1.3.1</version>
133- <configuration>
134- <rules>
135- <requireMavenVersion>
136- <version>[3.0,)</version>
137- </requireMavenVersion>
138- <requireJavaVersion>
139- <version>[1.6,)</version>
140- </requireJavaVersion>
141- </rules>
142- </configuration>
143- </plugin>
144166
145- <plugin>
146- <groupId>org.apache.maven.plugins</groupId>
147- <artifactId>maven-install-plugin</artifactId>
148- <version>2.5.1</version>
149- </plugin>
167+ <!-- clean lifecycle -->
150168
151169 <plugin>
152170 <groupId>org.apache.maven.plugins</groupId>
153171 <artifactId>maven-clean-plugin</artifactId>
154- <version>2.5</version>
172+ <version>3.1.0</version>
155173 <configuration>
156174 <filesets>
157175 <fileset>
158176 <directory>${project.basedir}</directory>
159177 <includes>
160- <include>**/.DS_Store</include>
161- <include>**/_MACOSX</include>
178+ <include>**/*~</include>
179+ <include>**/*.swp</include>
180+ <include>**/*.DS_Store</include>
181+ <include>**/._*</include>
182+ <include>**/__MACOSX</include>
162183 <include>**/Thumbs.db</include>
163- <include>**/thumbs.db</include>
164- <include>**/Desktop.ini</include>
165184 <include>**/desktop.ini</include>
166185 <include>**/core</include>
186+ <include>**/hs_err_pid*</include>
167187 </includes>
168188 </fileset>
169189 </filesets>
170190 </configuration>
171191 </plugin>
172192
193+
194+ <!-- default lifecycle -->
195+
196+ <plugin>
197+ <groupId>org.apache.maven.plugins</groupId>
198+ <artifactId>maven-enforcer-plugin</artifactId>
199+ <version>3.0.0-M2</version>
200+ <executions>
201+ <execution>
202+ <id>enforce-versions</id>
203+ <goals>
204+ <goal>enforce</goal>
205+ </goals>
206+ <configuration>
207+ <rules>
208+ <requireMavenVersion>
209+ <version>[3.3.9,)</version>
210+ </requireMavenVersion>
211+ <requireJavaVersion>
212+ <version>[1.8,)</version>
213+ </requireJavaVersion>
214+ </rules>
215+ </configuration>
216+ </execution>
217+ </executions>
218+ </plugin>
219+
220+ <plugin>
221+ <groupId>org.apache.maven.plugins</groupId>
222+ <artifactId>maven-resources-plugin</artifactId>
223+ <version>3.1.0</version>
224+ </plugin>
225+
173226 <plugin>
174227 <groupId>org.apache.maven.plugins</groupId>
175228 <artifactId>maven-compiler-plugin</artifactId>
176- <version>3.1</version>
229+ <version>3.8.1</version>
177230 <configuration>
178- <source>1.6</source> <!-- for NetBeans IDE -->
179- <target>1.6</target>
180- <showDeprecation>true</showDeprecation>
181- <showWarnings>true</showWarnings>
231+ <source>1.8</source> <!-- for NetBeans IDE -->
232+ <target>1.8</target>
182233 <compilerArguments>
183234 <Xlint/>
184235 </compilerArguments>
236+ <showWarnings>true</showWarnings>
237+ <showDeprecation>true</showDeprecation>
185238 </configuration>
186239 </plugin>
187240
188241 <plugin>
189242 <groupId>org.apache.maven.plugins</groupId>
243+ <artifactId>maven-surefire-plugin</artifactId>
244+ <version>${surefire-plugin.version}</version>
245+ <configuration>
246+ <enableAssertions>true</enableAssertions>
247+ </configuration>
248+ </plugin>
249+
250+ <plugin>
251+ <groupId>org.jacoco</groupId>
252+ <artifactId>jacoco-maven-plugin</artifactId>
253+ <version>${jacoco-plugin.version}</version>
254+ <executions>
255+ <execution>
256+ <id>default-prepare-agent</id>
257+ <goals>
258+ <goal>prepare-agent</goal>
259+ </goals>
260+ </execution>
261+ <execution>
262+ <id>default-report</id>
263+ <phase>prepare-package</phase>
264+ <goals>
265+ <goal>report</goal>
266+ </goals>
267+ </execution>
268+ <execution>
269+ <id>default-check</id>
270+ <goals>
271+ <goal>check</goal>
272+ </goals>
273+ <configuration>
274+ <rules>
275+ <rule implementation="org.jacoco.maven.RuleConfiguration">
276+ <element>BUNDLE</element>
277+ <limits>
278+ <limit implementation="org.jacoco.report.check.Limit">
279+ <counter>COMPLEXITY</counter>
280+ <value>COVEREDRATIO</value>
281+ <minimum>0.0</minimum>
282+ </limit>
283+ </limits>
284+ </rule>
285+ </rules>
286+ </configuration>
287+ </execution>
288+ </executions>
289+ </plugin>
290+
291+ <plugin>
292+ <groupId>org.apache.maven.plugins</groupId>
190293 <artifactId>maven-jar-plugin</artifactId>
191- <version>2.4</version>
294+ <version>3.1.2</version>
192295 <configuration>
193296 <archive>
194297 <manifest>
195298 <mainClass>${project.mainentry}</mainClass>
299+ <addDefaultImplementationEntries>
300+ true
301+ </addDefaultImplementationEntries>
196302 </manifest>
197303 <manifestEntries>
198304 <Built-By>${project.organization.name}</Built-By>
@@ -204,7 +310,7 @@
204310 <plugin>
205311 <groupId>org.apache.maven.plugins</groupId>
206312 <artifactId>maven-shade-plugin</artifactId>
207- <version>2.1</version>
313+ <version>3.2.1</version>
208314 <executions>
209315 <execution>
210316 <phase>package</phase>
@@ -228,20 +334,8 @@
228334
229335 <plugin>
230336 <groupId>org.apache.maven.plugins</groupId>
231- <artifactId>maven-assembly-plugin</artifactId>
232- <version>2.4</version>
233- <configuration>
234- <archiveBaseDirectory>.</archiveBaseDirectory>
235- <descriptors>
236- <descriptor>src/main/assembly/descriptor.xml</descriptor>
237- </descriptors>
238- </configuration>
239- </plugin>
240-
241- <plugin>
242- <groupId>org.apache.maven.plugins</groupId>
243337 <artifactId>maven-source-plugin</artifactId>
244- <version>2.2.1</version>
338+ <version>3.1.0</version>
245339 <configuration>
246340 <includePom>true</includePom>
247341 <archive>
@@ -263,76 +357,63 @@
263357
264358 <plugin>
265359 <groupId>org.apache.maven.plugins</groupId>
266- <artifactId>maven-resources-plugin</artifactId>
267- <version>2.6</version>
360+ <artifactId>maven-install-plugin</artifactId>
361+ <version>3.0.0-M1</version>
268362 </plugin>
269363
270364 <plugin>
271365 <groupId>org.apache.maven.plugins</groupId>
272- <artifactId>maven-surefire-plugin</artifactId>
273- <version>2.16</version>
366+ <artifactId>maven-deploy-plugin</artifactId>
367+ <version>3.0.0-M1</version>
368+ </plugin>
369+
370+
371+ <!-- site lifecycle -->
372+
373+ <plugin>
374+ <groupId>org.apache.maven.plugins</groupId>
375+ <artifactId>maven-site-plugin</artifactId>
376+ <version>3.7.1</version>
274377 <configuration>
275- <skipTests>false</skipTests>
276- <enableAssertions>true</enableAssertions>
378+ <locales>${site.locales}</locales>
277379 </configuration>
278380 </plugin>
279381
382+
383+ <!-- goals without lifecycle -->
384+
280385 <plugin>
281386 <groupId>org.apache.maven.plugins</groupId>
282- <artifactId>maven-site-plugin</artifactId>
283- <version>3.3</version>
387+ <artifactId>maven-assembly-plugin</artifactId>
388+ <version>3.1.1</version>
284389 <configuration>
285- <generateReports>true</generateReports>
286- <locales>ja</locales>
287- <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
288- <outputEncoding>${project.reporting.outputEncoding}</outputEncoding>
390+ <descriptors>
391+ <descriptor>src/assembly/src.xml</descriptor>
392+ </descriptors>
289393 </configuration>
290394 </plugin>
291395
292396 <plugin>
293397 <groupId>org.apache.maven.plugins</groupId>
294398 <artifactId>maven-checkstyle-plugin</artifactId>
295- <version>2.11</version>
296- <!-- config from property value -->
399+ <version>${checkstyle-plugin.version}</version>
297400 </plugin>
298401
299402 <plugin>
300403 <groupId>org.apache.maven.plugins</groupId>
301404 <artifactId>maven-pmd-plugin</artifactId>
302- <version>3.0.1</version>
405+ <version>${pmd-plugin.version}</version>
303406 <configuration>
304- <targetJdk>${maven.compiler.target}</targetJdk>
305407 <rulesets>
306- <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
408+ <ruleset>${project.basedir}/config/pmd/pmdrules.xml</ruleset>
307409 </rulesets>
308410 </configuration>
309411 </plugin>
310412
311413 <plugin>
312- <groupId>org.codehaus.mojo</groupId>
313- <artifactId>findbugs-maven-plugin</artifactId>
314- <version>2.5.2</version>
315- <configuration>
316- <effort>Max</effort>
317- <threshold>Low</threshold>
318- <!-- for Jenkins -->
319- <findbugsXmlOutput>true</findbugsXmlOutput>
320- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
321- <xmlOutput>true</xmlOutput>
322- </configuration>
323- </plugin>
324-
325- <plugin>
326- <groupId>org.codehaus.mojo</groupId>
327- <artifactId>cobertura-maven-plugin</artifactId>
328- <version>2.5.2</version>
329- <configuration>
330- <encoding>${project.build.sourceEncoding}</encoding>
331- <formats>
332- <format>html</format>
333- <format>xml</format> <!-- for Jenkins -->
334- </formats>
335- </configuration>
414+ <groupId>com.github.spotbugs</groupId>
415+ <artifactId>spotbugs-maven-plugin</artifactId>
416+ <version>${spotbugs-plugin.version}</version>
336417 </plugin>
337418
338419 </plugins>
@@ -371,7 +452,7 @@
371452 <exclude>**/version.properties</exclude>
372453
373454 <exclude>**/.DS_Store</exclude>
374- <exclude>**/_MACOSX</exclude>
455+ <exclude>**/__MACOSX</exclude>
375456 <exclude>**/Thumbs.db</exclude>
376457 <exclude>**/thumbs.db</exclude>
377458 <exclude>**/Desktop.ini</exclude>
@@ -391,7 +472,7 @@
391472 <plugin>
392473 <groupId>org.apache.maven.plugins</groupId>
393474 <artifactId>maven-project-info-reports-plugin</artifactId>
394- <version>2.7</version>
475+ <version>3.0.0</version>
395476 <configuration>
396477 <linkOnly>true</linkOnly>
397478 <offline>true</offline>
@@ -401,20 +482,21 @@
401482 <reports>
402483 <report>index</report>
403484 <report>summary</report>
404- <report>license</report>
485+ <report>licenses</report>
486+ <report>dependency-info</report>
405487 <report>dependencies</report>
488+ <report>dependency-convergence</report>
406489 <report>plugins</report>
490+ <report>plugin-management</report>
491+ <report>team</report>
492+ <report>issue-management</report>
407493 <report>scm</report>
408- <report>project-team</report>
409494 <!--
410- <report>dependency-convergence</report>
411- <report>dependency-info</report>
412495 <report>dependency-management</report>
413496 <report>distribution-management</report>
414- <report>issue-tracking</report>
415- <report>mailing-list</report>
497+ <report>ci-management</report>
498+ <report>mailing-lists</report>
416499 <report>modules</report>
417- <report>plugin-management</report>
418500 -->
419501 </reports>
420502 </reportSet>
@@ -424,13 +506,17 @@
424506 <plugin>
425507 <groupId>org.apache.maven.plugins</groupId>
426508 <artifactId>maven-javadoc-plugin</artifactId>
427- <version>2.9.1</version>
509+ <version>3.1.0</version>
428510 <configuration>
429- <skip>false</skip>
511+ <author>false</author>
430512 <notimestamp>true</notimestamp>
431513 <quiet>true</quiet>
432514 <show>protected</show>
433- <stylesheet>maven</stylesheet>
515+ <header>${project.name} ${project.version} API</header>
516+ <version>true</version>
517+ <locale>${javadoc.locale}</locale>
518+ <!-- for JDK11 javadoc -->
519+ <additionalJOption>-J-Duser.language=${javadoc.locale}</additionalJOption>
434520 </configuration>
435521 <reportSets>
436522 <reportSet>
@@ -444,49 +530,32 @@
444530 <plugin>
445531 <groupId>org.apache.maven.plugins</groupId>
446532 <artifactId>maven-jxr-plugin</artifactId>
447- <version>2.3</version>
448- <configuration>
449- <skip>false</skip>
450- </configuration>
533+ <version>3.0.0</version>
451534 </plugin>
452535
453536 <plugin>
454537 <groupId>org.apache.maven.plugins</groupId>
455538 <artifactId>maven-surefire-report-plugin</artifactId>
456- <version>2.16</version>
457- <configuration>
458- <showSuccess>false</showSuccess>
459- </configuration>
539+ <version>${surefire-plugin.version}</version>
540+ </plugin>
541+
542+ <plugin>
543+ <groupId>org.jacoco</groupId>
544+ <artifactId>jacoco-maven-plugin</artifactId>
545+ <version>${jacoco-plugin.version}</version>
460546 <reportSets>
461547 <reportSet>
462548 <reports>
463- <report>report-only</report>
549+ <report>report</report>
464550 </reports>
465551 </reportSet>
466552 </reportSets>
467553 </plugin>
468554
469555 <plugin>
470- <groupId>org.codehaus.mojo</groupId>
471- <artifactId>cobertura-maven-plugin</artifactId>
472- <version>2.5.2</version>
473- <configuration>
474- <encoding>${project.build.sourceEncoding}</encoding>
475- <formats>
476- <format>html</format>
477- <format>xml</format> <!-- for Jenkins -->
478- </formats>
479- </configuration>
480- </plugin>
481-
482- <plugin>
483556 <groupId>org.apache.maven.plugins</groupId>
484557 <artifactId>maven-checkstyle-plugin</artifactId>
485- <version>2.11</version>
486- <configuration>
487- <skip>false</skip>
488- <!-- config from property value -->
489- </configuration>
558+ <version>${checkstyle-plugin.version}</version>
490559 <reportSets>
491560 <reportSet>
492561 <reports>
@@ -499,12 +568,10 @@
499568 <plugin>
500569 <groupId>org.apache.maven.plugins</groupId>
501570 <artifactId>maven-pmd-plugin</artifactId>
502- <version>3.0.1</version>
571+ <version>${pmd-plugin.version}</version>
503572 <configuration>
504- <skip>false</skip>
505- <targetJdk>${maven.compiler.target}</targetJdk>
506573 <rulesets>
507- <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
574+ <ruleset>${project.basedir}/config/pmd/pmdrules.xml</ruleset>
508575 </rulesets>
509576 </configuration>
510577 <reportSets>
@@ -518,31 +585,9 @@
518585 </plugin>
519586
520587 <plugin>
521- <groupId>org.codehaus.mojo</groupId>
522- <artifactId>findbugs-maven-plugin</artifactId>
523- <version>2.5.2</version>
524- <configuration>
525- <skip>false</skip>
526- <effort>Max</effort>
527- <threshold>Low</threshold>
528- <!-- for Jenkins -->
529- <findbugsXmlOutput>true</findbugsXmlOutput>
530- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
531- <xmlOutput>true</xmlOutput>
532- <!-- excludeFilterFile/ -->
533- </configuration>
534- </plugin>
535-
536- <plugin>
537- <groupId>org.codehaus.mojo</groupId>
538- <artifactId>javancss-maven-plugin</artifactId>
539- <version>2.0</version>
540- </plugin>
541-
542- <plugin>
543- <groupId>org.codehaus.mojo</groupId>
544- <artifactId>jdepend-maven-plugin</artifactId>
545- <version>2.0-beta-2</version>
588+ <groupId>com.github.spotbugs</groupId>
589+ <artifactId>spotbugs-maven-plugin</artifactId>
590+ <version>${spotbugs-plugin.version}</version>
546591 </plugin>
547592
548593 </plugins>
--- a/src/main/assembly/descriptor.xml
+++ b/src/assembly/src.xml
@@ -1,15 +1,15 @@
11 <?xml version="1.0" encoding="UTF-8" ?>
22
33 <assembly
4- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
4+ xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
55 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
7- http://maven.apache.org/xsd/assembly-1.1.2.xsd"
6+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
7+ http://maven.apache.org/xsd/assembly-2.0.0.xsd"
88 >
99
1010 <!--
11- SourceForge.JP用リリースファイル構成定義ファイル
12- Maven2(or3) assembly用
11+ OSDN.net用リリースファイル構成定義ファイル
12+ Maven3 assembly用
1313 -->
1414
1515 <id>src</id>
@@ -20,11 +20,11 @@
2020
2121 <fileSets>
2222 <fileSet>
23- <directory>.</directory>
23+ <directory>${project.basedir}</directory>
2424 <includes>
25- <include>pom.xml</include>
26- <include>fixcrlf.xml</include>
25+ <include>*.xml</include>
2726 <include>*.txt</include>
27+ <include>*.md</include>
2828 </includes>
2929 <excludes>
3030 <exclude>nb-configuration.xml</exclude>
@@ -33,7 +33,11 @@
3333 <useDefaultExcludes>true</useDefaultExcludes>
3434 </fileSet>
3535 <fileSet>
36- <directory>src/</directory>
36+ <directory>${project.basedir}/src</directory>
37+ <useDefaultExcludes>true</useDefaultExcludes>
38+ </fileSet>
39+ <fileSet>
40+ <directory>${project.basedir}/config</directory>
3741 <useDefaultExcludes>true</useDefaultExcludes>
3842 </fileSet>
3943 </fileSets>
--- a/src/main/config/pmdrules.xml
+++ /dev/null
@@ -1,135 +0,0 @@
1-<?xml version="1.0" encoding="UTF-8" ?>
2-
3-<!--
4- PMD用ルールセット定義
5-
6- PMD [ http://pmd.sourceforge.net/ ] 5.0 以降用に記述されています。
7-
8- Copyright(c) 2010 olyutorskii
9--->
10-
11-<ruleset
12- xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
13- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
14- xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0
15- http://pmd.sourceforge.net/ruleset_2_0_0.xsd"
16- name="Custom ruleset"
17->
18-
19- <description>
20- custom rulesets for project
21- </description>
22-
23-<!--
24- <rule ref="rulesets/java/android.xml" />
25--->
26-
27- <rule ref="rulesets/java/basic.xml" />
28-
29- <rule ref="rulesets/java/braces.xml">
30- <exclude name="IfElseStmtsMustUseBraces" />
31- <exclude name="IfStmtsMustUseBraces" />
32- </rule>
33-
34- <rule ref="rulesets/java/clone.xml" />
35-
36- <rule ref="rulesets/java/codesize.xml">
37- <exclude name="TooManyMethods" />
38- </rule>
39- <rule ref="rulesets/java/codesize.xml/TooManyMethods">
40- <properties>
41- <property name="maxmethods" value="25"/>
42- </properties>
43- </rule>
44-
45- <rule ref="rulesets/java/comments.xml">
46- <exclude name="CommentSize" />
47- </rule>
48- <rule ref="rulesets/java/comments.xml/CommentSize" >
49- <properties>
50- <property name="maxLines" value="25"/>
51- </properties>
52- </rule>
53-
54- <rule ref="rulesets/java/controversial.xml">
55- <exclude name="NullAssignment" />
56- <exclude name="OnlyOneReturn" />
57- <exclude name="DefaultPackage" />
58- <exclude name="DataflowAnomalyAnalysis" />
59- <exclude name="AvoidUsingShortType" />
60- <exclude name="AvoidLiteralsInIfCondition" />
61- <exclude name="UseConcurrentHashMap" />
62- </rule>
63-
64- <rule ref="rulesets/java/coupling.xml">
65- <exclude name="LawOfDemeter" />
66- <exclude name="LoosePackageCoupling" /> <!-- 3.0.1 では読めない -->
67- </rule>
68-
69- <rule ref="rulesets/java/design.xml">
70- <exclude name="ConfusingTernary" />
71- <exclude name="UnnecessaryLocalBeforeReturn" />
72- <exclude name="FieldDeclarationsShouldBeAtStartOfClass" />
73- </rule>
74-
75- <rule ref="rulesets/java/empty.xml" />
76-
77- <rule ref="rulesets/java/finalizers.xml" />
78-
79- <rule ref="rulesets/java/imports.xml" />
80-
81-<!--
82- <rule ref="rulesets/java/j2ee.xml" />
83- <rule ref="rulesets/java/javabeans.xml" />
84--->
85-
86- <rule ref="rulesets/java/junit.xml" />
87-
88-<!--
89- <rule ref="rulesets/java/logging-jakarta-commons.xml" />
90--->
91-
92- <rule ref="rulesets/java/logging-java.xml" />
93-
94- <rule ref="rulesets/java/migrating.xml" />
95-<!--
96- <rule ref="rulesets/java/migrating_to_XX.xml" />
97--->
98-
99- <rule ref="rulesets/java/naming.xml">
100- <exclude name="ShortVariable" />
101- <exclude name="LongVariable" />
102- <exclude name="AvoidFieldNameMatchingMethodName" />
103- </rule>
104- <rule ref="rulesets/java/naming.xml/LongVariable">
105- <properties>
106- <property name="minimum" value="25"/>
107- </properties>
108- </rule>
109-
110- <rule ref="rulesets/java/optimizations.xml">
111- <exclude name="LocalVariableCouldBeFinal" />
112- <exclude name="MethodArgumentCouldBeFinal" />
113- <exclude name="RedundantFieldInitializer" />
114- </rule>
115-
116- <rule ref="rulesets/java/strictexception.xml">
117- <exclude name="AvoidThrowingNullPointerException" />
118- </rule>
119-
120- <rule ref="rulesets/java/strings.xml" />
121-
122- <rule ref="rulesets/java/sunsecure.xml" />
123-
124- <rule ref="rulesets/java/typeresolution.xml" />
125-
126- <rule ref="rulesets/java/unnecessary.xml">
127- <exclude name="UnnecessaryReturn" />
128- <exclude name="UselessParentheses" />
129- </rule>
130-
131- <rule ref="rulesets/java/unusedcode.xml" />
132-
133-</ruleset>
134-
135-<!-- EOF -->
--- a/src/main/config/suppressions.xml
+++ /dev/null
@@ -1,37 +0,0 @@
1-<?xml version="1.0" encoding="UTF-8" ?>
2-
3-<!DOCTYPE suppressions PUBLIC
4- "-//Puppy Crawl//DTD Suppressions 1.1//EN"
5- "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
6-
7-<!--
8- Checkstyle用警告抑止設定
9- ※ SuppressionFilter モジュール用
10-
11- [ http://checkstyle.sourceforge.net/ ]
12-
13- Copyright(c) 2010 olyutorskii
14--->
15-
16-
17-<suppressions>
18-
19-<!--
20- <suppress files="" checks="ExecutableStatementCount" />
21-
22- <suppress files="" checks="ClassDataAbstractionCoupling" />
23- <suppress files="" checks="ClassFanOutComplexity" />
24- <suppress files="" checks="CyclomaticComplexity" />
25- <suppress files="" checks="NPathComplexity" />
26- <suppress files="" checks="JavaNCSS" />
27--->
28-
29-<!--
30- <suppress files="" checks="MagicNumber" />
31- <suppress files="" checks="MultipleStringLiterals" />
32--->
33-
34-</suppressions>
35-
36-
37-<!-- EOF -->
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/SaxListener.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/SaxListener.java
@@ -15,8 +15,8 @@ import java.util.Collection;
1515 import java.util.EnumMap;
1616 import java.util.LinkedList;
1717 import java.util.Map;
18-import javax.xml.bind.DatatypeConverter;
1918 import jp.sfjp.mikutoga.pmd.model.PmdModel;
19+import jp.sfjp.mikutoga.xml.DatatypeIo;
2020 import org.xml.sax.Attributes;
2121
2222 /**
@@ -208,7 +208,7 @@ class SaxListener {
208208 String attrName = attr.attr();
209209 String attrVal = this.currentAttribute.getValue(attrName);
210210 boolean bVal;
211- bVal = DatatypeConverter.parseBoolean(attrVal);
211+ bVal = DatatypeIo.parseBoolean(attrVal);
212212 return bVal;
213213 }
214214
@@ -224,7 +224,7 @@ class SaxListener {
224224 String attrName = attr.attr();
225225 String attrVal = this.currentAttribute.getValue(attrName);
226226 float fVal;
227- fVal = DatatypeConverter.parseFloat(attrVal);
227+ fVal = DatatypeIo.parseFloat(attrVal);
228228 return fVal;
229229 }
230230
@@ -240,7 +240,7 @@ class SaxListener {
240240 String attrName = attr.attr();
241241 String attrVal = this.currentAttribute.getValue(attrName);
242242 int iVal;
243- iVal = DatatypeConverter.parseInt(attrVal);
243+ iVal = DatatypeIo.parseInt(attrVal);
244244 return iVal;
245245 }
246246
旧リポジトリブラウザで表示