• R/O
  • HTTP
  • SSH
  • HTTPS

TogaGem: Commit

TogaGemは、3D動画制作ツール、MikuMikuDance(MMD)で用いられる各種データファイルを読み書きするためのJavaライブラリです。
旧TogaParserライブラリの資産は、TogaGemライブラリに吸収されました。


Commit MetaInfo

Revisione26fa0ddb4ae9368e17880190aec31792b343a83 (tree)
Zeit2019-06-02 21:43:24
AutorOlyutorskii <olyutorskii@user...>
CommiterOlyutorskii

Log Message

Merge release/v3.101.106

Ändern Zusammenfassung

Diff

--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,10 @@
44 TogaGem 変更履歴
55
66
7+3.101.106 (2019-06-02)
8+ ・必須環境をJavaSE8に引き上げ。
9+ ・Mercurial(3.102.4)からGit(3.101.105-SNAPSHOT)へSCMを移行。
10+
711 3.101.4 (2013-06-16)
812 ・assemblyプラグイン設定のプロジェクト不備を修正。
913
--- a/README.txt
+++ b/README.txt
@@ -27,14 +27,14 @@ MikuTogaプロジェクトは、MMDによる3Dアニメーション制作を支
2727
2828 === 実行環境 ===
2929
30- - TogaGemはJava言語(JLS3)で記述されたプログラムです。
31- - TogaGemはJRE1.6に準拠したJava実行環境で利用できるように作られています。
32- 原則として、JRE1.6に準拠した実行系であれば、プラットフォームを選びません。
30+ - TogaGemはJava言語(JavaSE8)で記述されたプログラムです。
31+ - TogaGemはJavaSE8に準拠したJava実行環境で利用できるように作られています。
32+ 原則として、JavaSE8に準拠した実行系であれば、プラットフォームを選びません。
3333
3434
3535 === 開発プロジェクト運営元 ===
3636
37- http://sourceforge.jp/projects/mikutoga/ まで。
37+ https://ja.osdn.net/projects/mikutoga/ まで。
3838
3939
4040 === ディレクトリ内訳構成 ===
@@ -50,9 +50,6 @@ MikuTogaプロジェクトは、MMDによる3Dアニメーション制作を支
5050 ./LICENSE.txt
5151 ライセンスに関して。
5252
53-./SCM.txt
54- ソースコード管理に関して。
55-
5653 ./pom.xml
5754 Maven3用プロジェクト構成定義ファイル。
5855
@@ -65,13 +62,13 @@ MikuTogaプロジェクトは、MMDによる3Dアニメーション制作を支
6562 ./src/test/java/sample/
6663 パーサ利用のサンプルプログラム。
6764
68-./src/main/config/
65+./config/
6966 各種ビルド・構成管理に必要なファイル群。
7067
71-./src/main/config/checks.xml
68+./config/checkstyle/checkstyle.xml
7269 Checkstyle用configファイル。
7370
74-./src/main/config/pmdrules.xml
71+./config/pmd/pmdrules.xml
7572 PMD用ルール定義ファイル。
7673
7774
--- a/SCM.txt
+++ /dev/null
@@ -1,48 +0,0 @@
1-[UTF-8 Japanese]
2-
3- T o g a G e m
4- バージョン管理システムに関する情報
5-
6- Copyright(c) 2011 devboss
7-
8-
9-=== バージョン管理体制 ===
10-
11- このアーカイブの原本は、Mercurial(hg)でバージョン管理されています。
12- このアーカイブの原本となる開発資産は、
13- http://hg.sourceforge.jp/view/mikutoga/TogaGem
14- を上位に持つMercurialリポジトリで管理されています。
15- アーカイブの代わりにMercurialを通じての開発資産へのアクセスが可能です。
16- # hg clone http://hg.sourceforge.jp/view/mikutoga/TogaGem
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,46 @@
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="SummaryJavadocCheck" />
35+
36+ <!-- Miscellaneous -->
37+ <suppress files="" checks="FinalParameters" />
38+ <suppress files="" checks="TrailingComment" />
39+
40+ <!-- Whitespace -->
41+ <suppress files="" checks="SingleSpaceSeparator" />
42+
43+</suppressions>
44+
45+
46+<!-- 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.20 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,24 @@
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, xml, properties" />
2324 <property name="severity" value="error" />
2425
2526
2627 <!-- Filters -->
2728 <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" />
33-
34-
35- <!-- Duplicate Code -->
36- <module name="StrictDuplicateCode">
37- <property name="min" value="20" />
38- </module>
29+ <!--module name="SuppressionFilter" /-->
30+ <module name="SuppressWarningsFilter" />
31+ <module name="SuppressWithPlainTextCommentFilter" />
3932
4033
4134 <!-- Headers -->
35+ <module name="Header">
36+ <property name="header" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; ?&gt;" />
37+ <property name="fileExtensions" value="xml" />
38+ </module>
4239 <module name="RegexpHeader">
4340 <property name="header" value="^/\*$\n^ \*( .*)?$\n^ \*/$\n" />
4441 <property name="multiLines" value="2" />
@@ -55,13 +52,20 @@
5552 <property name="fileExtensions" value="java" />
5653 </module>
5754 <module name="Translation" />
55+ <module name="UniqueProperties" />
5856
5957
6058 <!-- Regexp -->
59+ <module name="RegexpMultiline">
60+ <property name="format" value="[\u000b\f\u001a]" />
61+ </module>
62+ <module name="RegexpOnFilename" />
6163 <module name="RegexpSingleline">
6264 <property name="format" value="\s+$" />
63- <property name="minimum" value="0" />
64- <property name="maximum" value="0" />
65+ </module>
66+ <module name="RegexpSingleline">
67+ <!-- scm conflict -->
68+ <property name="format" value="&lt;&lt;&lt;&lt;&lt;" />
6569 </module>
6670
6771
@@ -73,43 +77,62 @@
7377 <module name="FileTabCharacter" />
7478
7579
80+ <module name="BeforeExecutionExclusionFileFilter">
81+ <property name="fileNamePattern" value="module\-info\.java$" />
82+ </module>
83+
84+
7685 <module name="TreeWalker">
7786
78- <module name="FileContentsHolder" />
87+ <property name="tabWidth" value="8" />
88+ <property name="fileExtensions" value="java" />
89+
90+ <module name="SuppressWarningsHolder" />
91+
92+
93+ <!-- Filters -->
94+
95+ <module name="SuppressionCommentFilter" />
96+ <module name="SuppressWithNearbyCommentFilter" />
97+ <!--module name="SuppressionXpathFilter" /-->
98+ <!--module name="SuppressionXpathSingleFilter" /-->
7999
80100
81101 <!-- Annotations -->
82102
103+ <module name="AnnotationLocation" />
104+ <module name="AnnotationOnSameLine" />
83105 <module name="AnnotationUseStyle" />
84106 <module name="MissingDeprecated" />
85107 <module name="MissingOverride" />
86108 <module name="PackageAnnotation" />
87109 <module name="SuppressWarnings" />
110+ <module name="SuppressWarningsHolder" />
88111
89112
90113 <!-- Block Checks -->
91114
115+ <module name="AvoidNestedBlocks" />
92116 <module name="EmptyBlock" />
117+ <module name="EmptyCatchBlock" />
93118 <module name="LeftCurly" />
94119 <module name="NeedBraces">
95- <property name="tokens" value="LITERAL_DO" />
120+ <property name="allowSingleLineStatement" value="true" />
96121 </module>
97122 <module name="RightCurly" />
98- <module name="AvoidNestedBlocks" />
99123
100124
101125 <!-- Class Design -->
102126
103- <module name="VisibilityModifier" />
127+ <module name="DesignForExtension" />
104128 <module name="FinalClass" />
105- <module name="InterfaceIsType" />
106129 <module name="HideUtilityClassConstructor" />
107-<!-- <module name="DesignForExtension" /> -->
108- <module name="MutableException" />
109- <module name="ThrowsCount">
110- <property name="max" value="4" />
111- </module>
112130 <module name="InnerTypeLast" />
131+ <module name="InterfaceIsType" />
132+ <module name="MutableException" />
133+ <module name="OneTopLevelClass" />
134+ <module name="ThrowsCount" />
135+ <module name="VisibilityModifier" />
113136
114137
115138 <!-- Coding -->
@@ -117,84 +140,74 @@
117140 <module name="ArrayTrailingComma" />
118141 <module name="AvoidInlineConditionals" />
119142 <module name="CovariantEquals" />
120-<!-- <module name="DoubleCheckedLocking" /> 5.6 obsolete -->
143+ <module name="DeclarationOrder" />
144+ <module name="DefaultComesLast" />
121145 <module name="EmptyStatement" />
122146 <module name="EqualsAvoidNull" />
123147 <module name="EqualsHashCode" />
124-<!-- <module name="FinalLocalVariable" /> -->
148+ <module name="ExplicitInitialization" />
149+ <module name="FallThrough" />
150+ <module name="FinalLocalVariable" />
125151 <module name="HiddenField">
126152 <property name="ignoreConstructorParameter" value="true" />
127153 <property name="ignoreSetter" value="true" />
154+ <property name="setterCanReturnItsClass" value="true" />
128155 <property name="ignoreAbstractMethods" value="true" />
129156 </module>
157+ <module name="IllegalCatch" />
130158 <module name="IllegalInstantiation" />
159+ <module name="IllegalThrows" />
131160 <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" />
161+ <property name="tokens" value="LITERAL_NATIVE" />
138162 </module>
163+ <module name="IllegalTokenText" />
164+ <module name="IllegalType" />
139165 <module name="InnerAssignment" />
140166 <module name="MagicNumber" />
167+ <module name="MissingCtor" />
141168 <module name="MissingSwitchDefault" />
142169 <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" />
170+ <module name="MultipleStringLiterals" />
171+ <module name="MultipleVariableDeclarations" />
150172 <module name="NestedForDepth" />
151173 <module name="NestedIfDepth" />
152174 <module name="NestedTryDepth" />
153175 <module name="NoClone" />
154176 <module name="NoFinalizer" />
155- <module name="SuperClone" />
156- <module name="SuperFinalize" />
157- <module name="IllegalCatch" />
158- <module name="IllegalThrows" />
177+ <module name="OneStatementPerLine" />
178+ <module name="OverloadMethodsDeclarationOrder" />
159179 <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" />
166180 <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" />
173181 <module name="RequireThis">
174182 <property name="checkMethods" value="false" />
175183 </module>
184+ <module name="ReturnCount" />
185+ <module name="SimplifyBooleanExpression" />
186+ <module name="SimplifyBooleanReturn" />
187+ <module name="StringLiteralEquality" />
188+ <module name="SuperClone" />
189+ <module name="SuperFinalize" />
176190 <module name="UnnecessaryParentheses" />
177- <module name="OneStatementPerLine" />
191+ <module name="VariableDeclarationUsageDistance" />
178192
179193
180194 <!-- Imports -->
181195
182196 <module name="AvoidStarImport" />
183197 <module name="AvoidStaticImport" />
198+ <module name="CustomImportOrder" />
184199 <module name="IllegalImport" />
200+ <!--module name="ImportControl" /-->
201+ <module name="ImportOrder" />
185202 <module name="RedundantImport" />
186203 <module name="UnusedImports" />
187- <module name="ImportOrder" />
188-<!-- <module name="ImportControl" /> -->
189204
190205
191206 <!-- Javadoc Comments -->
192207
193- <module name="JavadocType" />
208+ <module name="AtclauseOrder" />
194209 <module name="JavadocMethod" />
195- <module name="JavadocVariable">
196- <property name="scope" value="protected" />
197- </module>
210+ <module name="JavadocParagraph" />
198211 <module name="JavadocStyle">
199212 <property
200213 name="endOfSentenceFormat"
@@ -202,7 +215,15 @@
202215 <property name="checkEmptyJavadoc" value="true" />
203216 <property name="checkHtml" value="true" />
204217 </module>
205-<!-- <module name="WriteTag" /> -->
218+ <module name="JavadocTagContinuationIndentation" />
219+ <module name="JavadocType" />
220+ <module name="JavadocVariable">
221+ <property name="scope" value="protected" />
222+ </module>
223+ <module name="NonEmptyAtclauseDescription" />
224+ <module name="SingleLineJavadoc" />
225+ <module name="SummaryJavadocCheck" />
226+ <module name="WriteTag" />
206227
207228
208229 <!-- Metrics -->
@@ -211,144 +232,124 @@
211232 <module name="ClassDataAbstractionCoupling" />
212233 <module name="ClassFanOutComplexity" />
213234 <module name="CyclomaticComplexity" />
214- <module name="NPathComplexity" />
215235 <module name="JavaNCSS" />
236+ <module name="NPathComplexity" />
216237
217238
218239 <!-- Miscellaneous -->
219240
220- <module name="TodoComment">
221- <property name="format" value="TODO" />
222- </module>
223- <module name="UncommentedMain" />
224- <module name="UpperEll" />
225241 <module name="ArrayTypeStyle" />
226-<!-- <module name="FinalParameters" /> -->
227-<!-- <module name="DescendantToken" /> -->
228-<!--
242+ <module name="AvoidEscapedUnicodeCharacters">
243+ <property name="allowEscapesForControlCharacters" value="true" />
244+ <property name="allowByTailComment" value="true" />
245+ <property name="allowIfAllCharactersEscaped" value="true" />
246+ <property name="allowNonPrintableEscapes" value="true" />
247+ </module>
248+ <module name="CommentsIndentation" />
249+ <module name="DescendantToken" />
250+ <module name="FinalParameters" />
229251 <module name="Indentation">
230252 <property name="caseIndent" value="0" />
231253 </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>
245254 <module name="OuterTypeFilename" />
255+ <module name="TodoComment">
256+ <property name="format" value="TODO" />
257+ </module>
258+ <module name="TrailingComment" />
259+ <module name="UncommentedMain" />
260+ <module name="UpperEll" />
246261
247262
248263 <!-- Modifiers -->
249264
265+ <module name="ClassMemberImpliedModifier" />
266+ <module name="InterfaceMemberImpliedModifier" />
250267 <module name="ModifierOrder" />
251268 <module name="RedundantModifier" />
252269
253270
254271 <!-- Naming Conventions -->
255272
256- <module name="AbstractClassName">
257- <property
258- name="format"
259- value="^Abstract.*$|^.*Factory$|^.*Builder$|^.*Adapter$"
260- />
261- </module>
273+ <module name="AbbreviationAsWordInName" />
274+ <module name="AbstractClassName" />
275+ <module name="CatchParameterName" />
262276 <module name="ClassTypeParameterName" />
263277 <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>
278+ <module name="InterfaceTypeParameterName" />
279+ <module name="LambdaParameterName" />
280+ <module name="LocalFinalVariableName" />
281+ <module name="LocalVariableName" />
282+ <module name="MemberName" />
273283 <module name="MethodName" />
274284 <module name="MethodTypeParameterName" />
275285 <module name="PackageName" />
276- <module name="ParameterName">
277- <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
286+ <module name="ParameterName" />
287+ <module name="StaticVariableName" />
288+ <module name="TypeName" />
289+
290+
291+ <!-- Regex -->
292+
293+ <module name="Regexp">
294+ <property name="format" value="@author" />
295+ <property name="illegalPattern" value="true" />
278296 </module>
279- <module name="StaticVariableName">
280- <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
297+ <module name="Regexp">
298+ <property name="format" value="^ \* Copyright\(c\)" />
299+ </module>
300+ <module name="Regexp">
301+ <property name="format" value="^ \* License : The MIT License" />
302+ <property name="duplicateLimit" value="1" />
303+ </module>
304+ <module name="RegexpSinglelineJava">
305+ <property name="format" value="\u0000" />
281306 </module>
282- <module name="TypeName" />
283307
284308
285309 <!-- Size Violations -->
286310
311+ <module name="AnonInnerLength" />
287312 <module name="ExecutableStatementCount" />
288313 <module name="LineLength">
289314 <property name="max" value="78" />
290315 </module>
316+ <module name="MethodCount" />
291317 <module name="MethodLength" />
292- <module name="AnonInnerLength" />
293- <module name="ParameterNumber" />
294318 <module name="OuterTypeNumber" />
295- <module name="MethodCount" />
319+ <module name="ParameterNumber" />
296320
297321
298322 <!-- Whitespace -->
299323
300- <module name="GenericWhitespace" />
301324 <module name="EmptyForInitializerPad" />
302325 <module name="EmptyForIteratorPad" />
303- <module name="MethodParamPad">
326+ <module name="EmptyLineSeparator">
304327 <property
305328 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- />
341- </module>
342- <module name="ParenPad">
343- <property name="option" value="nospace" />
344- <property
345- name="tokens"
346- value="CTOR_CALL, METHOD_CALL, SUPER_CTOR_CALL"
329+ value="PACKAGE_DEF,
330+ IMPORT,
331+ CLASS_DEF,
332+ INTERFACE_DEF,
333+ ENUM_DEF,
334+ STATIC_INIT,
335+ INSTANCE_INIT,
336+ METHOD_DEF,
337+ CTOR_DEF,
338+ "
347339 />
348340 </module>
341+ <module name="GenericWhitespace" />
342+ <module name="MethodParamPad" />
343+ <module name="NoLineWrap" />
344+ <module name="NoWhitespaceAfter" />
345+ <module name="NoWhitespaceBefore" />
346+ <module name="OperatorWrap" />
347+ <module name="ParenPad" />
348+ <module name="SeparatorWrap" />
349+ <module name="SingleSpaceSeparator" />
349350 <module name="TypecastParenPad" />
350- <module name="WhitespaceAfter">
351- <property name="tokens" value="COMMA, SEMI" />
351+ <module name="WhitespaceAfter" >
352+ <property name="tokens" value="COMMA, SEMI," />
352353 </module>
353354 <module name="WhitespaceAround">
354355 <property
@@ -368,19 +369,9 @@
368369 </module>
369370
370371
371-<!-- 代用品で解決
372- <module name="Header" />
373- <module name="RegexpSingleline" />
374- <module name="RegexpMultiline" />
375- <module name="RegexpSinglelineJava" />
376--->
372+ </module>
377373
378-<!-- Obsolated
379- <module name="TabCharacter" />
380--->
381374
382375 </module>
383376
384-</module>
385-
386377 <!-- 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>togagem</artifactId>
1818
19- <version>3.101.105-SNAPSHOT</version>
19+ <version>3.101.106</version>
2020
2121 <packaging>jar</packaging>
2222 <name>TogaGem</name>
@@ -26,18 +26,18 @@
2626 -->TogaGem is a sub-project of MikuToga project. <!--
2727 --></description>
2828
29- <url>http://sourceforge.jp/projects/mikutoga/</url>
29+ <url>https://ja.osdn.net/projects/mikutoga/devel/</url>
3030 <inceptionYear>2010</inceptionYear>
3131
3232 <organization>
3333 <name>MikuToga Partners</name>
34- <url>http://sourceforge.jp/projects/mikutoga/devel/</url>
34+ <url>https://ja.osdn.net/projects/mikutoga/devel/</url>
3535 </organization>
3636
3737 <licenses>
3838 <license>
3939 <name>The MIT License</name>
40- <url>http://www.opensource.org/licenses/mit-license.php</url>
40+ <url>https://opensource.org/licenses/MIT</url>
4141 <distribution>manual</distribution>
4242 </license>
4343 </licenses>
@@ -45,9 +45,9 @@
4545 <developers>
4646 <developer>
4747 <id>olyutorskii</id>
48- <url>http://sites.google.com/site/olyutorskiipit/</url>
48+ <url>https://sites.google.com/site/olyutorskiipit/</url>
4949 <organization>MikuToga Partners</organization>
50- <organizationUrl>http://sourceforge.jp/projects/mikutoga/devel/</organizationUrl>
50+ <organizationUrl>https://ja.osdn.net/projects/mikutoga/devel/</organizationUrl>
5151 <roles>
5252 <role>Project Founder</role>
5353 <role>Java Developer</role>
@@ -58,43 +58,61 @@
5858 <contributors/>
5959 <mailingLists/>
6060
61- <prerequisites>
62- <maven>2.2</maven>
63- </prerequisites>
61+ <!-- prerequisites/ -->
6462
6563 <modules/>
6664
6765 <scm>
68- <connection>scm:hg:http://hg.sourceforge.jp/view/mikutoga/TogaGem</connection>
69- <developerConnection>scm:hg:ssh://hg.sourceforge.jp//hgroot/mikutoga/TogaGem</developerConnection>
70- <url>http://hg.sourceforge.jp/view/mikutoga/TogaGem</url>
66+ <connection>scm:git:git://git.osdn.net/gitroot/mikutoga/TogaGem.git</connection>
67+ <developerConnection>scm:git:https://scm.osdn.net/gitroot/mikutoga/TogaGem.git</developerConnection>
68+ <url>https://osdn.net/projects/mikutoga/scm/git/TogaGem/</url>
7169 </scm>
7270
7371 <issueManagement>
74- <system>SourceForge.JP</system>
75- <url>http://sourceforge.jp/projects/mikutoga/ticket/</url>
72+ <system>OSDN.net</system>
73+ <url>https://ja.osdn.net/projects/mikutoga/ticket/</url>
7674 </issueManagement>
7775
7876 <ciManagement/>
7977 <distributionManagement/>
8078
8179 <properties>
82- <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
83-
84- <maven.compiler.source>1.6</maven.compiler.source>
85- <maven.compiler.target>1.6</maven.compiler.target>
80+ <maven.compiler.source>1.8</maven.compiler.source>
81+ <maven.compiler.target>1.8</maven.compiler.target>
8682
8783 <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
8884 <maven.compiler.showWarnings>true</maven.compiler.showWarnings>
8985
86+ <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
9087 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
9188 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
9289
93- <project.mainconf>${project.basedir}/src/main/config</project.mainconf>
90+ <locale>en</locale>
91+ <site.locales>${locale}</site.locales>
92+ <javadoc.locale>${locale}</javadoc.locale>
93+ <spotbugs.jvmArgs>-Duser.language=${locale}</spotbugs.jvmArgs>
94+
95+ <!-- Walk around: JDK 11 javadoc + Maven -->
96+ <detectJavaApiLink>false</detectJavaApiLink>
97+
98+ <surefire-plugin.version>3.0.0-M3</surefire-plugin.version>
99+ <jacoco-plugin.version>0.8.3</jacoco-plugin.version>
94100
95- <checkstyle.config.location>${project.mainconf}/checks.xml</checkstyle.config.location>
101+ <checkstyle-plugin.version>3.0.0</checkstyle-plugin.version>
102+ <checkstyleruntime.version>8.20</checkstyleruntime.version>
103+ <checkstyle.config.location>${project.basedir}/config/checkstyle/checkstyle.xml</checkstyle.config.location>
104+ <checkstyle.suppressions.location>${project.basedir}/config/checkstyle/checkstyle-suppressions.xml</checkstyle.suppressions.location>
96105 <checkstyle.enable.rss>false</checkstyle.enable.rss>
97106
107+ <pmd-plugin.version>3.12.0</pmd-plugin.version>
108+ <pmd.analysisCache>true</pmd.analysisCache>
109+
110+ <spotbugs-plugin.version>3.1.11</spotbugs-plugin.version>
111+ <spotbugs.effort>Max</spotbugs.effort>
112+ <spotbugs.threshold>Low</spotbugs.threshold>
113+ <!-- for Jenkins -->
114+ <spotbugs.xmlOutput>true</spotbugs.xmlOutput>
115+
98116 </properties>
99117
100118 <dependencyManagement/>
@@ -104,7 +122,7 @@
104122 <dependency>
105123 <groupId>junit</groupId>
106124 <artifactId>junit</artifactId>
107- <version>4.11</version>
125+ <version>4.12</version>
108126 <scope>test</scope>
109127 </dependency>
110128
@@ -114,97 +132,178 @@
114132 <pluginRepositories/>
115133
116134 <build>
117- <pluginManagement/>
135+
136+ <pluginManagement>
137+
138+ <plugins>
139+
140+ <plugin>
141+ <groupId>org.apache.maven.plugins</groupId>
142+ <artifactId>maven-checkstyle-plugin</artifactId>
143+ <version>${checkstyle-plugin.version}</version>
144+ <dependencies>
145+ <dependency>
146+ <groupId>com.puppycrawl.tools</groupId>
147+ <artifactId>checkstyle</artifactId>
148+ <version>${checkstyleruntime.version}</version>
149+ </dependency>
150+ </dependencies>
151+ </plugin>
152+
153+ </plugins>
154+
155+ </pluginManagement>
118156
119157 <plugins>
120158
121- <plugin>
122- <groupId>org.apache.maven.plugins</groupId>
123- <artifactId>maven-enforcer-plugin</artifactId>
124- <version>1.2</version>
125- <configuration>
126- <rules>
127- <requireMavenVersion>
128- <version>[3.0,)</version>
129- </requireMavenVersion>
130- <requireJavaVersion>
131- <version>[1.6,)</version>
132- </requireJavaVersion>
133- </rules>
134- </configuration>
135- </plugin>
136159
137- <plugin>
138- <groupId>org.apache.maven.plugins</groupId>
139- <artifactId>maven-install-plugin</artifactId>
140- <version>2.4</version>
141- </plugin>
160+ <!-- clean lifecycle -->
142161
143162 <plugin>
144163 <groupId>org.apache.maven.plugins</groupId>
145164 <artifactId>maven-clean-plugin</artifactId>
146- <version>2.5</version>
165+ <version>3.1.0</version>
147166 <configuration>
148167 <filesets>
149168 <fileset>
150169 <directory>${project.basedir}</directory>
151170 <includes>
152- <include>**/.DS_Store</include>
153- <include>**/_MACOSX</include>
171+ <include>**/*~</include>
172+ <include>**/*.swp</include>
173+ <include>**/*.DS_Store</include>
174+ <include>**/._*</include>
175+ <include>**/__MACOSX</include>
154176 <include>**/Thumbs.db</include>
155- <include>**/thumbs.db</include>
156- <include>**/Desktop.ini</include>
157177 <include>**/desktop.ini</include>
158178 <include>**/core</include>
179+ <include>**/hs_err_pid*</include>
159180 </includes>
160181 </fileset>
161182 </filesets>
162183 </configuration>
163184 </plugin>
164185
186+
187+ <!-- default lifecycle -->
188+
189+ <plugin>
190+ <groupId>org.apache.maven.plugins</groupId>
191+ <artifactId>maven-enforcer-plugin</artifactId>
192+ <version>3.0.0-M2</version>
193+ <executions>
194+ <execution>
195+ <id>enforce-versions</id>
196+ <goals>
197+ <goal>enforce</goal>
198+ </goals>
199+ <configuration>
200+ <rules>
201+ <requireMavenVersion>
202+ <version>[3.3.9,)</version>
203+ </requireMavenVersion>
204+ <requireJavaVersion>
205+ <!-- JAXB -->
206+ <version>1.8</version>
207+ </requireJavaVersion>
208+ </rules>
209+ </configuration>
210+ </execution>
211+ </executions>
212+ </plugin>
213+
214+ <plugin>
215+ <groupId>org.apache.maven.plugins</groupId>
216+ <artifactId>maven-resources-plugin</artifactId>
217+ <version>3.1.0</version>
218+ </plugin>
219+
165220 <plugin>
166221 <groupId>org.apache.maven.plugins</groupId>
167222 <artifactId>maven-compiler-plugin</artifactId>
168- <version>3.1</version>
223+ <version>3.8.0</version>
169224 <configuration>
170- <source>1.6</source> <!-- for NetBeans IDE -->
171- <target>1.6</target>
172- <showDeprecation>true</showDeprecation>
173- <showWarnings>true</showWarnings>
225+ <source>1.8</source> <!-- for NetBeans IDE -->
226+ <target>1.8</target>
174227 <compilerArguments>
175228 <Xlint/>
176229 </compilerArguments>
230+ <showWarnings>true</showWarnings>
231+ <showDeprecation>true</showDeprecation>
177232 </configuration>
178233 </plugin>
179234
180235 <plugin>
181236 <groupId>org.apache.maven.plugins</groupId>
182- <artifactId>maven-jar-plugin</artifactId>
183- <version>2.4</version>
237+ <artifactId>maven-surefire-plugin</artifactId>
238+ <version>${surefire-plugin.version}</version>
184239 <configuration>
185- <archive>
186- <manifestEntries>
187- <Built-By>${project.organization.name}</Built-By>
188- </manifestEntries>
189- </archive>
240+ <enableAssertions>true</enableAssertions>
190241 </configuration>
191242 </plugin>
192243
193244 <plugin>
245+ <groupId>org.jacoco</groupId>
246+ <artifactId>jacoco-maven-plugin</artifactId>
247+ <version>${jacoco-plugin.version}</version>
248+ <executions>
249+ <execution>
250+ <id>default-prepare-agent</id>
251+ <goals>
252+ <goal>prepare-agent</goal>
253+ </goals>
254+ </execution>
255+ <execution>
256+ <id>default-report</id>
257+ <phase>prepare-package</phase>
258+ <goals>
259+ <goal>report</goal>
260+ </goals>
261+ </execution>
262+ <execution>
263+ <id>default-check</id>
264+ <goals>
265+ <goal>check</goal>
266+ </goals>
267+ <configuration>
268+ <rules>
269+ <rule implementation="org.jacoco.maven.RuleConfiguration">
270+ <element>BUNDLE</element>
271+ <limits>
272+ <limit implementation="org.jacoco.report.check.Limit">
273+ <counter>COMPLEXITY</counter>
274+ <value>COVEREDRATIO</value>
275+ <minimum>0.0</minimum>
276+ </limit>
277+ </limits>
278+ </rule>
279+ </rules>
280+ </configuration>
281+ </execution>
282+ </executions>
283+ </plugin>
284+
285+ <plugin>
194286 <groupId>org.apache.maven.plugins</groupId>
195- <artifactId>maven-assembly-plugin</artifactId>
196- <version>2.4</version>
287+ <artifactId>maven-jar-plugin</artifactId>
288+ <version>3.1.1</version>
197289 <configuration>
198- <descriptors>
199- <descriptor>src/main/assembly/descriptor.xml</descriptor>
200- </descriptors>
290+ <archive>
291+ <manifest>
292+ <addDefaultImplementationEntries>
293+ true
294+ </addDefaultImplementationEntries>
295+ </manifest>
296+ <manifestEntries>
297+ <Built-By>${project.organization.name}</Built-By>
298+ </manifestEntries>
299+ </archive>
201300 </configuration>
202301 </plugin>
203302
204303 <plugin>
205304 <groupId>org.apache.maven.plugins</groupId>
206305 <artifactId>maven-source-plugin</artifactId>
207- <version>2.2.1</version>
306+ <version>3.0.1</version>
208307 <configuration>
209308 <includePom>true</includePom>
210309 <archive>
@@ -226,76 +325,63 @@
226325
227326 <plugin>
228327 <groupId>org.apache.maven.plugins</groupId>
229- <artifactId>maven-resources-plugin</artifactId>
230- <version>2.6</version>
328+ <artifactId>maven-install-plugin</artifactId>
329+ <version>3.0.0-M1</version>
231330 </plugin>
232331
233332 <plugin>
234333 <groupId>org.apache.maven.plugins</groupId>
235- <artifactId>maven-surefire-plugin</artifactId>
236- <version>2.14.1</version>
334+ <artifactId>maven-deploy-plugin</artifactId>
335+ <version>3.0.0-M1</version>
336+ </plugin>
337+
338+
339+ <!-- site lifecycle -->
340+
341+ <plugin>
342+ <groupId>org.apache.maven.plugins</groupId>
343+ <artifactId>maven-site-plugin</artifactId>
344+ <version>3.7.1</version>
237345 <configuration>
238- <skipTests>false</skipTests>
239- <enableAssertions>true</enableAssertions>
346+ <locales>${site.locales}</locales>
240347 </configuration>
241348 </plugin>
242349
350+
351+ <!-- goals without lifecycle -->
352+
243353 <plugin>
244354 <groupId>org.apache.maven.plugins</groupId>
245- <artifactId>maven-site-plugin</artifactId>
246- <version>3.3</version>
355+ <artifactId>maven-assembly-plugin</artifactId>
356+ <version>3.1.1</version>
247357 <configuration>
248- <generateReports>true</generateReports>
249- <locales>ja</locales>
250- <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
251- <outputEncoding>${project.reporting.outputEncoding}</outputEncoding>
358+ <descriptors>
359+ <descriptor>src/assembly/src.xml</descriptor>
360+ </descriptors>
252361 </configuration>
253362 </plugin>
254363
255364 <plugin>
256365 <groupId>org.apache.maven.plugins</groupId>
257366 <artifactId>maven-checkstyle-plugin</artifactId>
258- <version>2.10</version>
259- <!-- config from property value -->
367+ <version>${checkstyle-plugin.version}</version>
260368 </plugin>
261369
262370 <plugin>
263371 <groupId>org.apache.maven.plugins</groupId>
264372 <artifactId>maven-pmd-plugin</artifactId>
265- <version>3.0.1</version>
373+ <version>${pmd-plugin.version}</version>
266374 <configuration>
267- <targetJdk>${maven.compiler.target}</targetJdk>
268375 <rulesets>
269- <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
376+ <ruleset>${project.basedir}/config/pmd/pmdrules.xml</ruleset>
270377 </rulesets>
271378 </configuration>
272379 </plugin>
273380
274381 <plugin>
275- <groupId>org.codehaus.mojo</groupId>
276- <artifactId>findbugs-maven-plugin</artifactId>
277- <version>2.5.2</version>
278- <configuration>
279- <effort>Max</effort>
280- <threshold>Low</threshold>
281- <!-- for Jenkins -->
282- <findbugsXmlOutput>true</findbugsXmlOutput>
283- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
284- <xmlOutput>true</xmlOutput>
285- </configuration>
286- </plugin>
287-
288- <plugin>
289- <groupId>org.codehaus.mojo</groupId>
290- <artifactId>cobertura-maven-plugin</artifactId>
291- <version>2.5.2</version>
292- <configuration>
293- <encoding>${project.build.sourceEncoding}</encoding>
294- <formats>
295- <format>html</format>
296- <format>xml</format> <!-- for Jenkins -->
297- </formats>
298- </configuration>
382+ <groupId>com.github.spotbugs</groupId>
383+ <artifactId>spotbugs-maven-plugin</artifactId>
384+ <version>${spotbugs-plugin.version}</version>
299385 </plugin>
300386
301387 </plugins>
@@ -334,7 +420,7 @@
334420 <exclude>**/version.properties</exclude>
335421
336422 <exclude>**/.DS_Store</exclude>
337- <exclude>**/_MACOSX</exclude>
423+ <exclude>**/__MACOSX</exclude>
338424 <exclude>**/Thumbs.db</exclude>
339425 <exclude>**/thumbs.db</exclude>
340426 <exclude>**/Desktop.ini</exclude>
@@ -354,7 +440,7 @@
354440 <plugin>
355441 <groupId>org.apache.maven.plugins</groupId>
356442 <artifactId>maven-project-info-reports-plugin</artifactId>
357- <version>2.7</version>
443+ <version>3.0.0</version>
358444 <configuration>
359445 <linkOnly>true</linkOnly>
360446 <offline>true</offline>
@@ -364,20 +450,21 @@
364450 <reports>
365451 <report>index</report>
366452 <report>summary</report>
367- <report>license</report>
453+ <report>licenses</report>
454+ <report>dependency-info</report>
368455 <report>dependencies</report>
456+ <report>dependency-convergence</report>
369457 <report>plugins</report>
458+ <report>plugin-management</report>
459+ <report>team</report>
460+ <report>issue-management</report>
370461 <report>scm</report>
371- <report>project-team</report>
372462 <!--
373- <report>dependency-convergence</report>
374- <report>dependency-info</report>
375463 <report>dependency-management</report>
376464 <report>distribution-management</report>
377- <report>issue-tracking</report>
378- <report>mailing-list</report>
465+ <report>ci-management</report>
466+ <report>mailing-lists</report>
379467 <report>modules</report>
380- <report>plugin-management</report>
381468 -->
382469 </reports>
383470 </reportSet>
@@ -387,13 +474,17 @@
387474 <plugin>
388475 <groupId>org.apache.maven.plugins</groupId>
389476 <artifactId>maven-javadoc-plugin</artifactId>
390- <version>2.9</version>
477+ <version>3.1.0</version>
391478 <configuration>
392- <skip>false</skip>
479+ <author>false</author>
393480 <notimestamp>true</notimestamp>
394481 <quiet>true</quiet>
395482 <show>protected</show>
396- <stylesheet>maven</stylesheet>
483+ <header>${project.name} ${project.version} API</header>
484+ <version>true</version>
485+ <locale>${javadoc.locale}</locale>
486+ <!-- for JDK11 javadoc -->
487+ <additionalJOption>-J-Duser.language=${javadoc.locale}</additionalJOption>
397488 </configuration>
398489 <reportSets>
399490 <reportSet>
@@ -407,49 +498,32 @@
407498 <plugin>
408499 <groupId>org.apache.maven.plugins</groupId>
409500 <artifactId>maven-jxr-plugin</artifactId>
410- <version>2.3</version>
411- <configuration>
412- <skip>false</skip>
413- </configuration>
501+ <version>3.0.0</version>
414502 </plugin>
415503
416504 <plugin>
417505 <groupId>org.apache.maven.plugins</groupId>
418506 <artifactId>maven-surefire-report-plugin</artifactId>
419- <version>2.14.1</version>
420- <configuration>
421- <showSuccess>false</showSuccess>
422- </configuration>
507+ <version>${surefire-plugin.version}</version>
508+ </plugin>
509+
510+ <plugin>
511+ <groupId>org.jacoco</groupId>
512+ <artifactId>jacoco-maven-plugin</artifactId>
513+ <version>${jacoco-plugin.version}</version>
423514 <reportSets>
424515 <reportSet>
425516 <reports>
426- <report>report-only</report>
517+ <report>report</report>
427518 </reports>
428519 </reportSet>
429520 </reportSets>
430521 </plugin>
431522
432523 <plugin>
433- <groupId>org.codehaus.mojo</groupId>
434- <artifactId>cobertura-maven-plugin</artifactId>
435- <version>2.5.2</version>
436- <configuration>
437- <encoding>${project.build.sourceEncoding}</encoding>
438- <formats>
439- <format>html</format>
440- <format>xml</format> <!-- for Jenkins -->
441- </formats>
442- </configuration>
443- </plugin>
444-
445- <plugin>
446524 <groupId>org.apache.maven.plugins</groupId>
447525 <artifactId>maven-checkstyle-plugin</artifactId>
448- <version>2.10</version>
449- <configuration>
450- <skip>false</skip>
451- <!-- config from property value -->
452- </configuration>
526+ <version>${checkstyle-plugin.version}</version>
453527 <reportSets>
454528 <reportSet>
455529 <reports>
@@ -462,12 +536,10 @@
462536 <plugin>
463537 <groupId>org.apache.maven.plugins</groupId>
464538 <artifactId>maven-pmd-plugin</artifactId>
465- <version>3.0.1</version>
539+ <version>${pmd-plugin.version}</version>
466540 <configuration>
467- <skip>false</skip>
468- <targetJdk>${maven.compiler.target}</targetJdk>
469541 <rulesets>
470- <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
542+ <ruleset>${project.basedir}/config/pmd/pmdrules.xml</ruleset>
471543 </rulesets>
472544 </configuration>
473545 <reportSets>
@@ -481,31 +553,9 @@
481553 </plugin>
482554
483555 <plugin>
484- <groupId>org.codehaus.mojo</groupId>
485- <artifactId>findbugs-maven-plugin</artifactId>
486- <version>2.5.2</version>
487- <configuration>
488- <skip>false</skip>
489- <effort>Max</effort>
490- <threshold>Low</threshold>
491- <!-- for Jenkins -->
492- <findbugsXmlOutput>true</findbugsXmlOutput>
493- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
494- <xmlOutput>true</xmlOutput>
495- <!-- excludeFilterFile/ -->
496- </configuration>
497- </plugin>
498-
499- <plugin>
500- <groupId>org.codehaus.mojo</groupId>
501- <artifactId>javancss-maven-plugin</artifactId>
502- <version>2.0</version>
503- </plugin>
504-
505- <plugin>
506- <groupId>org.codehaus.mojo</groupId>
507- <artifactId>jdepend-maven-plugin</artifactId>
508- <version>2.0-beta-2</version>
556+ <groupId>com.github.spotbugs</groupId>
557+ <artifactId>spotbugs-maven-plugin</artifactId>
558+ <version>${spotbugs-plugin.version}</version>
509559 </plugin>
510560
511561 </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/typical/I18nAlias.java
+++ b/src/main/java/jp/sfjp/mikutoga/typical/I18nAlias.java
@@ -22,7 +22,7 @@ import org.w3c.dom.Element;
2222 import org.xml.sax.SAXException;
2323
2424 /**
25- * 国際化&別名管理オブジェクトの実装基板。
25+ * 国際化&amp;別名管理オブジェクトの実装基板。
2626 * <p>別名管理オブジェクトは、
2727 * 各々のリストの先頭が代表名となる、
2828 * プライマリ名の不変リストとグローバル名の不変リストを持つ。
--- a/src/main/java/jp/sfjp/mikutoga/xml/XmlExporter.java
+++ b/src/main/java/jp/sfjp/mikutoga/xml/XmlExporter.java
@@ -134,7 +134,7 @@ public interface XmlExporter extends Appendable, Flushable, Closeable{
134134 /**
135135 * 指定された文字を16進2桁の文字参照形式で出力する。
136136 * <p>「A」は「&amp;#x41;」になる。
137- * <p>2桁で出力できない場合(>0x00ff)は4桁で出力する。
137+ * <p>2桁で出力できない場合(&gt;0x00ff)は4桁で出力する。
138138 * @param ch 文字
139139 * @return this本体
140140 * @throws IOException 出力エラー
Show on old repository browser