Jindolfプロジェクトは、CGIゲーム「人狼BBS」を快適にプレイするための専用クライアントを製作するために発足したオープンソースプロジェクトです。
Revision | 8db2173d0ed26d6f23971f9c86cfc35fa46bce55 (tree) |
---|---|
Time | 2017-04-09 17:55:10 |
Author | Olyutorskii <olyutorskii@user...> |
Commiter | Olyutorskii |
merge release/3.302.4
@@ -27,7 +27,7 @@ syntax: regexp | ||
27 | 27 | syntax: glob |
28 | 28 | |
29 | 29 | .DS_Store |
30 | -_MACOSX | |
30 | +__MACOSX | |
31 | 31 | [Tt]humbs.db |
32 | 32 | [Dd]esktop.ini |
33 | 33 | core |
@@ -4,6 +4,9 @@ | ||
4 | 4 | Jindolf 変更履歴 |
5 | 5 | |
6 | 6 | |
7 | +3.302.4 (2017-04-09) | |
8 | + ・F国URL修正に伴い JinCore 1.206.10 に対応。 | |
9 | + | |
7 | 10 | 3.302.2 (2016-06-26) |
8 | 11 | ・必須環境をJRE7に引き上げ。 |
9 | 12 | ・OSDN.JP対応。 |
@@ -38,10 +38,9 @@ | ||
38 | 38 | 必要とします。開発時はMaven等を用いてこれらのライブラリを用意してください。 |
39 | 39 | |
40 | 40 | |
41 | - | |
42 | 41 | === 開発プロジェクト運営元 === |
43 | 42 | |
44 | - https://osdn.jp/projects/jindolf/devel/ まで。 | |
43 | + https://ja.osdn.net/projects/jindolf/ まで。 | |
45 | 44 | |
46 | 45 | |
47 | 46 | === ソフトウェア利用者向けポータルサイト === |
@@ -68,6 +67,15 @@ | ||
68 | 67 | ./pom.xml |
69 | 68 | Maven3用プロジェクト構成定義ファイル。 |
70 | 69 | |
70 | +./checkstyle.xml | |
71 | + Checkstyle用configファイル。 | |
72 | + | |
73 | +./pmdrules.xml | |
74 | + PMD用ルール定義ファイル。 | |
75 | + | |
76 | +./src/assembly/src.xml | |
77 | + ソースアーカイブ構成定義ファイル。 | |
78 | + | |
71 | 79 | ./src/main/java/ |
72 | 80 | Javaのソースコード。 |
73 | 81 |
@@ -77,17 +85,5 @@ | ||
77 | 85 | ./src/test/java/ |
78 | 86 | JUnit 4.* 用のユニットテストコード。 |
79 | 87 | |
80 | -./src/main/config/ | |
81 | - 各種ビルド・構成管理に必要なファイル群。 | |
82 | - | |
83 | -./src/main/config/checks.xml | |
84 | - Checkstyle用configファイル。 | |
85 | - | |
86 | -./src/main/config/pmdrules.xml | |
87 | - PMD用ルール定義ファイル。 | |
88 | - | |
89 | -./src/main/assembly/descriptor.xml | |
90 | - ソースアーカイブ構成定義ファイル。 | |
91 | - | |
92 | 88 | |
93 | 89 | --- EOF --- |
@@ -10,10 +10,10 @@ | ||
10 | 10 | |
11 | 11 | このアーカイブの原本は、Mercurial(hg)でバージョン管理されています。 |
12 | 12 | このアーカイブの原本となる開発資産は、 |
13 | - https://osdn.jp/projects/jindolf/scm/hg/Jindolf/ | |
13 | + https://ja.osdn.net/projects/jindolf/scm/hg/Jindolf/ | |
14 | 14 | を上位に持つMercurialリポジトリで管理されています。 |
15 | 15 | アーカイブの代わりにMercurialを通じての開発資産へのアクセスが可能です。 |
16 | - # hg clone http://hg.osdn.jp/view/jindolf/Jindolf | |
16 | + # hg clone http://hg.osdn.net/view/jindolf/Jindolf | |
17 | 17 | |
18 | 18 | |
19 | 19 | === 各種設定ファイル === |
@@ -42,7 +42,7 @@ EOL Extensionを有効にしないと設定が反映されません。 | ||
42 | 42 | ・https://www.mercurial-scm.org/wiki/.hgignore |
43 | 43 | ・https://www.selenic.com/mercurial/hgignore.5.html |
44 | 44 | ・https://www.mercurial-scm.org/wiki/EolExtension |
45 | -・http://tortoisehg.bitbucket.org/ | |
45 | +・https://tortoisehg.bitbucket.io/ | |
46 | 46 | |
47 | 47 | |
48 | 48 | --- EOF --- |
@@ -5,8 +5,8 @@ | ||
5 | 5 | "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd"> |
6 | 6 | |
7 | 7 | <!-- |
8 | - Checkstyle用警告抑止設定 | |
9 | - ※ SuppressionFilter モジュール用 | |
8 | + Checkstyle suppressions | |
9 | + for Checkstyle 6.19(7.4) or later | |
10 | 10 | |
11 | 11 | [ http://checkstyle.sourceforge.net/ ] |
12 | 12 |
@@ -31,14 +31,14 @@ | ||
31 | 31 | |
32 | 32 | <!-- Javadoc Comments --> |
33 | 33 | <suppress files="" checks="SummaryJavadocCheck" /> |
34 | - <!-- 句読点対応待ち --> | |
35 | - <suppress files="" checks="SingleLineJavadoc" /> | |
36 | - <!-- ignoredTagsプロパティ対応待ち --> | |
37 | 34 | |
38 | 35 | <!-- Miscellaneous --> |
39 | 36 | <suppress files="" checks="FinalParameters" /> |
40 | 37 | <suppress files="" checks="TrailingComment" /> |
41 | 38 | |
39 | + <!-- Whitespace --> | |
40 | + <suppress files="" checks="SingleSpaceSeparator" /> | |
41 | + | |
42 | 42 | </suppressions> |
43 | 43 | |
44 | 44 |
@@ -5,9 +5,8 @@ | ||
5 | 5 | "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> |
6 | 6 | |
7 | 7 | <!-- |
8 | - Checkstyle用チェック項目定義。 | |
9 | - | |
10 | - Checkstyle 6.1 以降向けに記述。 | |
8 | + Checkstyle modules | |
9 | + for Checkstyle 6.19(7.4) or later | |
11 | 10 | |
12 | 11 | [ http://checkstyle.sourceforge.net/ ] |
13 | 12 |
@@ -19,21 +18,25 @@ | ||
19 | 18 | |
20 | 19 | <property name="charset" value="UTF-8" /> |
21 | 20 | <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" /> | |
23 | 24 | <property name="severity" value="error" /> |
24 | 25 | |
25 | 26 | |
26 | 27 | <!-- Filters --> |
27 | 28 | <module name="SeverityMatchFilter" /> |
28 | 29 | <module name="SuppressionCommentFilter" /> |
29 | - <module name="SuppressionFilter"> | |
30 | - <property name="file" value="src/main/config/suppressions.xml" /> | |
31 | - </module> | |
30 | + <module name="SuppressionFilter" /> | |
32 | 31 | <module name="SuppressWarningsFilter" /> |
33 | 32 | <module name="SuppressWithNearbyCommentFilter" /> |
34 | 33 | |
35 | 34 | |
36 | 35 | <!-- Headers --> |
36 | + <module name="Header"> | |
37 | + <property name="header" value="<?xml version="1.0" encoding="UTF-8" ?>" /> | |
38 | + <property name="fileExtensions" value="xml" /> | |
39 | + </module> | |
37 | 40 | <module name="RegexpHeader"> |
38 | 41 | <property name="header" value="^/\*$\n^ \*( .*)?$\n^ \*/$\n" /> |
39 | 42 | <property name="multiLines" value="2" /> |
@@ -57,7 +60,7 @@ | ||
57 | 60 | <module name="RegexpMultiline"> |
58 | 61 | <property name="format" value="[\u000b\f\u001a]" /> |
59 | 62 | </module> |
60 | -<!--<module name="RegexpOnFilename" /> 6.15 or later --> | |
63 | + <module name="RegexpOnFilename" /> | |
61 | 64 | <module name="RegexpSingleline"> |
62 | 65 | <property name="format" value="\s+$" /> |
63 | 66 | </module> |
@@ -68,9 +71,7 @@ | ||
68 | 71 | |
69 | 72 | |
70 | 73 | <!-- Size Violations --> |
71 | - <module name="FileLength"> | |
72 | - <property name="max" value="2000"/> | |
73 | - </module> | |
74 | + <module name="FileLength" /> | |
74 | 75 | |
75 | 76 | |
76 | 77 | <!-- Whitespace --> |
@@ -80,6 +81,7 @@ | ||
80 | 81 | <module name="TreeWalker"> |
81 | 82 | |
82 | 83 | <property name="tabWidth" value="8"/> |
84 | + <property name="fileExtensions" value="java"/> | |
83 | 85 | |
84 | 86 | |
85 | 87 | <!-- Annotations --> |
@@ -94,12 +96,13 @@ | ||
94 | 96 | |
95 | 97 | |
96 | 98 | <!-- Block Checks --> |
99 | + | |
97 | 100 | <module name="AvoidNestedBlocks" /> |
98 | 101 | <module name="EmptyBlock" /> |
99 | -<!-- <module name="EmptyCatchBlock" /> 6.4 or later --> | |
102 | + <module name="EmptyCatchBlock" /> | |
100 | 103 | <module name="LeftCurly" /> |
101 | 104 | <module name="NeedBraces"> |
102 | - <property name="tokens" value="LITERAL_DO" /> | |
105 | + <property name="allowSingleLineStatement" value="true" /> | |
103 | 106 | </module> |
104 | 107 | <module name="RightCurly" /> |
105 | 108 |
@@ -113,9 +116,7 @@ | ||
113 | 116 | <module name="InterfaceIsType" /> |
114 | 117 | <module name="MutableException" /> |
115 | 118 | <module name="OneTopLevelClass" /> |
116 | - <module name="ThrowsCount"> | |
117 | - <property name="max" value="4" /> | |
118 | - </module> | |
119 | + <module name="ThrowsCount" /> | |
119 | 120 | <module name="VisibilityModifier" /> |
120 | 121 | |
121 | 122 |
@@ -135,6 +136,7 @@ | ||
135 | 136 | <module name="HiddenField"> |
136 | 137 | <property name="ignoreConstructorParameter" value="true" /> |
137 | 138 | <property name="ignoreSetter" value="true" /> |
139 | + <property name="setterCanReturnItsClass" value="true" /> | |
138 | 140 | <property name="ignoreAbstractMethods" value="true" /> |
139 | 141 | </module> |
140 | 142 | <module name="IllegalCatch" /> |
@@ -143,11 +145,7 @@ | ||
143 | 145 | <module name="IllegalToken"> |
144 | 146 | <property name="tokens" value="LITERAL_NATIVE" /> |
145 | 147 | </module> |
146 | - <module name="IllegalTokenText"> | |
147 | - <property name="tokens" value="NUM_INT, NUM_LONG" /> | |
148 | - <property name="format" value="^0_*[0-7]" /> | |
149 | - <property name="message" value="inhibit octal number" /> | |
150 | - </module> | |
148 | + <module name="IllegalTokenText" /> | |
151 | 149 | <module name="IllegalType" /> |
152 | 150 | <module name="InnerAssignment" /> |
153 | 151 | <module name="MagicNumber" /> |
@@ -156,9 +154,6 @@ | ||
156 | 154 | <module name="ModifiedControlVariable" /> |
157 | 155 | <module name="MultipleStringLiterals" /> |
158 | 156 | <module name="MultipleVariableDeclarations" /> |
159 | - <module name="SimplifyBooleanExpression" /> | |
160 | - <module name="SimplifyBooleanReturn" /> | |
161 | - <module name="StringLiteralEquality" /> | |
162 | 157 | <module name="NestedForDepth" /> |
163 | 158 | <module name="NestedIfDepth" /> |
164 | 159 | <module name="NestedTryDepth" /> |
@@ -169,20 +164,16 @@ | ||
169 | 164 | <module name="PackageDeclaration" /> |
170 | 165 | <module name="ParameterAssignment" /> |
171 | 166 | <module name="RequireThis"> |
172 | - <property name="checkMethods" value="false" /> | |
173 | - </module> | |
174 | - <module name="ReturnCount"> | |
175 | - <property name="max" value="5" /> | |
167 | + <!--property name="checkMethods" value="false" /--> | |
176 | 168 | </module> |
169 | + <module name="ReturnCount" /> | |
177 | 170 | <module name="SimplifyBooleanExpression" /> |
178 | 171 | <module name="SimplifyBooleanReturn" /> |
179 | 172 | <module name="StringLiteralEquality" /> |
180 | 173 | <module name="SuperClone" /> |
181 | 174 | <module name="SuperFinalize" /> |
182 | 175 | <module name="UnnecessaryParentheses" /> |
183 | - <module name="VariableDeclarationUsageDistance"> | |
184 | - <property name="allowedDistance" value="5" /> | |
185 | - </module> | |
176 | + <module name="VariableDeclarationUsageDistance" /> | |
186 | 177 | |
187 | 178 | |
188 | 179 | <!-- Imports --> |
@@ -239,7 +230,7 @@ | ||
239 | 230 | <property name="allowIfAllCharactersEscaped" value="true"/> |
240 | 231 | <property name="allowNonPrintableEscapes" value="true"/> |
241 | 232 | </module> |
242 | -<!-- <module name="CommentsIndentation" /> 6.10 or later --> | |
233 | + <module name="CommentsIndentation" /> | |
243 | 234 | <module name="DescendantToken" /> |
244 | 235 | <module name="FileContentsHolder" /> |
245 | 236 | <module name="FinalParameters" /> |
@@ -264,34 +255,19 @@ | ||
264 | 255 | <!-- Naming Conventions --> |
265 | 256 | |
266 | 257 | <module name="AbbreviationAsWordInName" /> |
267 | - <module name="AbstractClassName"> | |
268 | - <property | |
269 | - name="format" | |
270 | - value="^Abstract.*$|^.*Factory$|^.*Builder$|^.*Adapter$" | |
271 | - /> | |
272 | - </module> | |
273 | -<!-- <module name="CatchParameterName" /> 6.14 or later --> | |
258 | + <module name="AbstractClassName" /> | |
259 | + <module name="CatchParameterName" /> | |
274 | 260 | <module name="ClassTypeParameterName" /> |
275 | 261 | <module name="ConstantName" /> |
276 | 262 | <module name="InterfaceTypeParameterName" /> |
277 | - <module name="LocalFinalVariableName"> | |
278 | - <property name="format" value="^[a-z][_a-zA-Z0-9]*$" /> | |
279 | - </module> | |
280 | - <module name="LocalVariableName"> | |
281 | - <property name="format" value="^[a-z][_a-zA-Z0-9]*$" /> | |
282 | - </module> | |
283 | - <module name="MemberName"> | |
284 | - <property name="format" value="^[a-z][_a-zA-Z0-9]*$" /> | |
285 | - </module> | |
263 | + <module name="LocalFinalVariableName" /> | |
264 | + <module name="LocalVariableName" /> | |
265 | + <module name="MemberName" /> | |
286 | 266 | <module name="MethodName" /> |
287 | 267 | <module name="MethodTypeParameterName" /> |
288 | 268 | <module name="PackageName" /> |
289 | - <module name="ParameterName"> | |
290 | - <property name="format" value="^[a-z][_a-zA-Z0-9]*$" /> | |
291 | - </module> | |
292 | - <module name="StaticVariableName"> | |
293 | - <property name="format" value="^[a-z][_a-zA-Z0-9]*$" /> | |
294 | - </module> | |
269 | + <module name="ParameterName" /> | |
270 | + <module name="StaticVariableName" /> | |
295 | 271 | <module name="TypeName" /> |
296 | 272 | |
297 | 273 |
@@ -361,32 +337,7 @@ | ||
361 | 337 | <property name="allowLineBreaks" value="false" /> |
362 | 338 | <property name="tokens" value="COMMA, POST_INC, POST_DEC" /> |
363 | 339 | </module> |
364 | - <module name="NoWhitespaceBefore"> | |
365 | - <property name="allowLineBreaks" value="true" /> | |
366 | - <property name="tokens" value="SEMI" /> | |
367 | - </module> | |
368 | - <module name="OperatorWrap"> | |
369 | - <property name="option" value="eol" /> | |
370 | - <property | |
371 | - name="tokens" | |
372 | - value="ASSIGN, | |
373 | - BAND_ASSIGN, BOR_ASSIGN, BXOR_ASSIGN, | |
374 | - PLUS_ASSIGN, MINUS_ASSIGN, | |
375 | - STAR_ASSIGN, DIV_ASSIGN, MOD_ASSIGN, | |
376 | - SL_ASSIGN, SR_ASSIGN, BSR_ASSIGN" | |
377 | - /> | |
378 | - </module> | |
379 | - <module name="OperatorWrap"> | |
380 | - <property name="option" value="nl" /> | |
381 | - <property | |
382 | - name="tokens" | |
383 | - value="QUESTION, | |
384 | - BAND, BOR, BXOR, | |
385 | - PLUS, MINUS, STAR, DIV, MOD, | |
386 | - LAND, LOR, | |
387 | - EQUAL, NOT_EQUAL" | |
388 | - /> | |
389 | - </module> | |
340 | + <module name="OperatorWrap" /> | |
390 | 341 | <module name="ParenPad"> |
391 | 342 | <property name="option" value="nospace" /> |
392 | 343 | <property |
@@ -398,8 +349,11 @@ | ||
398 | 349 | <property name="tokens" value="DOT" /> |
399 | 350 | <property name="option" value="nl" /> |
400 | 351 | </module> |
352 | + <module name="SingleSpaceSeparator" /> | |
401 | 353 | <module name="TypecastParenPad" /> |
402 | - <module name="WhitespaceAfter" /> | |
354 | + <module name="WhitespaceAfter" > | |
355 | + <property name="tokens" value="COMMA, SEMI,"/> | |
356 | + </module> | |
403 | 357 | <module name="WhitespaceAround"> |
404 | 358 | <property |
405 | 359 | name="tokens" |
@@ -420,6 +374,7 @@ | ||
420 | 374 | |
421 | 375 | </module> |
422 | 376 | |
377 | + | |
423 | 378 | </module> |
424 | 379 | |
425 | 380 | <!-- EOF --> |
@@ -1,9 +1,8 @@ | ||
1 | 1 | <?xml version="1.0" encoding="UTF-8" ?> |
2 | 2 | |
3 | 3 | <!-- |
4 | - PMD用ルールセット定義 | |
5 | - | |
6 | - PMD [ https://pmd.github.io/ ] 5.3 以降用に記述されています。 | |
4 | + Custom rule set | |
5 | + for PMD [ https://pmd.github.io/ ] 5.5.2 or later | |
7 | 6 | |
8 | 7 | Copyright(c) 2016 olyutorskii |
9 | 8 | --> |
@@ -17,12 +16,10 @@ | ||
17 | 16 | > |
18 | 17 | |
19 | 18 | <description> |
20 | - custom rulesets for project | |
19 | + custom rulesets | |
21 | 20 | </description> |
22 | 21 | |
23 | -<!-- | |
24 | 22 | <rule ref="rulesets/java/android.xml" /> |
25 | ---> | |
26 | 23 | |
27 | 24 | <rule ref="rulesets/java/basic.xml" /> |
28 | 25 |
@@ -33,18 +30,10 @@ | ||
33 | 30 | |
34 | 31 | <rule ref="rulesets/java/clone.xml" /> |
35 | 32 | |
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> | |
33 | + <rule ref="rulesets/java/codesize.xml" /> | |
44 | 34 | |
45 | 35 | <rule ref="rulesets/java/comments.xml"> |
46 | - <exclude name="CommentRequired" /> | |
47 | - <exclude name="CommentSize" /> | |
36 | + <exclude name="CommentDefaultAccessModifier" /> | |
48 | 37 | </rule> |
49 | 38 | <rule ref="rulesets/java/comments.xml/CommentRequired" > |
50 | 39 | <properties> |
@@ -58,13 +47,10 @@ | ||
58 | 47 | </rule> |
59 | 48 | |
60 | 49 | <rule ref="rulesets/java/controversial.xml"> |
61 | - <exclude name="NullAssignment" /> | |
62 | - <exclude name="OnlyOneReturn" /> | |
63 | 50 | <exclude name="DefaultPackage" /> |
51 | + <exclude name="OnlyOneReturn" /> | |
64 | 52 | <exclude name="DataflowAnomalyAnalysis" /> |
65 | - <exclude name="AvoidUsingShortType" /> | |
66 | 53 | <exclude name="AvoidLiteralsInIfCondition" /> |
67 | - <exclude name="UseConcurrentHashMap" /> | |
68 | 54 | </rule> |
69 | 55 | |
70 | 56 | <rule ref="rulesets/java/coupling.xml"> |
@@ -73,8 +59,6 @@ | ||
73 | 59 | </rule> |
74 | 60 | |
75 | 61 | <rule ref="rulesets/java/design.xml"> |
76 | - <exclude name="SimplifyBooleanReturns" /> | |
77 | - <exclude name="ConfusingTernary" /> | |
78 | 62 | <exclude name="UnnecessaryLocalBeforeReturn" /> |
79 | 63 | <exclude name="FieldDeclarationsShouldBeAtStartOfClass" /> |
80 | 64 | </rule> |
@@ -85,33 +69,25 @@ | ||
85 | 69 | |
86 | 70 | <rule ref="rulesets/java/imports.xml" /> |
87 | 71 | |
88 | -<!-- | |
89 | - <rule ref="rulesets/java/j2ee.xml" /> | |
90 | - <rule ref="rulesets/java/javabeans.xml" /> | |
91 | ---> | |
92 | - | |
93 | - <rule ref="rulesets/java/junit.xml" /> | |
72 | + <rule ref="rulesets/java/j2ee.xml"> | |
73 | + <exclude name="DoNotUseThreads" /> | |
74 | + </rule> | |
94 | 75 | |
95 | -<!-- | |
96 | 76 | <rule ref="rulesets/java/logging-jakarta-commons.xml" /> |
97 | ---> | |
77 | + | |
78 | + <rule ref="rulesets/java/javabeans.xml"> | |
79 | + <exclude name="BeanMembersShouldSerialize" /> | |
80 | + </rule> | |
98 | 81 | |
99 | 82 | <rule ref="rulesets/java/logging-java.xml" /> |
100 | 83 | |
84 | + <rule ref="rulesets/java/junit.xml" /> | |
85 | + | |
101 | 86 | <rule ref="rulesets/java/migrating.xml" /> |
102 | -<!-- | |
103 | - <rule ref="rulesets/java/migrating_to_XX.xml" /> | |
104 | ---> | |
105 | 87 | |
106 | 88 | <rule ref="rulesets/java/naming.xml"> |
107 | 89 | <exclude name="ShortVariable" /> |
108 | 90 | <exclude name="LongVariable" /> |
109 | - <exclude name="AvoidFieldNameMatchingMethodName" /> | |
110 | - </rule> | |
111 | - <rule ref="rulesets/java/naming.xml/LongVariable"> | |
112 | - <properties> | |
113 | - <property name="minimum" value="25"/> | |
114 | - </properties> | |
115 | 91 | </rule> |
116 | 92 | |
117 | 93 | <rule ref="rulesets/java/optimizations.xml"> |
@@ -120,11 +96,11 @@ | ||
120 | 96 | <exclude name="RedundantFieldInitializer" /> |
121 | 97 | </rule> |
122 | 98 | |
123 | - <rule ref="rulesets/java/strictexception.xml"> | |
124 | - <exclude name="AvoidThrowingNullPointerException" /> | |
125 | - </rule> | |
99 | + <rule ref="rulesets/java/strictexception.xml" /> | |
126 | 100 | |
127 | - <rule ref="rulesets/java/strings.xml" /> | |
101 | + <rule ref="rulesets/java/strings.xml"> | |
102 | + <exclude name="ConsecutiveAppendsShouldReuse" /> | |
103 | + </rule> | |
128 | 104 | |
129 | 105 | <rule ref="rulesets/java/sunsecure.xml" /> |
130 | 106 |
@@ -132,7 +108,6 @@ | ||
132 | 108 | |
133 | 109 | <rule ref="rulesets/java/unnecessary.xml"> |
134 | 110 | <exclude name="UnnecessaryReturn" /> |
135 | - <exclude name="UselessParentheses" /> | |
136 | 111 | </rule> |
137 | 112 | |
138 | 113 | <rule ref="rulesets/java/unusedcode.xml" /> |
@@ -8,7 +8,7 @@ | ||
8 | 8 | xmlns="http://maven.apache.org/POM/4.0.0" |
9 | 9 | xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
10 | 10 | 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" | |
12 | 12 | > |
13 | 13 | <modelVersion>4.0.0</modelVersion> |
14 | 14 | <!--parent/--> |
@@ -16,7 +16,7 @@ | ||
16 | 16 | <groupId>jp.sourceforge.jindolf</groupId> |
17 | 17 | <artifactId>jindolf</artifactId> |
18 | 18 | |
19 | - <version>3.302.3-SNAPSHOT</version> | |
19 | + <version>3.302.4</version> | |
20 | 20 | |
21 | 21 | <packaging>jar</packaging> |
22 | 22 | <name>Jindolf</name> |
@@ -31,13 +31,13 @@ | ||
31 | 31 | |
32 | 32 | <organization> |
33 | 33 | <name>Jindolf Partners</name> |
34 | - <url>https://osdn.jp/projects/jindolf/devel/</url> | |
34 | + <url>https://ja.osdn.net/projects/jindolf/devel/</url> | |
35 | 35 | </organization> |
36 | 36 | |
37 | 37 | <licenses> |
38 | 38 | <license> |
39 | 39 | <name>The MIT License</name> |
40 | - <url>https://opensource.org/licenses/mit-license.php</url> | |
40 | + <url>https://opensource.org/licenses/MIT</url> | |
41 | 41 | <distribution>manual</distribution> |
42 | 42 | </license> |
43 | 43 | </licenses> |
@@ -47,7 +47,7 @@ | ||
47 | 47 | <id>olyutorskii</id> |
48 | 48 | <url>https://sites.google.com/site/olyutorskiipit/</url> |
49 | 49 | <organization>Jindolf Partners</organization> |
50 | - <organizationUrl>https://osdn.jp/projects/jindolf/devel/</organizationUrl> | |
50 | + <organizationUrl>https://ja.osdn.net/projects/jindolf/devel/</organizationUrl> | |
51 | 51 | <roles> |
52 | 52 | <role>Project Founder</role> |
53 | 53 | <role>Java Developer</role> |
@@ -59,42 +59,56 @@ | ||
59 | 59 | <mailingLists/> |
60 | 60 | |
61 | 61 | <prerequisites> |
62 | - <maven>3.3</maven> | |
62 | + <maven>3.0.1</maven> | |
63 | 63 | </prerequisites> |
64 | 64 | |
65 | 65 | <modules/> |
66 | 66 | |
67 | 67 | <scm> |
68 | - <connection>scm:hg:http://hg.osdn.jp/view/jindolf/Jindolf</connection> | |
69 | - <developerConnection>scm:hg:ssh://hg.osdn.jp//hgroot/jindolf/Jindolf</developerConnection> | |
70 | - <url>https://osdn.jp/projects/jindolf/scm/hg/Jindolf/</url> | |
68 | + <connection>scm:hg:http://hg.osdn.net/view/jindolf/Jindolf</connection> | |
69 | + <developerConnection>scm:hg:ssh://hg.osdn.net//hgroot/jindolf/Jindolf</developerConnection> | |
70 | + <url>https://osdn.net/projects/jindolf/scm/hg/Jindolf/</url> | |
71 | 71 | </scm> |
72 | 72 | |
73 | 73 | <issueManagement> |
74 | - <system>OSDN.JP</system> | |
75 | - <url>https://osdn.jp/projects/jindolf/ticket/</url> | |
74 | + <system>OSDN.NET</system> | |
75 | + <url>https://ja.osdn.net/projects/jindolf/ticket/</url> | |
76 | 76 | </issueManagement> |
77 | 77 | |
78 | 78 | <ciManagement/> |
79 | 79 | <distributionManagement/> |
80 | 80 | |
81 | 81 | <properties> |
82 | - <maven.compiler.encoding>UTF-8</maven.compiler.encoding> | |
83 | - | |
84 | 82 | <maven.compiler.source>1.7</maven.compiler.source> |
85 | 83 | <maven.compiler.target>1.7</maven.compiler.target> |
86 | 84 | |
87 | 85 | <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation> |
88 | 86 | <maven.compiler.showWarnings>true</maven.compiler.showWarnings> |
89 | 87 | |
88 | + <maven.compiler.encoding>UTF-8</maven.compiler.encoding> | |
90 | 89 | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
91 | 90 | <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> |
92 | 91 | |
93 | - <project.mainconf>${project.basedir}/src/main/config</project.mainconf> | |
92 | + <site.locales>en</site.locales> | |
93 | + <javadoc.locale>en</javadoc.locale> | |
94 | + <findbugs.jvmArgs>-Duser.language=en</findbugs.jvmArgs> | |
94 | 95 | |
95 | - <checkstyle.config.location>${project.mainconf}/checks.xml</checkstyle.config.location> | |
96 | + <jacoco-plugin.version>0.7.9</jacoco-plugin.version> | |
97 | + | |
98 | + <checkstyle-plugin.version>2.17</checkstyle-plugin.version> | |
99 | + <checkstyleruntime.version>6.19</checkstyleruntime.version> | |
100 | + <checkstyle.config.location>${project.basedir}/checkstyle.xml</checkstyle.config.location> | |
101 | + <checkstyle.suppressions.location>${project.basedir}/checkstyle-suppressions.xml</checkstyle.suppressions.location> | |
96 | 102 | <checkstyle.enable.rss>false</checkstyle.enable.rss> |
97 | 103 | |
104 | + <pmd-plugin.version>3.7</pmd-plugin.version> | |
105 | + | |
106 | + <findbugs-plugin.version>3.0.4</findbugs-plugin.version> | |
107 | + <findbugs.effort>Max</findbugs.effort> | |
108 | + <findbugs.threshold>Low</findbugs.threshold> | |
109 | + <!-- for Jenkins --> | |
110 | + <findbugs.xmlOutput>true</findbugs.xmlOutput> | |
111 | + | |
98 | 112 | <project.mainentry>jp.sfjp.jindolf.Jindolf</project.mainentry> |
99 | 113 | <project.splash>jp/sfjp/jindolf/resources/image/logo.png</project.splash> |
100 | 114 |
@@ -114,7 +128,7 @@ | ||
114 | 128 | <dependency> |
115 | 129 | <groupId>jp.sourceforge.jindolf</groupId> |
116 | 130 | <artifactId>jinparser</artifactId> |
117 | - <version>1.409.2</version> | |
131 | + <version>1.409.4</version> | |
118 | 132 | <scope>compile</scope> |
119 | 133 | </dependency> |
120 | 134 |
@@ -131,31 +145,33 @@ | ||
131 | 145 | <pluginRepositories/> |
132 | 146 | |
133 | 147 | <build> |
134 | - <pluginManagement/> | |
148 | + | |
149 | + <pluginManagement> | |
150 | + | |
151 | + <plugins> | |
152 | + | |
153 | + <plugin> | |
154 | + <groupId>org.apache.maven.plugins</groupId> | |
155 | + <artifactId>maven-checkstyle-plugin</artifactId> | |
156 | + <version>${checkstyle-plugin.version}</version> | |
157 | + <dependencies> | |
158 | + <dependency> | |
159 | + <groupId>com.puppycrawl.tools</groupId> | |
160 | + <artifactId>checkstyle</artifactId> | |
161 | + <!--artifactId>checkstyle-backport-jre6</artifactId--> | |
162 | + <version>${checkstyleruntime.version}</version> | |
163 | + </dependency> | |
164 | + </dependencies> | |
165 | + </plugin> | |
166 | + | |
167 | + </plugins> | |
168 | + | |
169 | + </pluginManagement> | |
135 | 170 | |
136 | 171 | <plugins> |
137 | 172 | |
138 | - <plugin> | |
139 | - <groupId>org.apache.maven.plugins</groupId> | |
140 | - <artifactId>maven-enforcer-plugin</artifactId> | |
141 | - <version>1.4.1</version> | |
142 | - <configuration> | |
143 | - <rules> | |
144 | - <requireMavenVersion> | |
145 | - <version>[3.3,)</version> | |
146 | - </requireMavenVersion> | |
147 | - <requireJavaVersion> | |
148 | - <version>[1.7,)</version> | |
149 | - </requireJavaVersion> | |
150 | - </rules> | |
151 | - </configuration> | |
152 | - </plugin> | |
153 | 173 | |
154 | - <plugin> | |
155 | - <groupId>org.apache.maven.plugins</groupId> | |
156 | - <artifactId>maven-install-plugin</artifactId> | |
157 | - <version>2.5.2</version> | |
158 | - </plugin> | |
174 | + <!-- clean lifecycle --> | |
159 | 175 | |
160 | 176 | <plugin> |
161 | 177 | <groupId>org.apache.maven.plugins</groupId> |
@@ -166,42 +182,122 @@ | ||
166 | 182 | <fileset> |
167 | 183 | <directory>${project.basedir}</directory> |
168 | 184 | <includes> |
169 | - <include>**/.DS_Store</include> | |
170 | - <include>**/_MACOSX</include> | |
185 | + <include>**/*~</include> | |
186 | + <include>**/*.swp</include> | |
187 | + <include>**/*.DS_Store</include> | |
188 | + <include>**/._*</include> | |
189 | + <include>**/__MACOSX</include> | |
171 | 190 | <include>**/Thumbs.db</include> |
172 | - <include>**/thumbs.db</include> | |
173 | - <include>**/Desktop.ini</include> | |
174 | 191 | <include>**/desktop.ini</include> |
175 | 192 | <include>**/core</include> |
193 | + <include>**/hs_err_pid*</include> | |
176 | 194 | </includes> |
177 | 195 | </fileset> |
178 | 196 | </filesets> |
179 | 197 | </configuration> |
180 | 198 | </plugin> |
181 | 199 | |
200 | + | |
201 | + <!-- default lifecycle --> | |
202 | + | |
203 | + <plugin> | |
204 | + <groupId>org.apache.maven.plugins</groupId> | |
205 | + <artifactId>maven-enforcer-plugin</artifactId> | |
206 | + <version>1.4.1</version> | |
207 | + <configuration> | |
208 | + <rules> | |
209 | + <requireMavenVersion> | |
210 | + <version>[3.0.1,)</version> | |
211 | + </requireMavenVersion> | |
212 | + <requireJavaVersion> | |
213 | + <version>[1.7,)</version> | |
214 | + </requireJavaVersion> | |
215 | + </rules> | |
216 | + </configuration> | |
217 | + </plugin> | |
218 | + | |
219 | + <plugin> | |
220 | + <groupId>org.apache.maven.plugins</groupId> | |
221 | + <artifactId>maven-resources-plugin</artifactId> | |
222 | + <version>3.0.2</version> | |
223 | + </plugin> | |
224 | + | |
182 | 225 | <plugin> |
183 | 226 | <groupId>org.apache.maven.plugins</groupId> |
184 | 227 | <artifactId>maven-compiler-plugin</artifactId> |
185 | - <version>3.5.1</version> | |
228 | + <version>3.6.1</version> | |
186 | 229 | <configuration> |
187 | 230 | <source>1.7</source> <!-- for NetBeans IDE --> |
188 | 231 | <target>1.7</target> |
189 | - <showDeprecation>true</showDeprecation> | |
190 | - <showWarnings>true</showWarnings> | |
191 | 232 | <compilerArguments> |
192 | 233 | <Xlint/> |
193 | 234 | </compilerArguments> |
235 | + <showWarnings>true</showWarnings> | |
236 | + <showDeprecation>true</showDeprecation> | |
237 | + </configuration> | |
238 | + </plugin> | |
239 | + | |
240 | + <plugin> | |
241 | + <groupId>org.apache.maven.plugins</groupId> | |
242 | + <artifactId>maven-surefire-plugin</artifactId> | |
243 | + <version>2.19.1</version> | |
244 | + <configuration> | |
245 | + <enableAssertions>true</enableAssertions> | |
194 | 246 | </configuration> |
195 | 247 | </plugin> |
196 | 248 | |
197 | 249 | <plugin> |
250 | + <groupId>org.jacoco</groupId> | |
251 | + <artifactId>jacoco-maven-plugin</artifactId> | |
252 | + <version>${jacoco-plugin.version}</version> | |
253 | + <executions> | |
254 | + <execution> | |
255 | + <id>default-prepare-agent</id> | |
256 | + <goals> | |
257 | + <goal>prepare-agent</goal> | |
258 | + </goals> | |
259 | + </execution> | |
260 | + <execution> | |
261 | + <id>default-report</id> | |
262 | + <phase>prepare-package</phase> | |
263 | + <goals> | |
264 | + <goal>report</goal> | |
265 | + </goals> | |
266 | + </execution> | |
267 | + <execution> | |
268 | + <id>default-check</id> | |
269 | + <goals> | |
270 | + <goal>check</goal> | |
271 | + </goals> | |
272 | + <configuration> | |
273 | + <rules> | |
274 | + <rule implementation="org.jacoco.maven.RuleConfiguration"> | |
275 | + <element>BUNDLE</element> | |
276 | + <limits> | |
277 | + <limit implementation="org.jacoco.report.check.Limit"> | |
278 | + <counter>COMPLEXITY</counter> | |
279 | + <value>COVEREDRATIO</value> | |
280 | + <minimum>0.0</minimum> | |
281 | + </limit> | |
282 | + </limits> | |
283 | + </rule> | |
284 | + </rules> | |
285 | + </configuration> | |
286 | + </execution> | |
287 | + </executions> | |
288 | + </plugin> | |
289 | + | |
290 | + <plugin> | |
198 | 291 | <groupId>org.apache.maven.plugins</groupId> |
199 | 292 | <artifactId>maven-jar-plugin</artifactId> |
200 | - <version>3.0.0</version> | |
293 | + <version>3.0.2</version> | |
201 | 294 | <configuration> |
202 | 295 | <archive> |
203 | 296 | <manifest> |
204 | 297 | <mainClass>${project.mainentry}</mainClass> |
298 | + <addDefaultImplementationEntries> | |
299 | + false | |
300 | + </addDefaultImplementationEntries> | |
205 | 301 | </manifest> |
206 | 302 | <manifestEntries> |
207 | 303 | <SplashScreen-Image>${project.splash}</SplashScreen-Image> |
@@ -214,7 +310,7 @@ | ||
214 | 310 | <plugin> |
215 | 311 | <groupId>org.apache.maven.plugins</groupId> |
216 | 312 | <artifactId>maven-shade-plugin</artifactId> |
217 | - <version>2.4.3</version> | |
313 | + <version>3.0.0</version> | |
218 | 314 | <executions> |
219 | 315 | <execution> |
220 | 316 | <phase>package</phase> |
@@ -223,16 +319,6 @@ | ||
223 | 319 | </goals> |
224 | 320 | <configuration> |
225 | 321 | <createDependencyReducedPom>false</createDependencyReducedPom> |
226 | - <artifactSet> | |
227 | - <includes> | |
228 | - <include>jp.sourceforge.jindolf:jincore</include> | |
229 | - <include>jp.sourceforge.jindolf:jinparser</include> | |
230 | - <include>jp.sourceforge.jovsonz:jovsonz</include> | |
231 | - </includes> | |
232 | - <excludes> | |
233 | - <exclude>junit:junit</exclude> | |
234 | - </excludes> | |
235 | - </artifactSet> | |
236 | 322 | </configuration> |
237 | 323 | </execution> |
238 | 324 | </executions> |
@@ -240,20 +326,8 @@ | ||
240 | 326 | |
241 | 327 | <plugin> |
242 | 328 | <groupId>org.apache.maven.plugins</groupId> |
243 | - <artifactId>maven-assembly-plugin</artifactId> | |
244 | - <version>2.6</version> | |
245 | - <configuration> | |
246 | - <archiveBaseDirectory>.</archiveBaseDirectory> | |
247 | - <descriptors> | |
248 | - <descriptor>src/main/assembly/descriptor.xml</descriptor> | |
249 | - </descriptors> | |
250 | - </configuration> | |
251 | - </plugin> | |
252 | - | |
253 | - <plugin> | |
254 | - <groupId>org.apache.maven.plugins</groupId> | |
255 | 329 | <artifactId>maven-source-plugin</artifactId> |
256 | - <version>3.0.0</version> | |
330 | + <version>3.0.1</version> | |
257 | 331 | <configuration> |
258 | 332 | <includePom>true</includePom> |
259 | 333 | <archive> |
@@ -275,76 +349,46 @@ | ||
275 | 349 | |
276 | 350 | <plugin> |
277 | 351 | <groupId>org.apache.maven.plugins</groupId> |
278 | - <artifactId>maven-resources-plugin</artifactId> | |
279 | - <version>3.0.0</version> | |
352 | + <artifactId>maven-install-plugin</artifactId> | |
353 | + <version>2.5.2</version> | |
280 | 354 | </plugin> |
281 | 355 | |
282 | 356 | <plugin> |
283 | 357 | <groupId>org.apache.maven.plugins</groupId> |
284 | - <artifactId>maven-surefire-plugin</artifactId> | |
285 | - <version>2.19.1</version> | |
286 | - <configuration> | |
287 | - <skipTests>false</skipTests> | |
288 | - <enableAssertions>true</enableAssertions> | |
289 | - </configuration> | |
358 | + <artifactId>maven-deploy-plugin</artifactId> | |
359 | + <version>2.8.2</version> | |
290 | 360 | </plugin> |
291 | 361 | |
292 | - <plugin> | |
293 | - <groupId>org.apache.maven.plugins</groupId> | |
294 | - <artifactId>maven-site-plugin</artifactId> | |
295 | - <version>3.5.1</version> | |
296 | - <configuration> | |
297 | - <generateReports>true</generateReports> | |
298 | - <locales>ja</locales> | |
299 | - <inputEncoding>${project.build.sourceEncoding}</inputEncoding> | |
300 | - <outputEncoding>${project.reporting.outputEncoding}</outputEncoding> | |
301 | - </configuration> | |
302 | - </plugin> | |
303 | 362 | |
304 | - <plugin> | |
305 | - <groupId>org.apache.maven.plugins</groupId> | |
306 | - <artifactId>maven-checkstyle-plugin</artifactId> | |
307 | - <version>2.15</version> | |
308 | - <!-- config from property value --> | |
309 | - </plugin> | |
363 | + <!-- site lifecycle --> | |
310 | 364 | |
311 | 365 | <plugin> |
312 | 366 | <groupId>org.apache.maven.plugins</groupId> |
313 | - <artifactId>maven-pmd-plugin</artifactId> | |
367 | + <artifactId>maven-site-plugin</artifactId> | |
314 | 368 | <version>3.6</version> |
315 | 369 | <configuration> |
316 | - <targetJdk>${maven.compiler.target}</targetJdk> | |
317 | - <rulesets> | |
318 | - <ruleset>${project.mainconf}/pmdrules.xml</ruleset> | |
319 | - </rulesets> | |
370 | + <locales>${site.locales}</locales> | |
320 | 371 | </configuration> |
321 | 372 | </plugin> |
322 | 373 | |
374 | + | |
375 | + <!-- goals without lifecycle --> | |
376 | + | |
323 | 377 | <plugin> |
324 | - <groupId>org.codehaus.mojo</groupId> | |
325 | - <artifactId>findbugs-maven-plugin</artifactId> | |
326 | - <version>3.0.3</version> | |
378 | + <groupId>org.apache.maven.plugins</groupId> | |
379 | + <artifactId>maven-assembly-plugin</artifactId> | |
380 | + <version>3.0.0</version> | |
327 | 381 | <configuration> |
328 | - <effort>Max</effort> | |
329 | - <threshold>Low</threshold> | |
330 | - <!-- for Jenkins --> | |
331 | - <findbugsXmlOutput>true</findbugsXmlOutput> | |
332 | - <findbugsXmlWithMessages>true</findbugsXmlWithMessages> | |
333 | - <xmlOutput>true</xmlOutput> | |
382 | + <descriptors> | |
383 | + <descriptor>src/assembly/src.xml</descriptor> | |
384 | + </descriptors> | |
334 | 385 | </configuration> |
335 | 386 | </plugin> |
336 | 387 | |
337 | 388 | <plugin> |
338 | - <groupId>org.codehaus.mojo</groupId> | |
339 | - <artifactId>cobertura-maven-plugin</artifactId> | |
340 | - <version>2.7</version> | |
341 | - <configuration> | |
342 | - <encoding>${project.build.sourceEncoding}</encoding> | |
343 | - <formats> | |
344 | - <format>html</format> | |
345 | - <format>xml</format> <!-- for Jenkins --> | |
346 | - </formats> | |
347 | - </configuration> | |
389 | + <groupId>org.apache.maven.plugins</groupId> | |
390 | + <artifactId>maven-checkstyle-plugin</artifactId> | |
391 | + <version>${checkstyle-plugin.version}</version> | |
348 | 392 | </plugin> |
349 | 393 | |
350 | 394 | </plugins> |
@@ -383,7 +427,7 @@ | ||
383 | 427 | <exclude>**/version.properties</exclude> |
384 | 428 | |
385 | 429 | <exclude>**/.DS_Store</exclude> |
386 | - <exclude>**/_MACOSX</exclude> | |
430 | + <exclude>**/__MACOSX</exclude> | |
387 | 431 | <exclude>**/Thumbs.db</exclude> |
388 | 432 | <exclude>**/thumbs.db</exclude> |
389 | 433 | <exclude>**/Desktop.ini</exclude> |
@@ -414,19 +458,20 @@ | ||
414 | 458 | <report>index</report> |
415 | 459 | <report>summary</report> |
416 | 460 | <report>license</report> |
461 | + <report>dependency-info</report> | |
417 | 462 | <report>dependencies</report> |
463 | + <report>dependency-convergence</report> | |
418 | 464 | <report>plugins</report> |
419 | - <report>scm</report> | |
465 | + <report>plugin-management</report> | |
420 | 466 | <report>project-team</report> |
467 | + <report>issue-tracking</report> | |
468 | + <report>scm</report> | |
421 | 469 | <!-- |
422 | - <report>dependency-convergence</report> | |
423 | - <report>dependency-info</report> | |
424 | 470 | <report>dependency-management</report> |
425 | 471 | <report>distribution-management</report> |
426 | - <report>issue-tracking</report> | |
472 | + <report>cim</report> | |
427 | 473 | <report>mailing-list</report> |
428 | 474 | <report>modules</report> |
429 | - <report>plugin-management</report> | |
430 | 475 | --> |
431 | 476 | </reports> |
432 | 477 | </reportSet> |
@@ -436,12 +481,15 @@ | ||
436 | 481 | <plugin> |
437 | 482 | <groupId>org.apache.maven.plugins</groupId> |
438 | 483 | <artifactId>maven-javadoc-plugin</artifactId> |
439 | - <version>2.10.3</version> | |
484 | + <version>2.10.4</version> | |
440 | 485 | <configuration> |
441 | - <skip>false</skip> | |
486 | + <author>false</author> | |
442 | 487 | <notimestamp>true</notimestamp> |
443 | 488 | <quiet>true</quiet> |
444 | 489 | <show>protected</show> |
490 | + <locale>${javadoc.locale}</locale> | |
491 | + <header>${project.name} ${project.version} API</header> | |
492 | + <version>true</version> | |
445 | 493 | </configuration> |
446 | 494 | <reportSets> |
447 | 495 | <reportSet> |
@@ -456,48 +504,31 @@ | ||
456 | 504 | <groupId>org.apache.maven.plugins</groupId> |
457 | 505 | <artifactId>maven-jxr-plugin</artifactId> |
458 | 506 | <version>2.5</version> |
459 | - <configuration> | |
460 | - <skip>false</skip> | |
461 | - </configuration> | |
462 | 507 | </plugin> |
463 | 508 | |
464 | 509 | <plugin> |
465 | 510 | <groupId>org.apache.maven.plugins</groupId> |
466 | 511 | <artifactId>maven-surefire-report-plugin</artifactId> |
467 | 512 | <version>2.19.1</version> |
468 | - <configuration> | |
469 | - <showSuccess>false</showSuccess> | |
470 | - </configuration> | |
513 | + </plugin> | |
514 | + | |
515 | + <plugin> | |
516 | + <groupId>org.jacoco</groupId> | |
517 | + <artifactId>jacoco-maven-plugin</artifactId> | |
518 | + <version>${jacoco-plugin.version}</version> | |
471 | 519 | <reportSets> |
472 | 520 | <reportSet> |
473 | 521 | <reports> |
474 | - <report>report-only</report> | |
522 | + <report>report</report> | |
475 | 523 | </reports> |
476 | 524 | </reportSet> |
477 | 525 | </reportSets> |
478 | 526 | </plugin> |
479 | 527 | |
480 | 528 | <plugin> |
481 | - <groupId>org.codehaus.mojo</groupId> | |
482 | - <artifactId>cobertura-maven-plugin</artifactId> | |
483 | - <version>2.7</version> | |
484 | - <configuration> | |
485 | - <encoding>${project.build.sourceEncoding}</encoding> | |
486 | - <formats> | |
487 | - <format>html</format> | |
488 | - <format>xml</format> <!-- for Jenkins --> | |
489 | - </formats> | |
490 | - </configuration> | |
491 | - </plugin> | |
492 | - | |
493 | - <plugin> | |
494 | 529 | <groupId>org.apache.maven.plugins</groupId> |
495 | 530 | <artifactId>maven-checkstyle-plugin</artifactId> |
496 | - <version>2.15</version> | |
497 | - <configuration> | |
498 | - <skip>false</skip> | |
499 | - <!-- config from property value --> | |
500 | - </configuration> | |
531 | + <version>${checkstyle-plugin.version}</version> | |
501 | 532 | <reportSets> |
502 | 533 | <reportSet> |
503 | 534 | <reports> |
@@ -510,12 +541,10 @@ | ||
510 | 541 | <plugin> |
511 | 542 | <groupId>org.apache.maven.plugins</groupId> |
512 | 543 | <artifactId>maven-pmd-plugin</artifactId> |
513 | - <version>3.6</version> | |
544 | + <version>${pmd-plugin.version}</version> | |
514 | 545 | <configuration> |
515 | - <skip>false</skip> | |
516 | - <targetJdk>${maven.compiler.target}</targetJdk> | |
517 | 546 | <rulesets> |
518 | - <ruleset>${project.mainconf}/pmdrules.xml</ruleset> | |
547 | + <ruleset>${project.basedir}/pmdrules.xml</ruleset> | |
519 | 548 | </rulesets> |
520 | 549 | </configuration> |
521 | 550 | <reportSets> |
@@ -531,29 +560,7 @@ | ||
531 | 560 | <plugin> |
532 | 561 | <groupId>org.codehaus.mojo</groupId> |
533 | 562 | <artifactId>findbugs-maven-plugin</artifactId> |
534 | - <version>3.0.3</version> | |
535 | - <configuration> | |
536 | - <skip>false</skip> | |
537 | - <effort>Max</effort> | |
538 | - <threshold>Low</threshold> | |
539 | - <!-- for Jenkins --> | |
540 | - <findbugsXmlOutput>true</findbugsXmlOutput> | |
541 | - <findbugsXmlWithMessages>true</findbugsXmlWithMessages> | |
542 | - <xmlOutput>true</xmlOutput> | |
543 | - <!-- excludeFilterFile/ --> | |
544 | - </configuration> | |
545 | - </plugin> | |
546 | - | |
547 | - <plugin> | |
548 | - <groupId>org.codehaus.mojo</groupId> | |
549 | - <artifactId>javancss-maven-plugin</artifactId> | |
550 | - <version>2.1</version> | |
551 | - </plugin> | |
552 | - | |
553 | - <plugin> | |
554 | - <groupId>org.codehaus.mojo</groupId> | |
555 | - <artifactId>jdepend-maven-plugin</artifactId> | |
556 | - <version>2.0</version> | |
563 | + <version>${findbugs-plugin.version}</version> | |
557 | 564 | </plugin> |
558 | 565 | |
559 | 566 | </plugins> |
@@ -1,15 +1,15 @@ | ||
1 | 1 | <?xml version="1.0" encoding="UTF-8" ?> |
2 | 2 | |
3 | 3 | <assembly |
4 | - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" | |
4 | + xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" | |
5 | 5 | xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
6 | - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 | |
7 | - http://maven.apache.org/xsd/assembly-1.1.3.xsd" | |
6 | + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 | |
7 | + http://maven.apache.org/xsd/assembly-2.0.0.xsd" | |
8 | 8 | > |
9 | 9 | |
10 | 10 | <!-- |
11 | - OSDN.JP用リリースファイル構成定義ファイル | |
12 | - Maven2(or3) assembly用 | |
11 | + OSDN.NET用リリースファイル構成定義ファイル | |
12 | + Maven3 assembly用 | |
13 | 13 | --> |
14 | 14 | |
15 | 15 | <id>src</id> |
@@ -20,10 +20,9 @@ | ||
20 | 20 | |
21 | 21 | <fileSets> |
22 | 22 | <fileSet> |
23 | - <directory>.</directory> | |
23 | + <directory>${project.basedir}</directory> | |
24 | 24 | <includes> |
25 | - <include>pom.xml</include> | |
26 | - <include>fixcrlf.xml</include> | |
25 | + <include>*.xml</include> | |
27 | 26 | <include>*.txt</include> |
28 | 27 | </includes> |
29 | 28 | <excludes> |
@@ -33,7 +32,7 @@ | ||
33 | 32 | <useDefaultExcludes>true</useDefaultExcludes> |
34 | 33 | </fileSet> |
35 | 34 | <fileSet> |
36 | - <directory>src/</directory> | |
35 | + <directory>${project.basedir}/src</directory> | |
37 | 36 | <useDefaultExcludes>true</useDefaultExcludes> |
38 | 37 | </fileSet> |
39 | 38 | </fileSets> |