OSDN > Find Software > Games/Entertainment > Multiplayer > Jindolf > SCM > git > JinArchiver > Commit

Jindolf
Fork
XmlScheme
JinCore
JinArchiver
Jindolf
JinParser

R/O
HTTP
SSH
HTTPS

JinArchiver: Commit

JinArchiverは、人狼BBSの過去ログを独自のXML形式でローカルディスクに保存するためのツールです。

Commit MetaInfo

Revision	278c7d127b35dad6c8f471ea1ad373416b6cf9b0 (tree)
Time	2017-04-10 23:26:10
Author	Olyutorskii <olyutorskii@user...>
Commiter	Olyutorskii

Log Message

merge release/1.503.4

Change Summary

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}

Incremental Difference

--- a/.hgignore

+++ b/.hgignore

		@@ -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

--- a/CHANGELOG.txt

+++ b/CHANGELOG.txt

		@@ -4,6 +4,9 @@
4	4	JinArchiver 変更履歴
5	5
6	6
	7	+1.503.4 (2017-04-10)
	8	+ ・F国URL修正に伴い JinCore 1.206.10 に対応。
	9	+
7	10	1.503.2 (2016-07-05)
8	11	・必須環境をJRE7に引き上げ。
9	12	・Mavenプラグイン更新。

--- a/README.txt

+++ b/README.txt

		@@ -38,7 +38,7 @@ java -jar jinarchiver-X.X.X.jar -land wolff -vid 1507 -outdir /tmp
38	38
39	39	=== 開発プロジェクト運営元 ===
40	40
41		- https://osdn.jp/projects/jindolf/ まで。
	41	+ https://ja.osdn.net/projects/jindolf/ まで。
42	42
43	43
44	44	=== ディレクトリ内訳構成 ===

		@@ -60,6 +60,15 @@ java -jar jinarchiver-X.X.X.jar -land wolff -vid 1507 -outdir /tmp
60	60	./pom.xml
61	61	Maven3用プロジェクト構成定義ファイル。
62	62
	63	+./checkstyle.xml
	64	+ Checkstyle用configファイル。
	65	+
	66	+./pmdrules.xml
	67	+ PMD用ルール定義ファイル。
	68	+
	69	+./src/assembly/src.xml
	70	+ ソースアーカイブ構成定義ファイル。
	71	+
63	72	./src/main/java/
64	73	Javaのソースコード。
65	74

		@@ -69,17 +78,5 @@ java -jar jinarchiver-X.X.X.jar -land wolff -vid 1507 -outdir /tmp
69	78	./src/test/java/
70	79	JUnit 4.* 用のユニットテストコード。
71	80
72		-./src/main/config/
73		- 各種ビルド・構成管理に必要なファイル群。
74		-
75		-./src/main/config/checks.xml
76		- Checkstyle用configファイル。
77		-
78		-./src/main/config/pmdrules.xml
79		- PMD用ルール定義ファイル。
80		-
81		-./src/main/assembly/descriptor.xml
82		- ソースアーカイブ構成定義ファイル。
83		-
84	81
85	82	--- EOF ---

--- a/SCM.txt

+++ b/SCM.txt

		@@ -10,10 +10,10 @@
10	10
11	11	このアーカイブの原本は、Mercurial(hg)でバージョン管理されています。
12	12	このアーカイブの原本となる開発資産は、
13		- https://osdn.jp/projects/jindolf/scm/hg/JinArchiver/
	13	+ https://ja.osdn.net/projects/jindolf/scm/hg/JinArchiver/
14	14	を上位に持つMercurialリポジトリで管理されています。
15	15	アーカイブの代わりにMercurialを通じての開発資産へのアクセスが可能です。
16		- # hg clone http://hg.osdn.jp/view/jindolf/JinArchiver
	16	+ # hg clone http://hg.osdn.net/view/jindolf/JinArchiver
17	17
18	18
19	19	=== 各種設定ファイル ===

		@@ -36,13 +36,13 @@ Mercurial の EOL Extension 用の設定です。
36	36	EOL Extensionを有効にしないと設定が反映されません。
37	37
38	38
39		-=== リンク ===
	39	+=== Mercurial に関するリンク ===
40	40
41	41	・https://www.mercurial-scm.org/
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 ---

--- a/src/main/config/suppressions.xml

+++ b/checkstyle-suppressions.xml

		@@ -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

		@@ -29,14 +29,14 @@
29	29
30	30	<!-- Javadoc Comments -->
31	31	<suppress files="" checks="SummaryJavadocCheck" />
32		- <!-- 句読点対応待ち -->
33		- <suppress files="" checks="SingleLineJavadoc" />
34		- <!-- ignoredTagsプロパティ対応待ち -->
35	32
36	33	<!-- Miscellaneous -->
37	34	<suppress files="" checks="FinalParameters" />
38	35	<suppress files="" checks="TrailingComment" />
39	36
	37	+ <!-- Whitespace -->
	38	+ <suppress files="" checks="SingleSpaceSeparator" />
	39	+
40	40	</suppressions>
41	41
42	42

--- a/src/main/config/checks.xml

+++ b/checkstyle.xml

		@@ -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 -->

--- a/src/main/config/pmdrules.xml

+++ b/pmdrules.xml

		@@ -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" />

--- a/pom.xml

+++ b/pom.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>jinarchiver</artifactId>
18	18
19		- <version>1.503.3-SNAPSHOT</version>
	19	+ <version>1.503.4</version>
20	20
21	21	<packaging>jar</packaging>
22	22	<name>JinArchiver</name>

		@@ -26,18 +26,18 @@
26	26	-->保存するためのツールです。<!--
27	27	--></description>
28	28
29		- <url>https://osdn.jp/projects/jindolf/devel/</url>
	29	+ <url>https://ja.osdn.net/projects/jindolf/devel/</url>
30	30	<inceptionYear>2009</inceptionYear>
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/JinArchiver</connection>
69		- <developerConnection>scm:hg:ssh://hg.osdn.jp//hgroot/jindolf/JinArchiver</developerConnection>
70		- <url>https://osdn.jp/projects/jindolf/scm/hg/JinArchiver/</url>
	68	+ <connection>scm:hg:http://hg.osdn.net/view/jindolf/JinArchiver</connection>
	69	+ <developerConnection>scm:hg:ssh://hg.osdn.net//hgroot/jindolf/JinArchiver</developerConnection>
	70	+ <url>https://osdn.net/projects/jindolf/scm/hg/JinArchiver/</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.sourceforge.jindolf.archiver.JinArchiver</project.mainentry>
99	113
100	114	</properties>

		@@ -113,7 +127,7 @@
113	127	<dependency>
114	128	<groupId>jp.sourceforge.jindolf</groupId>
115	129	<artifactId>jinparser</artifactId>
116		- <version>1.409.2</version>
	130	+ <version>1.409.4</version>
117	131	<scope>compile</scope>
118	132	</dependency>
119	133

		@@ -123,31 +137,33 @@
123	137	<pluginRepositories/>
124	138
125	139	<build>
126		- <pluginManagement/>
	140	+
	141	+ <pluginManagement>
	142	+
	143	+ <plugins>
	144	+
	145	+ <plugin>
	146	+ <groupId>org.apache.maven.plugins</groupId>
	147	+ <artifactId>maven-checkstyle-plugin</artifactId>
	148	+ <version>${checkstyle-plugin.version}</version>
	149	+ <dependencies>
	150	+ <dependency>
	151	+ <groupId>com.puppycrawl.tools</groupId>
	152	+ <artifactId>checkstyle</artifactId>
	153	+ <!--artifactId>checkstyle-backport-jre6</artifactId-->
	154	+ <version>${checkstyleruntime.version}</version>
	155	+ </dependency>
	156	+ </dependencies>
	157	+ </plugin>
	158	+
	159	+ </plugins>
	160	+
	161	+ </pluginManagement>
127	162
128	163	<plugins>
129	164
130		- <plugin>
131		- <groupId>org.apache.maven.plugins</groupId>
132		- <artifactId>maven-enforcer-plugin</artifactId>
133		- <version>1.4.1</version>
134		- <configuration>
135		- <rules>
136		- <requireMavenVersion>
137		- <version>[3.3,)</version>
138		- </requireMavenVersion>
139		- <requireJavaVersion>
140		- <version>[1.7,)</version>
141		- </requireJavaVersion>
142		- </rules>
143		- </configuration>
144		- </plugin>
145	165
146		- <plugin>
147		- <groupId>org.apache.maven.plugins</groupId>
148		- <artifactId>maven-install-plugin</artifactId>
149		- <version>2.5.2</version>
150		- </plugin>
	166	+ <!-- clean lifecycle -->
151	167
152	168	<plugin>
153	169	<groupId>org.apache.maven.plugins</groupId>

		@@ -158,42 +174,122 @@
158	174	<fileset>
159	175	<directory>${project.basedir}</directory>
160	176	<includes>
161		- <include>**/.DS_Store</include>
162		- <include>**/_MACOSX</include>
	177	+ <include>*/~</include>
	178	+ <include>*/.swp</include>
	179	+ <include>*/.DS_Store</include>
	180	+ <include>*/._</include>
	181	+ <include>**/__MACOSX</include>
163	182	<include>**/Thumbs.db</include>
164		- <include>**/thumbs.db</include>
165		- <include>**/Desktop.ini</include>
166	183	<include>**/desktop.ini</include>
167	184	<include>**/core</include>
	185	+ <include>*/hs_err_pid</include>
168	186	</includes>
169	187	</fileset>
170	188	</filesets>
171	189	</configuration>
172	190	</plugin>
173	191
	192	+
	193	+ <!-- default lifecycle -->
	194	+
	195	+ <plugin>
	196	+ <groupId>org.apache.maven.plugins</groupId>
	197	+ <artifactId>maven-enforcer-plugin</artifactId>
	198	+ <version>1.4.1</version>
	199	+ <configuration>
	200	+ <rules>
	201	+ <requireMavenVersion>
	202	+ <version>[3.0.1,)</version>
	203	+ </requireMavenVersion>
	204	+ <requireJavaVersion>
	205	+ <version>[1.7,)</version>
	206	+ </requireJavaVersion>
	207	+ </rules>
	208	+ </configuration>
	209	+ </plugin>
	210	+
	211	+ <plugin>
	212	+ <groupId>org.apache.maven.plugins</groupId>
	213	+ <artifactId>maven-resources-plugin</artifactId>
	214	+ <version>3.0.2</version>
	215	+ </plugin>
	216	+
174	217	<plugin>
175	218	<groupId>org.apache.maven.plugins</groupId>
176	219	<artifactId>maven-compiler-plugin</artifactId>
177		- <version>3.5.1</version>
	220	+ <version>3.6.1</version>
178	221	<configuration>
179	222	<source>1.7</source> <!-- for NetBeans IDE -->
180	223	<target>1.7</target>
181		- <showDeprecation>true</showDeprecation>
182		- <showWarnings>true</showWarnings>
183	224	<compilerArguments>
184	225	<Xlint/>
185	226	</compilerArguments>
	227	+ <showWarnings>true</showWarnings>
	228	+ <showDeprecation>true</showDeprecation>
	229	+ </configuration>
	230	+ </plugin>
	231	+
	232	+ <plugin>
	233	+ <groupId>org.apache.maven.plugins</groupId>
	234	+ <artifactId>maven-surefire-plugin</artifactId>
	235	+ <version>2.19.1</version>
	236	+ <configuration>
	237	+ <enableAssertions>true</enableAssertions>
186	238	</configuration>
187	239	</plugin>
188	240
189	241	<plugin>
	242	+ <groupId>org.jacoco</groupId>
	243	+ <artifactId>jacoco-maven-plugin</artifactId>
	244	+ <version>${jacoco-plugin.version}</version>
	245	+ <executions>
	246	+ <execution>
	247	+ <id>default-prepare-agent</id>
	248	+ <goals>
	249	+ <goal>prepare-agent</goal>
	250	+ </goals>
	251	+ </execution>
	252	+ <execution>
	253	+ <id>default-report</id>
	254	+ <phase>prepare-package</phase>
	255	+ <goals>
	256	+ <goal>report</goal>
	257	+ </goals>
	258	+ </execution>
	259	+ <execution>
	260	+ <id>default-check</id>
	261	+ <goals>
	262	+ <goal>check</goal>
	263	+ </goals>
	264	+ <configuration>
	265	+ <rules>
	266	+ <rule implementation="org.jacoco.maven.RuleConfiguration">
	267	+ <element>BUNDLE</element>
	268	+ <limits>
	269	+ <limit implementation="org.jacoco.report.check.Limit">
	270	+ <counter>COMPLEXITY</counter>
	271	+ <value>COVEREDRATIO</value>
	272	+ <minimum>0.0</minimum>
	273	+ </limit>
	274	+ </limits>
	275	+ </rule>
	276	+ </rules>
	277	+ </configuration>
	278	+ </execution>
	279	+ </executions>
	280	+ </plugin>
	281	+
	282	+ <plugin>
190	283	<groupId>org.apache.maven.plugins</groupId>
191	284	<artifactId>maven-jar-plugin</artifactId>
192		- <version>3.0.0</version>
	285	+ <version>3.0.2</version>
193	286	<configuration>
194	287	<archive>
195	288	<manifest>
196	289	<mainClass>${project.mainentry}</mainClass>
	290	+ <addDefaultImplementationEntries>
	291	+ false
	292	+ </addDefaultImplementationEntries>
197	293	</manifest>
198	294	<manifestEntries>
199	295	<Built-By>${project.organization.name}</Built-By>

		@@ -205,7 +301,7 @@
205	301	<plugin>
206	302	<groupId>org.apache.maven.plugins</groupId>
207	303	<artifactId>maven-shade-plugin</artifactId>
208		- <version>2.4.3</version>
	304	+ <version>3.0.0</version>
209	305	<executions>
210	306	<execution>
211	307	<phase>package</phase>

		@@ -214,15 +310,6 @@
214	310	</goals>
215	311	<configuration>
216	312	<createDependencyReducedPom>false</createDependencyReducedPom>
217		- <artifactSet>
218		- <includes>
219		- <include>jp.sourceforge.jindolf:jincore</include>
220		- <include>jp.sourceforge.jindolf:jinparser</include>
221		- </includes>
222		- <excludes>
223		- <exclude>junit:junit</exclude>
224		- </excludes>
225		- </artifactSet>
226	313	</configuration>
227	314	</execution>
228	315	</executions>

		@@ -230,20 +317,8 @@
230	317
231	318	<plugin>
232	319	<groupId>org.apache.maven.plugins</groupId>
233		- <artifactId>maven-assembly-plugin</artifactId>
234		- <version>2.6</version>
235		- <configuration>
236		- <archiveBaseDirectory>.</archiveBaseDirectory>
237		- <descriptors>
238		- <descriptor>src/main/assembly/descriptor.xml</descriptor>
239		- </descriptors>
240		- </configuration>
241		- </plugin>
242		-
243		- <plugin>
244		- <groupId>org.apache.maven.plugins</groupId>
245	320	<artifactId>maven-source-plugin</artifactId>
246		- <version>3.0.0</version>
	321	+ <version>3.0.1</version>
247	322	<configuration>
248	323	<includePom>true</includePom>
249	324	<archive>

		@@ -265,76 +340,46 @@
265	340
266	341	<plugin>
267	342	<groupId>org.apache.maven.plugins</groupId>
268		- <artifactId>maven-resources-plugin</artifactId>
269		- <version>3.0.0</version>
	343	+ <artifactId>maven-install-plugin</artifactId>
	344	+ <version>2.5.2</version>
270	345	</plugin>
271	346
272	347	<plugin>
273	348	<groupId>org.apache.maven.plugins</groupId>
274		- <artifactId>maven-surefire-plugin</artifactId>
275		- <version>2.19.1</version>
276		- <configuration>
277		- <skipTests>false</skipTests>
278		- <enableAssertions>true</enableAssertions>
279		- </configuration>
	349	+ <artifactId>maven-deploy-plugin</artifactId>
	350	+ <version>2.8.2</version>
280	351	</plugin>
281	352
282		- <plugin>
283		- <groupId>org.apache.maven.plugins</groupId>
284		- <artifactId>maven-site-plugin</artifactId>
285		- <version>3.5.1</version>
286		- <configuration>
287		- <generateReports>true</generateReports>
288		- <locales>ja</locales>
289		- <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
290		- <outputEncoding>${project.reporting.outputEncoding}</outputEncoding>
291		- </configuration>
292		- </plugin>
293	353
294		- <plugin>
295		- <groupId>org.apache.maven.plugins</groupId>
296		- <artifactId>maven-checkstyle-plugin</artifactId>
297		- <version>2.15</version>
298		- <!-- config from property value -->
299		- </plugin>
	354	+ <!-- site lifecycle -->
300	355
301	356	<plugin>
302	357	<groupId>org.apache.maven.plugins</groupId>
303		- <artifactId>maven-pmd-plugin</artifactId>
	358	+ <artifactId>maven-site-plugin</artifactId>
304	359	<version>3.6</version>
305	360	<configuration>
306		- <targetJdk>${maven.compiler.target}</targetJdk>
307		- <rulesets>
308		- <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
309		- </rulesets>
	361	+ <locales>${site.locales}</locales>
310	362	</configuration>
311	363	</plugin>
312	364
	365	+
	366	+ <!-- goals without lifecycle -->
	367	+
313	368	<plugin>
314		- <groupId>org.codehaus.mojo</groupId>
315		- <artifactId>findbugs-maven-plugin</artifactId>
316		- <version>3.0.3</version>
	369	+ <groupId>org.apache.maven.plugins</groupId>
	370	+ <artifactId>maven-assembly-plugin</artifactId>
	371	+ <version>3.0.0</version>
317	372	<configuration>
318		- <effort>Max</effort>
319		- <threshold>Low</threshold>
320		- <!-- for Jenkins -->
321		- <findbugsXmlOutput>true</findbugsXmlOutput>
322		- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
323		- <xmlOutput>true</xmlOutput>
	373	+ <descriptors>
	374	+ <descriptor>src/assembly/src.xml</descriptor>
	375	+ </descriptors>
324	376	</configuration>
325	377	</plugin>
326	378
327	379	<plugin>
328		- <groupId>org.codehaus.mojo</groupId>
329		- <artifactId>cobertura-maven-plugin</artifactId>
330		- <version>2.7</version>
331		- <configuration>
332		- <encoding>${project.build.sourceEncoding}</encoding>
333		- <formats>
334		- <format>html</format>
335		- <format>xml</format> <!-- for Jenkins -->
336		- </formats>
337		- </configuration>
	380	+ <groupId>org.apache.maven.plugins</groupId>
	381	+ <artifactId>maven-checkstyle-plugin</artifactId>
	382	+ <version>${checkstyle-plugin.version}</version>
338	383	</plugin>
339	384
340	385	</plugins>

		@@ -373,7 +418,7 @@
373	418	<exclude>**/version.properties</exclude>
374	419
375	420	<exclude>**/.DS_Store</exclude>
376		- <exclude>**/_MACOSX</exclude>
	421	+ <exclude>**/__MACOSX</exclude>
377	422	<exclude>**/Thumbs.db</exclude>
378	423	<exclude>**/thumbs.db</exclude>
379	424	<exclude>**/Desktop.ini</exclude>

		@@ -404,19 +449,20 @@
404	449	<report>index</report>
405	450	<report>summary</report>
406	451	<report>license</report>
	452	+ <report>dependency-info</report>
407	453	<report>dependencies</report>
	454	+ <report>dependency-convergence</report>
408	455	<report>plugins</report>
409		- <report>scm</report>
	456	+ <report>plugin-management</report>
410	457	<report>project-team</report>
	458	+ <report>issue-tracking</report>
	459	+ <report>scm</report>
411	460	<!--
412		- <report>dependency-convergence</report>
413		- <report>dependency-info</report>
414	461	<report>dependency-management</report>
415	462	<report>distribution-management</report>
416		- <report>issue-tracking</report>
	463	+ <report>cim</report>
417	464	<report>mailing-list</report>
418	465	<report>modules</report>
419		- <report>plugin-management</report>
420	466	-->
421	467	</reports>
422	468	</reportSet>

		@@ -426,12 +472,15 @@
426	472	<plugin>
427	473	<groupId>org.apache.maven.plugins</groupId>
428	474	<artifactId>maven-javadoc-plugin</artifactId>
429		- <version>2.10.3</version>
	475	+ <version>2.10.4</version>
430	476	<configuration>
431		- <skip>false</skip>
	477	+ <author>false</author>
432	478	<notimestamp>true</notimestamp>
433	479	<quiet>true</quiet>
434	480	<show>protected</show>
	481	+ <locale>${javadoc.locale}</locale>
	482	+ <header>${project.name} ${project.version} API</header>
	483	+ <version>true</version>
435	484	</configuration>
436	485	<reportSets>
437	486	<reportSet>

		@@ -446,48 +495,31 @@
446	495	<groupId>org.apache.maven.plugins</groupId>
447	496	<artifactId>maven-jxr-plugin</artifactId>
448	497	<version>2.5</version>
449		- <configuration>
450		- <skip>false</skip>
451		- </configuration>
452	498	</plugin>
453	499
454	500	<plugin>
455	501	<groupId>org.apache.maven.plugins</groupId>
456	502	<artifactId>maven-surefire-report-plugin</artifactId>
457	503	<version>2.19.1</version>
458		- <configuration>
459		- <showSuccess>false</showSuccess>
460		- </configuration>
	504	+ </plugin>
	505	+
	506	+ <plugin>
	507	+ <groupId>org.jacoco</groupId>
	508	+ <artifactId>jacoco-maven-plugin</artifactId>
	509	+ <version>${jacoco-plugin.version}</version>
461	510	<reportSets>
462	511	<reportSet>
463	512	<reports>
464		- <report>report-only</report>
	513	+ <report>report</report>
465	514	</reports>
466	515	</reportSet>
467	516	</reportSets>
468	517	</plugin>
469	518
470	519	<plugin>
471		- <groupId>org.codehaus.mojo</groupId>
472		- <artifactId>cobertura-maven-plugin</artifactId>
473		- <version>2.7</version>
474		- <configuration>
475		- <encoding>${project.build.sourceEncoding}</encoding>
476		- <formats>
477		- <format>html</format>
478		- <format>xml</format> <!-- for Jenkins -->
479		- </formats>
480		- </configuration>
481		- </plugin>
482		-
483		- <plugin>
484	520	<groupId>org.apache.maven.plugins</groupId>
485	521	<artifactId>maven-checkstyle-plugin</artifactId>
486		- <version>2.15</version>
487		- <configuration>
488		- <skip>false</skip>
489		- <!-- config from property value -->
490		- </configuration>
	522	+ <version>${checkstyle-plugin.version}</version>
491	523	<reportSets>
492	524	<reportSet>
493	525	<reports>

		@@ -500,12 +532,10 @@
500	532	<plugin>
501	533	<groupId>org.apache.maven.plugins</groupId>
502	534	<artifactId>maven-pmd-plugin</artifactId>
503		- <version>3.6</version>
	535	+ <version>${pmd-plugin.version}</version>
504	536	<configuration>
505		- <skip>false</skip>
506		- <targetJdk>${maven.compiler.target}</targetJdk>
507	537	<rulesets>
508		- <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
	538	+ <ruleset>${project.basedir}/pmdrules.xml</ruleset>
509	539	</rulesets>
510	540	</configuration>
511	541	<reportSets>

		@@ -521,29 +551,7 @@
521	551	<plugin>
522	552	<groupId>org.codehaus.mojo</groupId>
523	553	<artifactId>findbugs-maven-plugin</artifactId>
524		- <version>3.0.3</version>
525		- <configuration>
526		- <skip>false</skip>
527		- <effort>Max</effort>
528		- <threshold>Low</threshold>
529		- <!-- for Jenkins -->
530		- <findbugsXmlOutput>true</findbugsXmlOutput>
531		- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
532		- <xmlOutput>true</xmlOutput>
533		- <!-- excludeFilterFile/ -->
534		- </configuration>
535		- </plugin>
536		-
537		- <plugin>
538		- <groupId>org.codehaus.mojo</groupId>
539		- <artifactId>javancss-maven-plugin</artifactId>
540		- <version>2.1</version>
541		- </plugin>
542		-
543		- <plugin>
544		- <groupId>org.codehaus.mojo</groupId>
545		- <artifactId>jdepend-maven-plugin</artifactId>
546		- <version>2.0</version>
	554	+ <version>${findbugs-plugin.version}</version>
547	555	</plugin>
548	556
549	557	</plugins>

--- a/src/main/assembly/descriptor.xml

+++ b/src/assembly/src.xml

		@@ -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>

Show on old repository browser