• R/O
  • HTTP
  • SSH
  • HTTPS

Jindolf: 提交

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


Commit MetaInfo

修订版8db2173d0ed26d6f23971f9c86cfc35fa46bce55 (tree)
时间2017-04-09 17:55:10
作者Olyutorskii <olyutorskii@user...>
CommiterOlyutorskii

Log Message

merge release/3.302.4

更改概述

  • modified: .hgignore (diff)
  • modified: CHANGELOG.txt (diff)
  • modified: README.txt (diff)
  • modified: SCM.txt (diff)
  • modified: pom.xml (diff)
  • delete: src/main/config/checks.xml => checkstyle.xml
  • delete: src/main/config/pmdrules.xml => pmdrules.xml
  • delete: src/main/config/suppressions.xml => checkstyle-suppressions.xml
  • delete: src/{main/assembly/descriptor.xml => assembly/src.xml}

差异

--- a/.hgignore
+++ b/.hgignore
@@ -27,7 +27,7 @@ syntax: regexp
2727 syntax: glob
2828
2929 .DS_Store
30-_MACOSX
30+__MACOSX
3131 [Tt]humbs.db
3232 [Dd]esktop.ini
3333 core
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,9 @@
44 Jindolf 変更履歴
55
66
7+3.302.4 (2017-04-09)
8+ ・F国URL修正に伴い JinCore 1.206.10 に対応。
9+
710 3.302.2 (2016-06-26)
811 ・必須環境をJRE7に引き上げ。
912 ・OSDN.JP対応。
--- a/README.txt
+++ b/README.txt
@@ -38,10 +38,9 @@
3838 必要とします。開発時はMaven等を用いてこれらのライブラリを用意してください。
3939
4040
41-
4241 === 開発プロジェクト運営元 ===
4342
44- https://osdn.jp/projects/jindolf/devel/ まで。
43+ https://ja.osdn.net/projects/jindolf/ まで。
4544
4645
4746 === ソフトウェア利用者向けポータルサイト ===
@@ -68,6 +67,15 @@
6867 ./pom.xml
6968 Maven3用プロジェクト構成定義ファイル。
7069
70+./checkstyle.xml
71+ Checkstyle用configファイル。
72+
73+./pmdrules.xml
74+ PMD用ルール定義ファイル。
75+
76+./src/assembly/src.xml
77+ ソースアーカイブ構成定義ファイル。
78+
7179 ./src/main/java/
7280 Javaのソースコード。
7381
@@ -77,17 +85,5 @@
7785 ./src/test/java/
7886 JUnit 4.* 用のユニットテストコード。
7987
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-
9288
9389 --- EOF ---
--- a/SCM.txt
+++ b/SCM.txt
@@ -10,10 +10,10 @@
1010
1111 このアーカイブの原本は、Mercurial(hg)でバージョン管理されています。
1212 このアーカイブの原本となる開発資産は、
13- https://osdn.jp/projects/jindolf/scm/hg/Jindolf/
13+ https://ja.osdn.net/projects/jindolf/scm/hg/Jindolf/
1414 を上位に持つMercurialリポジトリで管理されています。
1515 アーカイブの代わりにMercurialを通じての開発資産へのアクセスが可能です。
16- # hg clone http://hg.osdn.jp/view/jindolf/Jindolf
16+ # hg clone http://hg.osdn.net/view/jindolf/Jindolf
1717
1818
1919 === 各種設定ファイル ===
@@ -42,7 +42,7 @@ EOL Extensionを有効にしないと設定が反映されません。
4242 ・https://www.mercurial-scm.org/wiki/.hgignore
4343 ・https://www.selenic.com/mercurial/hgignore.5.html
4444 ・https://www.mercurial-scm.org/wiki/EolExtension
45-・http://tortoisehg.bitbucket.org/
45+・https://tortoisehg.bitbucket.io/
4646
4747
4848 --- EOF ---
--- a/src/main/config/suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -5,8 +5,8 @@
55 "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
66
77 <!--
8- Checkstyle用警告抑止設定
9- ※ SuppressionFilter モジュール用
8+ Checkstyle suppressions
9+ for Checkstyle 6.19(7.4) or later
1010
1111 [ http://checkstyle.sourceforge.net/ ]
1212
@@ -31,14 +31,14 @@
3131
3232 <!-- Javadoc Comments -->
3333 <suppress files="" checks="SummaryJavadocCheck" />
34- <!-- 句読点対応待ち -->
35- <suppress files="" checks="SingleLineJavadoc" />
36- <!-- ignoredTagsプロパティ対応待ち -->
3734
3835 <!-- Miscellaneous -->
3936 <suppress files="" checks="FinalParameters" />
4037 <suppress files="" checks="TrailingComment" />
4138
39+ <!-- Whitespace -->
40+ <suppress files="" checks="SingleSpaceSeparator" />
41+
4242 </suppressions>
4343
4444
--- a/src/main/config/checks.xml
+++ b/checkstyle.xml
@@ -5,9 +5,8 @@
55 "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
66
77 <!--
8- Checkstyle用チェック項目定義。
9-
10- Checkstyle 6.1 以降向けに記述。
8+ Checkstyle modules
9+ for Checkstyle 6.19(7.4) or later
1110
1211 [ http://checkstyle.sourceforge.net/ ]
1312
@@ -19,21 +18,25 @@
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" />
2829 <module name="SuppressionCommentFilter" />
29- <module name="SuppressionFilter">
30- <property name="file" value="src/main/config/suppressions.xml" />
31- </module>
30+ <module name="SuppressionFilter" />
3231 <module name="SuppressWarningsFilter" />
3332 <module name="SuppressWithNearbyCommentFilter" />
3433
3534
3635 <!-- Headers -->
36+ <module name="Header">
37+ <property name="header" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; ?&gt;" />
38+ <property name="fileExtensions" value="xml" />
39+ </module>
3740 <module name="RegexpHeader">
3841 <property name="header" value="^/\*$\n^ \*( .*)?$\n^ \*/$\n" />
3942 <property name="multiLines" value="2" />
@@ -57,7 +60,7 @@
5760 <module name="RegexpMultiline">
5861 <property name="format" value="[\u000b\f\u001a]" />
5962 </module>
60-<!--<module name="RegexpOnFilename" /> 6.15 or later -->
63+ <module name="RegexpOnFilename" />
6164 <module name="RegexpSingleline">
6265 <property name="format" value="\s+$" />
6366 </module>
@@ -68,9 +71,7 @@
6871
6972
7073 <!-- Size Violations -->
71- <module name="FileLength">
72- <property name="max" value="2000"/>
73- </module>
74+ <module name="FileLength" />
7475
7576
7677 <!-- Whitespace -->
@@ -80,6 +81,7 @@
8081 <module name="TreeWalker">
8182
8283 <property name="tabWidth" value="8"/>
84+ <property name="fileExtensions" value="java"/>
8385
8486
8587 <!-- Annotations -->
@@ -94,12 +96,13 @@
9496
9597
9698 <!-- Block Checks -->
99+
97100 <module name="AvoidNestedBlocks" />
98101 <module name="EmptyBlock" />
99-<!-- <module name="EmptyCatchBlock" /> 6.4 or later -->
102+ <module name="EmptyCatchBlock" />
100103 <module name="LeftCurly" />
101104 <module name="NeedBraces">
102- <property name="tokens" value="LITERAL_DO" />
105+ <property name="allowSingleLineStatement" value="true" />
103106 </module>
104107 <module name="RightCurly" />
105108
@@ -113,9 +116,7 @@
113116 <module name="InterfaceIsType" />
114117 <module name="MutableException" />
115118 <module name="OneTopLevelClass" />
116- <module name="ThrowsCount">
117- <property name="max" value="4" />
118- </module>
119+ <module name="ThrowsCount" />
119120 <module name="VisibilityModifier" />
120121
121122
@@ -135,6 +136,7 @@
135136 <module name="HiddenField">
136137 <property name="ignoreConstructorParameter" value="true" />
137138 <property name="ignoreSetter" value="true" />
139+ <property name="setterCanReturnItsClass" value="true" />
138140 <property name="ignoreAbstractMethods" value="true" />
139141 </module>
140142 <module name="IllegalCatch" />
@@ -143,11 +145,7 @@
143145 <module name="IllegalToken">
144146 <property name="tokens" value="LITERAL_NATIVE" />
145147 </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" />
151149 <module name="IllegalType" />
152150 <module name="InnerAssignment" />
153151 <module name="MagicNumber" />
@@ -156,9 +154,6 @@
156154 <module name="ModifiedControlVariable" />
157155 <module name="MultipleStringLiterals" />
158156 <module name="MultipleVariableDeclarations" />
159- <module name="SimplifyBooleanExpression" />
160- <module name="SimplifyBooleanReturn" />
161- <module name="StringLiteralEquality" />
162157 <module name="NestedForDepth" />
163158 <module name="NestedIfDepth" />
164159 <module name="NestedTryDepth" />
@@ -169,20 +164,16 @@
169164 <module name="PackageDeclaration" />
170165 <module name="ParameterAssignment" />
171166 <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" /-->
176168 </module>
169+ <module name="ReturnCount" />
177170 <module name="SimplifyBooleanExpression" />
178171 <module name="SimplifyBooleanReturn" />
179172 <module name="StringLiteralEquality" />
180173 <module name="SuperClone" />
181174 <module name="SuperFinalize" />
182175 <module name="UnnecessaryParentheses" />
183- <module name="VariableDeclarationUsageDistance">
184- <property name="allowedDistance" value="5" />
185- </module>
176+ <module name="VariableDeclarationUsageDistance" />
186177
187178
188179 <!-- Imports -->
@@ -239,7 +230,7 @@
239230 <property name="allowIfAllCharactersEscaped" value="true"/>
240231 <property name="allowNonPrintableEscapes" value="true"/>
241232 </module>
242-<!-- <module name="CommentsIndentation" /> 6.10 or later -->
233+ <module name="CommentsIndentation" />
243234 <module name="DescendantToken" />
244235 <module name="FileContentsHolder" />
245236 <module name="FinalParameters" />
@@ -264,34 +255,19 @@
264255 <!-- Naming Conventions -->
265256
266257 <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" />
274260 <module name="ClassTypeParameterName" />
275261 <module name="ConstantName" />
276262 <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" />
286266 <module name="MethodName" />
287267 <module name="MethodTypeParameterName" />
288268 <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" />
295271 <module name="TypeName" />
296272
297273
@@ -361,32 +337,7 @@
361337 <property name="allowLineBreaks" value="false" />
362338 <property name="tokens" value="COMMA, POST_INC, POST_DEC" />
363339 </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" />
390341 <module name="ParenPad">
391342 <property name="option" value="nospace" />
392343 <property
@@ -398,8 +349,11 @@
398349 <property name="tokens" value="DOT" />
399350 <property name="option" value="nl" />
400351 </module>
352+ <module name="SingleSpaceSeparator" />
401353 <module name="TypecastParenPad" />
402- <module name="WhitespaceAfter" />
354+ <module name="WhitespaceAfter" >
355+ <property name="tokens" value="COMMA, SEMI,"/>
356+ </module>
403357 <module name="WhitespaceAround">
404358 <property
405359 name="tokens"
@@ -420,6 +374,7 @@
420374
421375 </module>
422376
377+
423378 </module>
424379
425380 <!-- EOF -->
--- a/src/main/config/pmdrules.xml
+++ b/pmdrules.xml
@@ -1,9 +1,8 @@
11 <?xml version="1.0" encoding="UTF-8" ?>
22
33 <!--
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
76
87 Copyright(c) 2016 olyutorskii
98 -->
@@ -17,12 +16,10 @@
1716 >
1817
1918 <description>
20- custom rulesets for project
19+ custom rulesets
2120 </description>
2221
23-<!--
2422 <rule ref="rulesets/java/android.xml" />
25--->
2623
2724 <rule ref="rulesets/java/basic.xml" />
2825
@@ -33,18 +30,10 @@
3330
3431 <rule ref="rulesets/java/clone.xml" />
3532
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" />
4434
4535 <rule ref="rulesets/java/comments.xml">
46- <exclude name="CommentRequired" />
47- <exclude name="CommentSize" />
36+ <exclude name="CommentDefaultAccessModifier" />
4837 </rule>
4938 <rule ref="rulesets/java/comments.xml/CommentRequired" >
5039 <properties>
@@ -58,13 +47,10 @@
5847 </rule>
5948
6049 <rule ref="rulesets/java/controversial.xml">
61- <exclude name="NullAssignment" />
62- <exclude name="OnlyOneReturn" />
6350 <exclude name="DefaultPackage" />
51+ <exclude name="OnlyOneReturn" />
6452 <exclude name="DataflowAnomalyAnalysis" />
65- <exclude name="AvoidUsingShortType" />
6653 <exclude name="AvoidLiteralsInIfCondition" />
67- <exclude name="UseConcurrentHashMap" />
6854 </rule>
6955
7056 <rule ref="rulesets/java/coupling.xml">
@@ -73,8 +59,6 @@
7359 </rule>
7460
7561 <rule ref="rulesets/java/design.xml">
76- <exclude name="SimplifyBooleanReturns" />
77- <exclude name="ConfusingTernary" />
7862 <exclude name="UnnecessaryLocalBeforeReturn" />
7963 <exclude name="FieldDeclarationsShouldBeAtStartOfClass" />
8064 </rule>
@@ -85,33 +69,25 @@
8569
8670 <rule ref="rulesets/java/imports.xml" />
8771
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>
9475
95-<!--
9676 <rule ref="rulesets/java/logging-jakarta-commons.xml" />
97--->
77+
78+ <rule ref="rulesets/java/javabeans.xml">
79+ <exclude name="BeanMembersShouldSerialize" />
80+ </rule>
9881
9982 <rule ref="rulesets/java/logging-java.xml" />
10083
84+ <rule ref="rulesets/java/junit.xml" />
85+
10186 <rule ref="rulesets/java/migrating.xml" />
102-<!--
103- <rule ref="rulesets/java/migrating_to_XX.xml" />
104--->
10587
10688 <rule ref="rulesets/java/naming.xml">
10789 <exclude name="ShortVariable" />
10890 <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>
11591 </rule>
11692
11793 <rule ref="rulesets/java/optimizations.xml">
@@ -120,11 +96,11 @@
12096 <exclude name="RedundantFieldInitializer" />
12197 </rule>
12298
123- <rule ref="rulesets/java/strictexception.xml">
124- <exclude name="AvoidThrowingNullPointerException" />
125- </rule>
99+ <rule ref="rulesets/java/strictexception.xml" />
126100
127- <rule ref="rulesets/java/strings.xml" />
101+ <rule ref="rulesets/java/strings.xml">
102+ <exclude name="ConsecutiveAppendsShouldReuse" />
103+ </rule>
128104
129105 <rule ref="rulesets/java/sunsecure.xml" />
130106
@@ -132,7 +108,6 @@
132108
133109 <rule ref="rulesets/java/unnecessary.xml">
134110 <exclude name="UnnecessaryReturn" />
135- <exclude name="UselessParentheses" />
136111 </rule>
137112
138113 <rule ref="rulesets/java/unusedcode.xml" />
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
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.jindolf</groupId>
1717 <artifactId>jindolf</artifactId>
1818
19- <version>3.302.3-SNAPSHOT</version>
19+ <version>3.302.4</version>
2020
2121 <packaging>jar</packaging>
2222 <name>Jindolf</name>
@@ -31,13 +31,13 @@
3131
3232 <organization>
3333 <name>Jindolf Partners</name>
34- <url>https://osdn.jp/projects/jindolf/devel/</url>
34+ <url>https://ja.osdn.net/projects/jindolf/devel/</url>
3535 </organization>
3636
3737 <licenses>
3838 <license>
3939 <name>The MIT License</name>
40- <url>https://opensource.org/licenses/mit-license.php</url>
40+ <url>https://opensource.org/licenses/MIT</url>
4141 <distribution>manual</distribution>
4242 </license>
4343 </licenses>
@@ -47,7 +47,7 @@
4747 <id>olyutorskii</id>
4848 <url>https://sites.google.com/site/olyutorskiipit/</url>
4949 <organization>Jindolf Partners</organization>
50- <organizationUrl>https://osdn.jp/projects/jindolf/devel/</organizationUrl>
50+ <organizationUrl>https://ja.osdn.net/projects/jindolf/devel/</organizationUrl>
5151 <roles>
5252 <role>Project Founder</role>
5353 <role>Java Developer</role>
@@ -59,42 +59,56 @@
5959 <mailingLists/>
6060
6161 <prerequisites>
62- <maven>3.3</maven>
62+ <maven>3.0.1</maven>
6363 </prerequisites>
6464
6565 <modules/>
6666
6767 <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>
7171 </scm>
7272
7373 <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>
7676 </issueManagement>
7777
7878 <ciManagement/>
7979 <distributionManagement/>
8080
8181 <properties>
82- <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
83-
8482 <maven.compiler.source>1.7</maven.compiler.source>
8583 <maven.compiler.target>1.7</maven.compiler.target>
8684
8785 <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
8886 <maven.compiler.showWarnings>true</maven.compiler.showWarnings>
8987
88+ <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
9089 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
9190 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
9291
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>
9495
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>
96102 <checkstyle.enable.rss>false</checkstyle.enable.rss>
97103
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+
98112 <project.mainentry>jp.sfjp.jindolf.Jindolf</project.mainentry>
99113 <project.splash>jp/sfjp/jindolf/resources/image/logo.png</project.splash>
100114
@@ -114,7 +128,7 @@
114128 <dependency>
115129 <groupId>jp.sourceforge.jindolf</groupId>
116130 <artifactId>jinparser</artifactId>
117- <version>1.409.2</version>
131+ <version>1.409.4</version>
118132 <scope>compile</scope>
119133 </dependency>
120134
@@ -131,31 +145,33 @@
131145 <pluginRepositories/>
132146
133147 <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>
135170
136171 <plugins>
137172
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>
153173
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 -->
159175
160176 <plugin>
161177 <groupId>org.apache.maven.plugins</groupId>
@@ -166,42 +182,122 @@
166182 <fileset>
167183 <directory>${project.basedir}</directory>
168184 <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>
171190 <include>**/Thumbs.db</include>
172- <include>**/thumbs.db</include>
173- <include>**/Desktop.ini</include>
174191 <include>**/desktop.ini</include>
175192 <include>**/core</include>
193+ <include>**/hs_err_pid*</include>
176194 </includes>
177195 </fileset>
178196 </filesets>
179197 </configuration>
180198 </plugin>
181199
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+
182225 <plugin>
183226 <groupId>org.apache.maven.plugins</groupId>
184227 <artifactId>maven-compiler-plugin</artifactId>
185- <version>3.5.1</version>
228+ <version>3.6.1</version>
186229 <configuration>
187230 <source>1.7</source> <!-- for NetBeans IDE -->
188231 <target>1.7</target>
189- <showDeprecation>true</showDeprecation>
190- <showWarnings>true</showWarnings>
191232 <compilerArguments>
192233 <Xlint/>
193234 </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>
194246 </configuration>
195247 </plugin>
196248
197249 <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>
198291 <groupId>org.apache.maven.plugins</groupId>
199292 <artifactId>maven-jar-plugin</artifactId>
200- <version>3.0.0</version>
293+ <version>3.0.2</version>
201294 <configuration>
202295 <archive>
203296 <manifest>
204297 <mainClass>${project.mainentry}</mainClass>
298+ <addDefaultImplementationEntries>
299+ false
300+ </addDefaultImplementationEntries>
205301 </manifest>
206302 <manifestEntries>
207303 <SplashScreen-Image>${project.splash}</SplashScreen-Image>
@@ -214,7 +310,7 @@
214310 <plugin>
215311 <groupId>org.apache.maven.plugins</groupId>
216312 <artifactId>maven-shade-plugin</artifactId>
217- <version>2.4.3</version>
313+ <version>3.0.0</version>
218314 <executions>
219315 <execution>
220316 <phase>package</phase>
@@ -223,16 +319,6 @@
223319 </goals>
224320 <configuration>
225321 <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>
236322 </configuration>
237323 </execution>
238324 </executions>
@@ -240,20 +326,8 @@
240326
241327 <plugin>
242328 <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>
255329 <artifactId>maven-source-plugin</artifactId>
256- <version>3.0.0</version>
330+ <version>3.0.1</version>
257331 <configuration>
258332 <includePom>true</includePom>
259333 <archive>
@@ -275,76 +349,46 @@
275349
276350 <plugin>
277351 <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>
280354 </plugin>
281355
282356 <plugin>
283357 <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>
290360 </plugin>
291361
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>
303362
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 -->
310364
311365 <plugin>
312366 <groupId>org.apache.maven.plugins</groupId>
313- <artifactId>maven-pmd-plugin</artifactId>
367+ <artifactId>maven-site-plugin</artifactId>
314368 <version>3.6</version>
315369 <configuration>
316- <targetJdk>${maven.compiler.target}</targetJdk>
317- <rulesets>
318- <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
319- </rulesets>
370+ <locales>${site.locales}</locales>
320371 </configuration>
321372 </plugin>
322373
374+
375+ <!-- goals without lifecycle -->
376+
323377 <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>
327381 <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>
334385 </configuration>
335386 </plugin>
336387
337388 <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>
348392 </plugin>
349393
350394 </plugins>
@@ -383,7 +427,7 @@
383427 <exclude>**/version.properties</exclude>
384428
385429 <exclude>**/.DS_Store</exclude>
386- <exclude>**/_MACOSX</exclude>
430+ <exclude>**/__MACOSX</exclude>
387431 <exclude>**/Thumbs.db</exclude>
388432 <exclude>**/thumbs.db</exclude>
389433 <exclude>**/Desktop.ini</exclude>
@@ -414,19 +458,20 @@
414458 <report>index</report>
415459 <report>summary</report>
416460 <report>license</report>
461+ <report>dependency-info</report>
417462 <report>dependencies</report>
463+ <report>dependency-convergence</report>
418464 <report>plugins</report>
419- <report>scm</report>
465+ <report>plugin-management</report>
420466 <report>project-team</report>
467+ <report>issue-tracking</report>
468+ <report>scm</report>
421469 <!--
422- <report>dependency-convergence</report>
423- <report>dependency-info</report>
424470 <report>dependency-management</report>
425471 <report>distribution-management</report>
426- <report>issue-tracking</report>
472+ <report>cim</report>
427473 <report>mailing-list</report>
428474 <report>modules</report>
429- <report>plugin-management</report>
430475 -->
431476 </reports>
432477 </reportSet>
@@ -436,12 +481,15 @@
436481 <plugin>
437482 <groupId>org.apache.maven.plugins</groupId>
438483 <artifactId>maven-javadoc-plugin</artifactId>
439- <version>2.10.3</version>
484+ <version>2.10.4</version>
440485 <configuration>
441- <skip>false</skip>
486+ <author>false</author>
442487 <notimestamp>true</notimestamp>
443488 <quiet>true</quiet>
444489 <show>protected</show>
490+ <locale>${javadoc.locale}</locale>
491+ <header>${project.name} ${project.version} API</header>
492+ <version>true</version>
445493 </configuration>
446494 <reportSets>
447495 <reportSet>
@@ -456,48 +504,31 @@
456504 <groupId>org.apache.maven.plugins</groupId>
457505 <artifactId>maven-jxr-plugin</artifactId>
458506 <version>2.5</version>
459- <configuration>
460- <skip>false</skip>
461- </configuration>
462507 </plugin>
463508
464509 <plugin>
465510 <groupId>org.apache.maven.plugins</groupId>
466511 <artifactId>maven-surefire-report-plugin</artifactId>
467512 <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>
471519 <reportSets>
472520 <reportSet>
473521 <reports>
474- <report>report-only</report>
522+ <report>report</report>
475523 </reports>
476524 </reportSet>
477525 </reportSets>
478526 </plugin>
479527
480528 <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>
494529 <groupId>org.apache.maven.plugins</groupId>
495530 <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>
501532 <reportSets>
502533 <reportSet>
503534 <reports>
@@ -510,12 +541,10 @@
510541 <plugin>
511542 <groupId>org.apache.maven.plugins</groupId>
512543 <artifactId>maven-pmd-plugin</artifactId>
513- <version>3.6</version>
544+ <version>${pmd-plugin.version}</version>
514545 <configuration>
515- <skip>false</skip>
516- <targetJdk>${maven.compiler.target}</targetJdk>
517546 <rulesets>
518- <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
547+ <ruleset>${project.basedir}/pmdrules.xml</ruleset>
519548 </rulesets>
520549 </configuration>
521550 <reportSets>
@@ -531,29 +560,7 @@
531560 <plugin>
532561 <groupId>org.codehaus.mojo</groupId>
533562 <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>
557564 </plugin>
558565
559566 </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.3"
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.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"
88 >
99
1010 <!--
11- OSDN.JP用リリースファイル構成定義ファイル
12- Maven2(or3) assembly用
11+ OSDN.NET用リリースファイル構成定義ファイル
12+ Maven3 assembly用
1313 -->
1414
1515 <id>src</id>
@@ -20,10 +20,9 @@
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>
2827 </includes>
2928 <excludes>
@@ -33,7 +32,7 @@
3332 <useDefaultExcludes>true</useDefaultExcludes>
3433 </fileSet>
3534 <fileSet>
36- <directory>src/</directory>
35+ <directory>${project.basedir}/src</directory>
3736 <useDefaultExcludes>true</useDefaultExcludes>
3837 </fileSet>
3938 </fileSets>
Show on old repository browser