OSDN Git Service

merge release/1.503.4 release-1.503.4
authorOlyutorskii <olyutorskii@users.osdn.me>
Mon, 10 Apr 2017 14:26:10 +0000 (23:26 +0900)
committerOlyutorskii <olyutorskii@users.osdn.me>
Mon, 10 Apr 2017 14:26:10 +0000 (23:26 +0900)
.hgignore
CHANGELOG.txt
README.txt
SCM.txt
checkstyle-suppressions.xml [moved from src/main/config/suppressions.xml with 79% similarity]
checkstyle.xml [moved from src/main/config/checks.xml with 77% similarity]
pmdrules.xml [moved from src/main/config/pmdrules.xml with 67% similarity]
pom.xml
src/assembly/src.xml [moved from src/main/assembly/descriptor.xml with 58% similarity]

index 3ce27c0..1c350e4 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -27,7 +27,7 @@ syntax: regexp
 syntax: glob
 
 .DS_Store
-_MACOSX
+__MACOSX
 [Tt]humbs.db
 [Dd]esktop.ini
 core
index 6b1d10b..3593228 100644 (file)
@@ -4,6 +4,9 @@
 JinArchiver 変更履歴
 
 
+1.503.4 (2017-04-10)
+    ・F国URL修正に伴い JinCore 1.206.10 に対応。
+
 1.503.2 (2016-07-05)
     ・必須環境をJRE7に引き上げ。
     ・Mavenプラグイン更新。
index b421185..676105c 100644 (file)
@@ -38,7 +38,7 @@ java -jar jinarchiver-X.X.X.jar -land wolff -vid 1507 -outdir /tmp
 
 === 開発プロジェクト運営元 ===
 
-  https://osdn.jp/projects/jindolf/ まで。
+  https://ja.osdn.net/projects/jindolf/ まで。
 
 
 === ディレクトリ内訳構成 ===
@@ -60,6 +60,15 @@ java -jar jinarchiver-X.X.X.jar -land wolff -vid 1507 -outdir /tmp
 ./pom.xml
     Maven3用プロジェクト構成定義ファイル。
 
+./checkstyle.xml
+    Checkstyle用configファイル。
+
+./pmdrules.xml
+    PMD用ルール定義ファイル。
+
+./src/assembly/src.xml
+    ソースアーカイブ構成定義ファイル。
+
 ./src/main/java/
     Javaのソースコード。
 
@@ -69,17 +78,5 @@ java -jar jinarchiver-X.X.X.jar -land wolff -vid 1507 -outdir /tmp
 ./src/test/java/
     JUnit 4.* 用のユニットテストコード。
 
-./src/main/config/
-    各種ビルド・構成管理に必要なファイル群。
-
-./src/main/config/checks.xml
-    Checkstyle用configファイル。
-
-./src/main/config/pmdrules.xml
-    PMD用ルール定義ファイル。
-
-./src/main/assembly/descriptor.xml
-    ソースアーカイブ構成定義ファイル。
-
 
 --- EOF ---
diff --git a/SCM.txt b/SCM.txt
index ea5c1a1..705b978 100644 (file)
--- a/SCM.txt
+++ b/SCM.txt
 
   このアーカイブの原本は、Mercurial(hg)でバージョン管理されています。
   このアーカイブの原本となる開発資産は、
-      https://osdn.jp/projects/jindolf/scm/hg/JinArchiver/
+      https://ja.osdn.net/projects/jindolf/scm/hg/JinArchiver/
   を上位に持つMercurialリポジトリで管理されています。
   アーカイブの代わりにMercurialを通じての開発資産へのアクセスが可能です。
-  # hg clone http://hg.osdn.jp/view/jindolf/JinArchiver
+  # hg clone http://hg.osdn.net/view/jindolf/JinArchiver
 
 
 === 各種設定ファイル ===
@@ -36,13 +36,13 @@ Mercurial の EOL Extension 用の設定です。
 EOL Extensionを有効にしないと設定が反映されません。
 
 
-=== リンク ===
+=== Mercurial に関するリンク ===
 
 ・https://www.mercurial-scm.org/
 ・https://www.mercurial-scm.org/wiki/.hgignore
 ・https://www.selenic.com/mercurial/hgignore.5.html
 ・https://www.mercurial-scm.org/wiki/EolExtension
-・http://tortoisehg.bitbucket.org/
+・https://tortoisehg.bitbucket.io/
 
 
 --- EOF ---
similarity index 79%
rename from src/main/config/suppressions.xml
rename to checkstyle-suppressions.xml
index f1500fa..dcb855d 100644 (file)
@@ -5,8 +5,8 @@
     "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 
 <!--
-    Checkstyle用警告抑止設定
-    ※ SuppressionFilter モジュール用
+    Checkstyle suppressions
+    for Checkstyle 6.19(7.4) or later
 
     [ http://checkstyle.sourceforge.net/ ]
 
 
     <!-- Javadoc Comments -->
     <suppress files="" checks="SummaryJavadocCheck" />
-        <!-- 句読点対応待ち -->
-    <suppress files="" checks="SingleLineJavadoc" />
-        <!-- ignoredTagsプロパティ対応待ち -->
 
     <!-- Miscellaneous -->
     <suppress files="" checks="FinalParameters" />
     <suppress files="" checks="TrailingComment" />
 
+    <!-- Whitespace -->
+    <suppress files="" checks="SingleSpaceSeparator" />
+
 </suppressions>
 
 
similarity index 77%
rename from src/main/config/checks.xml
rename to checkstyle.xml
index bad583f..dbf68d3 100644 (file)
@@ -5,9 +5,8 @@
     "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 
 <!--
-    Checkstyle用チェック項目定義。
-
-    Checkstyle 6.1 以降向けに記述。
+    Checkstyle modules
+    for Checkstyle 6.19(7.4) or later
 
     [ http://checkstyle.sourceforge.net/ ]
 
 
     <property name="charset" value="UTF-8" />
     <property name="localeCountry" value="JP" />
-    <property name="localeLanguage" value="ja" />
+    <property name="localeLanguage" value="en" />
+    <!--property name="localeLanguage" value="ja" /-->
+    <property name="fileExtensions" value="java, xml, properties" />
     <property name="severity" value="error" />
 
 
     <!-- Filters -->
     <module name="SeverityMatchFilter" />
     <module name="SuppressionCommentFilter" />
-    <module name="SuppressionFilter">
-        <property name="file" value="src/main/config/suppressions.xml" />
-    </module>
+    <module name="SuppressionFilter" />
     <module name="SuppressWarningsFilter" />
     <module name="SuppressWithNearbyCommentFilter" />
 
 
     <!-- Headers -->
+    <module name="Header">
+        <property name="header" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; ?&gt;" />
+        <property name="fileExtensions" value="xml" />
+    </module>
     <module name="RegexpHeader">
         <property name="header" value="^/\*$\n^ \*( .*)?$\n^ \*/$\n" />
         <property name="multiLines" value="2" />
@@ -57,7 +60,7 @@
     <module name="RegexpMultiline">
         <property name="format" value="[\u000b\f\u001a]" />
     </module>
-<!--<module name="RegexpOnFilename" />   6.15 or later -->
+    <module name="RegexpOnFilename" />
     <module name="RegexpSingleline">
         <property name="format" value="\s+$" />
     </module>
@@ -68,9 +71,7 @@
 
 
     <!-- Size Violations -->
-    <module name="FileLength">
-        <property name="max" value="2000"/>
-    </module>
+    <module name="FileLength" />
 
 
     <!-- Whitespace -->
@@ -80,6 +81,7 @@
     <module name="TreeWalker">
 
         <property name="tabWidth" value="8"/>
+        <property name="fileExtensions" value="java"/>
 
 
     <!-- Annotations -->
 
 
     <!-- Block Checks -->
+
         <module name="AvoidNestedBlocks" />
         <module name="EmptyBlock" />
-<!--    <module name="EmptyCatchBlock" />  6.4 or later  -->
+        <module name="EmptyCatchBlock" />
         <module name="LeftCurly" />
         <module name="NeedBraces">
-            <property name="tokens" value="LITERAL_DO" />
+            <property name="allowSingleLineStatement" value="true" />
         </module>
         <module name="RightCurly" />
 
         <module name="InterfaceIsType" />
         <module name="MutableException" />
         <module name="OneTopLevelClass" />
-        <module name="ThrowsCount">
-            <property name="max" value="4" />
-        </module>
+        <module name="ThrowsCount" />
         <module name="VisibilityModifier" />
 
 
         <module name="HiddenField">
             <property name="ignoreConstructorParameter" value="true" />
             <property name="ignoreSetter" value="true" />
+            <property name="setterCanReturnItsClass" value="true" />
             <property name="ignoreAbstractMethods" value="true" />
         </module>
         <module name="IllegalCatch" />
         <module name="IllegalToken">
             <property name="tokens" value="LITERAL_NATIVE" />
         </module>
-        <module name="IllegalTokenText">
-            <property name="tokens" value="NUM_INT, NUM_LONG" />
-            <property name="format" value="^0_*[0-7]" />
-            <property name="message" value="inhibit octal number" />
-        </module>
+        <module name="IllegalTokenText" />
         <module name="IllegalType" />
         <module name="InnerAssignment" />
         <module name="MagicNumber" />
         <module name="ModifiedControlVariable" />
         <module name="MultipleStringLiterals" />
         <module name="MultipleVariableDeclarations" />
-        <module name="SimplifyBooleanExpression" />
-        <module name="SimplifyBooleanReturn" />
-        <module name="StringLiteralEquality" />
         <module name="NestedForDepth" />
         <module name="NestedIfDepth" />
         <module name="NestedTryDepth" />
         <module name="PackageDeclaration" />
         <module name="ParameterAssignment" />
         <module name="RequireThis">
-            <property name="checkMethods" value="false" />
-        </module>
-        <module name="ReturnCount">
-            <property name="max" value="5" />
+            <!--property name="checkMethods" value="false" /-->
         </module>
+        <module name="ReturnCount" />
         <module name="SimplifyBooleanExpression" />
         <module name="SimplifyBooleanReturn" />
         <module name="StringLiteralEquality" />
         <module name="SuperClone" />
         <module name="SuperFinalize" />
         <module name="UnnecessaryParentheses" />
-        <module name="VariableDeclarationUsageDistance">
-            <property name="allowedDistance" value="5" />
-        </module>
+        <module name="VariableDeclarationUsageDistance" />
 
 
     <!-- Imports -->
             <property name="allowIfAllCharactersEscaped" value="true"/>
             <property name="allowNonPrintableEscapes" value="true"/>
         </module>
-<!--    <module name="CommentsIndentation" />  6.10 or later  -->
+        <module name="CommentsIndentation" />
         <module name="DescendantToken" />
         <module name="FileContentsHolder" />
         <module name="FinalParameters" />
     <!-- Naming Conventions -->
 
         <module name="AbbreviationAsWordInName" />
-        <module name="AbstractClassName">
-            <property
-                name="format"
-                value="^Abstract.*$|^.*Factory$|^.*Builder$|^.*Adapter$"
-            />
-        </module>
-<!--    <module name="CatchParameterName" />    6.14 or later -->
+        <module name="AbstractClassName" />
+        <module name="CatchParameterName" />
         <module name="ClassTypeParameterName" />
         <module name="ConstantName" />
         <module name="InterfaceTypeParameterName" />
-        <module name="LocalFinalVariableName">
-            <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
-        </module>
-        <module name="LocalVariableName">
-            <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
-        </module>
-        <module name="MemberName">
-            <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
-        </module>
+        <module name="LocalFinalVariableName" />
+        <module name="LocalVariableName" />
+        <module name="MemberName" />
         <module name="MethodName" />
         <module name="MethodTypeParameterName" />
         <module name="PackageName" />
-        <module name="ParameterName">
-            <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
-        </module>
-        <module name="StaticVariableName">
-            <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
-        </module>
+        <module name="ParameterName" />
+        <module name="StaticVariableName" />
         <module name="TypeName" />
 
 
             <property name="allowLineBreaks" value="false" />
             <property name="tokens" value="COMMA, POST_INC, POST_DEC" />
         </module>
-        <module name="NoWhitespaceBefore">
-            <property name="allowLineBreaks" value="true" />
-            <property name="tokens" value="SEMI" />
-        </module>
-        <module name="OperatorWrap">
-            <property name="option" value="eol" />
-            <property
-                name="tokens"
-                value="ASSIGN,
-                       BAND_ASSIGN, BOR_ASSIGN, BXOR_ASSIGN,
-                       PLUS_ASSIGN, MINUS_ASSIGN,
-                       STAR_ASSIGN, DIV_ASSIGN, MOD_ASSIGN,
-                       SL_ASSIGN, SR_ASSIGN, BSR_ASSIGN"
-            />
-        </module>
-        <module name="OperatorWrap">
-            <property name="option" value="nl" />
-            <property
-                name="tokens"
-                value="QUESTION,
-                       BAND, BOR, BXOR,
-                       PLUS, MINUS, STAR, DIV, MOD,
-                       LAND, LOR,
-                       EQUAL, NOT_EQUAL"
-            />
-        </module>
+        <module name="OperatorWrap" />
         <module name="ParenPad">
             <property name="option" value="nospace" />
             <property
             <property name="tokens" value="DOT" />
             <property name="option" value="nl" />
         </module>
+        <module name="SingleSpaceSeparator" />
         <module name="TypecastParenPad" />
-        <module name="WhitespaceAfter" />
+        <module name="WhitespaceAfter" >
+            <property name="tokens" value="COMMA, SEMI,"/>
+        </module>
         <module name="WhitespaceAround">
             <property
                 name="tokens"
 
     </module>
 
+
 </module>
 
 <!-- EOF -->
similarity index 67%
rename from src/main/config/pmdrules.xml
rename to pmdrules.xml
index 9c10f91..8388a54 100644 (file)
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
-    PMD用ルールセット定義
-
-    PMD [ https://pmd.github.io/ ] 5.3 以降用に記述されています。
+    Custom rule set
+    for PMD [ https://pmd.github.io/ ] 5.5.2 or later
 
     Copyright(c) 2016 olyutorskii
 -->
 >
 
     <description>
-        custom rulesets for project
+        custom rulesets
     </description>
 
-<!--
     <rule ref="rulesets/java/android.xml" />
--->
 
     <rule ref="rulesets/java/basic.xml" />
 
 
     <rule ref="rulesets/java/clone.xml" />
 
-    <rule ref="rulesets/java/codesize.xml">
-        <exclude name="TooManyMethods" />
-    </rule>
-    <rule ref="rulesets/java/codesize.xml/TooManyMethods">
-        <properties>
-            <property name="maxmethods" value="25"/>
-        </properties>
-    </rule>
+    <rule ref="rulesets/java/codesize.xml" />
 
     <rule ref="rulesets/java/comments.xml">
-        <exclude name="CommentRequired" />
-        <exclude name="CommentSize" />
+        <exclude name="CommentDefaultAccessModifier" />
     </rule>
     <rule ref="rulesets/java/comments.xml/CommentRequired" >
         <properties>
     </rule>
 
     <rule ref="rulesets/java/controversial.xml">
-        <exclude name="NullAssignment" />
-        <exclude name="OnlyOneReturn" />
         <exclude name="DefaultPackage" />
+        <exclude name="OnlyOneReturn" />
         <exclude name="DataflowAnomalyAnalysis" />
-        <exclude name="AvoidUsingShortType" />
         <exclude name="AvoidLiteralsInIfCondition" />
-        <exclude name="UseConcurrentHashMap" />
     </rule>
 
     <rule ref="rulesets/java/coupling.xml">
@@ -73,8 +59,6 @@
     </rule>
 
     <rule ref="rulesets/java/design.xml">
-        <exclude name="SimplifyBooleanReturns" />
-        <exclude name="ConfusingTernary" />
         <exclude name="UnnecessaryLocalBeforeReturn" />
         <exclude name="FieldDeclarationsShouldBeAtStartOfClass" />
     </rule>
 
     <rule ref="rulesets/java/imports.xml" />
 
-<!--
-    <rule ref="rulesets/java/j2ee.xml" />
-    <rule ref="rulesets/java/javabeans.xml" />
--->
-
-    <rule ref="rulesets/java/junit.xml" />
+    <rule ref="rulesets/java/j2ee.xml">
+        <exclude name="DoNotUseThreads" />
+    </rule>
 
-<!--
     <rule ref="rulesets/java/logging-jakarta-commons.xml" />
--->
+
+    <rule ref="rulesets/java/javabeans.xml">
+        <exclude name="BeanMembersShouldSerialize" />
+    </rule>
 
     <rule ref="rulesets/java/logging-java.xml" />
 
+    <rule ref="rulesets/java/junit.xml" />
+
     <rule ref="rulesets/java/migrating.xml" />
-<!--
-    <rule ref="rulesets/java/migrating_to_XX.xml" />
--->
 
     <rule ref="rulesets/java/naming.xml">
         <exclude name="ShortVariable" />
         <exclude name="LongVariable" />
-        <exclude name="AvoidFieldNameMatchingMethodName" />
-    </rule>
-    <rule ref="rulesets/java/naming.xml/LongVariable">
-        <properties>
-            <property name="minimum" value="25"/>
-        </properties>
     </rule>
 
     <rule ref="rulesets/java/optimizations.xml">
         <exclude name="RedundantFieldInitializer" />
     </rule>
 
-    <rule ref="rulesets/java/strictexception.xml">
-        <exclude name="AvoidThrowingNullPointerException" />
-    </rule>
+    <rule ref="rulesets/java/strictexception.xml" />
 
-    <rule ref="rulesets/java/strings.xml" />
+    <rule ref="rulesets/java/strings.xml">
+        <exclude name="ConsecutiveAppendsShouldReuse" />
+    </rule>
 
     <rule ref="rulesets/java/sunsecure.xml" />
 
 
     <rule ref="rulesets/java/unnecessary.xml">
         <exclude name="UnnecessaryReturn" />
-        <exclude name="UselessParentheses" />
     </rule>
 
     <rule ref="rulesets/java/unusedcode.xml" />
diff --git a/pom.xml b/pom.xml
index 306af28..2f63c65 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
   xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-  http://maven.apache.org/maven-v4_0_0.xsd"
+  http://maven.apache.org/xsd/maven-4.0.0.xsd"
 >
     <modelVersion>4.0.0</modelVersion>
     <!--parent/-->
@@ -16,7 +16,7 @@
     <groupId>jp.sourceforge.jindolf</groupId>
     <artifactId>jinarchiver</artifactId>
 
-    <version>1.503.3-SNAPSHOT</version>
+    <version>1.503.4</version>
 
     <packaging>jar</packaging>
     <name>JinArchiver</name>
 -->保存するためのツールです。<!--
  --></description>
 
-    <url>https://osdn.jp/projects/jindolf/devel/</url>
+    <url>https://ja.osdn.net/projects/jindolf/devel/</url>
     <inceptionYear>2009</inceptionYear>
 
     <organization>
         <name>Jindolf Partners</name>
-        <url>https://osdn.jp/projects/jindolf/devel/</url>
+        <url>https://ja.osdn.net/projects/jindolf/devel/</url>
     </organization>
 
     <licenses>
         <license>
             <name>The MIT License</name>
-            <url>https://opensource.org/licenses/mit-license.php</url>
+            <url>https://opensource.org/licenses/MIT</url>
             <distribution>manual</distribution>
         </license>
     </licenses>
@@ -47,7 +47,7 @@
             <id>olyutorskii</id>
             <url>https://sites.google.com/site/olyutorskiipit/</url>
             <organization>Jindolf Partners</organization>
-            <organizationUrl>https://osdn.jp/projects/jindolf/devel/</organizationUrl>
+            <organizationUrl>https://ja.osdn.net/projects/jindolf/devel/</organizationUrl>
             <roles>
                 <role>Project Founder</role>
                 <role>Java Developer</role>
     <mailingLists/>
 
     <prerequisites>
-        <maven>3.3</maven>
+        <maven>3.0.1</maven>
     </prerequisites>
 
     <modules/>
 
     <scm>
-        <connection>scm:hg:http://hg.osdn.jp/view/jindolf/JinArchiver</connection>
-        <developerConnection>scm:hg:ssh://hg.osdn.jp//hgroot/jindolf/JinArchiver</developerConnection>
-        <url>https://osdn.jp/projects/jindolf/scm/hg/JinArchiver/</url>
+        <connection>scm:hg:http://hg.osdn.net/view/jindolf/JinArchiver</connection>
+        <developerConnection>scm:hg:ssh://hg.osdn.net//hgroot/jindolf/JinArchiver</developerConnection>
+        <url>https://osdn.net/projects/jindolf/scm/hg/JinArchiver/</url>
     </scm>
 
     <issueManagement>
-        <system>OSDN.JP</system>
-        <url>https://osdn.jp/projects/jindolf/ticket/</url>
+        <system>OSDN.NET</system>
+        <url>https://ja.osdn.net/projects/jindolf/ticket/</url>
     </issueManagement>
 
     <ciManagement/>
     <distributionManagement/>
 
     <properties>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
 
         <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
         <maven.compiler.showWarnings>true</maven.compiler.showWarnings>
 
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <project.mainconf>${project.basedir}/src/main/config</project.mainconf>
+        <site.locales>en</site.locales>
+        <javadoc.locale>en</javadoc.locale>
+        <findbugs.jvmArgs>-Duser.language=en</findbugs.jvmArgs>
 
-        <checkstyle.config.location>${project.mainconf}/checks.xml</checkstyle.config.location>
+        <jacoco-plugin.version>0.7.9</jacoco-plugin.version>
+
+        <checkstyle-plugin.version>2.17</checkstyle-plugin.version>
+        <checkstyleruntime.version>6.19</checkstyleruntime.version>
+        <checkstyle.config.location>${project.basedir}/checkstyle.xml</checkstyle.config.location>
+        <checkstyle.suppressions.location>${project.basedir}/checkstyle-suppressions.xml</checkstyle.suppressions.location>
         <checkstyle.enable.rss>false</checkstyle.enable.rss>
 
+        <pmd-plugin.version>3.7</pmd-plugin.version>
+
+        <findbugs-plugin.version>3.0.4</findbugs-plugin.version>
+        <findbugs.effort>Max</findbugs.effort>
+        <findbugs.threshold>Low</findbugs.threshold>
+        <!-- for Jenkins -->
+        <findbugs.xmlOutput>true</findbugs.xmlOutput>
+
         <project.mainentry>jp.sourceforge.jindolf.archiver.JinArchiver</project.mainentry>
 
     </properties>
         <dependency>
             <groupId>jp.sourceforge.jindolf</groupId>
             <artifactId>jinparser</artifactId>
-            <version>1.409.2</version>
+            <version>1.409.4</version>
             <scope>compile</scope>
         </dependency>
 
     <pluginRepositories/>
 
     <build>
-        <pluginManagement/>
+
+        <pluginManagement>
+
+            <plugins>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <version>${checkstyle-plugin.version}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>com.puppycrawl.tools</groupId>
+                            <artifactId>checkstyle</artifactId>
+                            <!--artifactId>checkstyle-backport-jre6</artifactId-->
+                            <version>${checkstyleruntime.version}</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+
+            </plugins>
+
+        </pluginManagement>
 
         <plugins>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <configuration>
-                    <rules>
-                        <requireMavenVersion>
-                            <version>[3.3,)</version>
-                        </requireMavenVersion>
-                        <requireJavaVersion>
-                            <version>[1.7,)</version>
-                        </requireJavaVersion>
-                    </rules>
-                </configuration>
-            </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-install-plugin</artifactId>
-                <version>2.5.2</version>
-            </plugin>
+            <!-- clean lifecycle -->
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                         <fileset>
                             <directory>${project.basedir}</directory>
                             <includes>
-                                <include>**/.DS_Store</include>
-                                <include>**/_MACOSX</include>
+                                <include>**/*~</include>
+                                <include>**/*.swp</include>
+                                <include>**/*.DS_Store</include>
+                                <include>**/._*</include>
+                                <include>**/__MACOSX</include>
                                 <include>**/Thumbs.db</include>
-                                <include>**/thumbs.db</include>
-                                <include>**/Desktop.ini</include>
                                 <include>**/desktop.ini</include>
                                 <include>**/core</include>
+                                <include>**/hs_err_pid*</include>
                             </includes>
                         </fileset>
                     </filesets>
                 </configuration>
             </plugin>
 
+
+            <!-- default lifecycle -->
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.4.1</version>
+                <configuration>
+                    <rules>
+                        <requireMavenVersion>
+                            <version>[3.0.1,)</version>
+                        </requireMavenVersion>
+                        <requireJavaVersion>
+                            <version>[1.7,)</version>
+                        </requireJavaVersion>
+                    </rules>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.0.2</version>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.6.1</version>
                 <configuration>
                     <source>1.7</source>  <!-- for NetBeans IDE -->
                     <target>1.7</target>
-                    <showDeprecation>true</showDeprecation>
-                    <showWarnings>true</showWarnings>
                     <compilerArguments>
                         <Xlint/>
                     </compilerArguments>
+                    <showWarnings>true</showWarnings>
+                    <showDeprecation>true</showDeprecation>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.19.1</version>
+                <configuration>
+                    <enableAssertions>true</enableAssertions>
                 </configuration>
             </plugin>
 
             <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>default-prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>default-report</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>default-check</id>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <rule implementation="org.jacoco.maven.RuleConfiguration">
+                                    <element>BUNDLE</element>
+                                    <limits>
+                                        <limit implementation="org.jacoco.report.check.Limit">
+                                            <counter>COMPLEXITY</counter>
+                                            <value>COVEREDRATIO</value>
+                                            <minimum>0.0</minimum>
+                                        </limit>
+                                    </limits>
+                                </rule>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.0.2</version>
                 <configuration>
                     <archive>
                         <manifest>
                             <mainClass>${project.mainentry}</mainClass>
+                            <addDefaultImplementationEntries>
+                                false
+                            </addDefaultImplementationEntries>
                         </manifest>
                         <manifestEntries>
                             <Built-By>${project.organization.name}</Built-By>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <artifactSet>
-                                <includes>
-                                    <include>jp.sourceforge.jindolf:jincore</include>
-                                    <include>jp.sourceforge.jindolf:jinparser</include>
-                                </includes>
-                                <excludes>
-                                    <exclude>junit:junit</exclude>
-                                </excludes>
-                            </artifactSet>
                         </configuration>
                     </execution>
                 </executions>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <archiveBaseDirectory>.</archiveBaseDirectory>
-                    <descriptors>
-                        <descriptor>src/main/assembly/descriptor.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.0.1</version>
                 <configuration>
                     <includePom>true</includePom>
                     <archive>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.0</version>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.5.2</version>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19.1</version>
-                <configuration>
-                    <skipTests>false</skipTests>
-                    <enableAssertions>true</enableAssertions>
-                </configuration>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>3.5.1</version>
-                <configuration>
-                    <generateReports>true</generateReports>
-                    <locales>ja</locales>
-                    <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
-                    <outputEncoding>${project.reporting.outputEncoding}</outputEncoding>
-                </configuration>
-            </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.15</version>
-                <!-- config from property value -->
-            </plugin>
+            <!-- site lifecycle -->
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pmd-plugin</artifactId>
+                <artifactId>maven-site-plugin</artifactId>
                 <version>3.6</version>
                 <configuration>
-                    <targetJdk>${maven.compiler.target}</targetJdk>
-                    <rulesets>
-                        <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
-                    </rulesets>
+                    <locales>${site.locales}</locales>
                 </configuration>
             </plugin>
 
+
+            <!-- goals without lifecycle -->
+
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>3.0.3</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.0.0</version>
                 <configuration>
-                    <effort>Max</effort>
-                    <threshold>Low</threshold>
-                    <!-- for Jenkins -->
-                    <findbugsXmlOutput>true</findbugsXmlOutput>
-                    <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
-                    <xmlOutput>true</xmlOutput>
+                    <descriptors>
+                        <descriptor>src/assembly/src.xml</descriptor>
+                    </descriptors>
                 </configuration>
             </plugin>
 
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.7</version>
-                <configuration>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                    <formats>
-                        <format>html</format>
-                        <format>xml</format> <!-- for Jenkins -->
-                    </formats>
-                </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>${checkstyle-plugin.version}</version>
             </plugin>
 
         </plugins>
                     <exclude>**/version.properties</exclude>
 
                     <exclude>**/.DS_Store</exclude>
-                    <exclude>**/_MACOSX</exclude>
+                    <exclude>**/__MACOSX</exclude>
                     <exclude>**/Thumbs.db</exclude>
                     <exclude>**/thumbs.db</exclude>
                     <exclude>**/Desktop.ini</exclude>
                             <report>index</report>
                             <report>summary</report>
                             <report>license</report>
+                            <report>dependency-info</report>
                             <report>dependencies</report>
+                            <report>dependency-convergence</report>
                             <report>plugins</report>
-                            <report>scm</report>
+                            <report>plugin-management</report>
                             <report>project-team</report>
+                            <report>issue-tracking</report>
+                            <report>scm</report>
 <!--
-                            <report>dependency-convergence</report>
-                            <report>dependency-info</report>
                             <report>dependency-management</report>
                             <report>distribution-management</report>
-                            <report>issue-tracking</report>
+                            <report>cim</report>
                             <report>mailing-list</report>
                             <report>modules</report>
-                            <report>plugin-management</report>
 -->
                         </reports>
                     </reportSet>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
+                <version>2.10.4</version>
                 <configuration>
-                    <skip>false</skip>
+                    <author>false</author>
                     <notimestamp>true</notimestamp>
                     <quiet>true</quiet>
                     <show>protected</show>
+                    <locale>${javadoc.locale}</locale>
+                    <header>${project.name} ${project.version} API</header>
+                    <version>true</version>
                 </configuration>
                 <reportSets>
                     <reportSet>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jxr-plugin</artifactId>
                 <version>2.5</version>
-                <configuration>
-                    <skip>false</skip>
-                </configuration>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
                 <version>2.19.1</version>
-                <configuration>
-                    <showSuccess>false</showSuccess>
-                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco-plugin.version}</version>
                 <reportSets>
                     <reportSet>
                         <reports>
-                            <report>report-only</report>
+                            <report>report</report>
                         </reports>
                     </reportSet>
                 </reportSets>
             </plugin>
 
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.7</version>
-                <configuration>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                    <formats>
-                        <format>html</format>
-                        <format>xml</format> <!-- for Jenkins -->
-                    </formats>
-                </configuration>
-            </plugin>
-
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.15</version>
-                <configuration>
-                    <skip>false</skip>
-                    <!-- config from property value -->
-                </configuration>
+                <version>${checkstyle-plugin.version}</version>
                 <reportSets>
                     <reportSet>
                         <reports>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.6</version>
+                <version>${pmd-plugin.version}</version>
                 <configuration>
-                    <skip>false</skip>
-                    <targetJdk>${maven.compiler.target}</targetJdk>
                     <rulesets>
-                        <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
+                        <ruleset>${project.basedir}/pmdrules.xml</ruleset>
                     </rulesets>
                 </configuration>
                 <reportSets>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>3.0.3</version>
-                <configuration>
-                    <skip>false</skip>
-                    <effort>Max</effort>
-                    <threshold>Low</threshold>
-                    <!-- for Jenkins -->
-                    <findbugsXmlOutput>true</findbugsXmlOutput>
-                    <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
-                    <xmlOutput>true</xmlOutput>
-                    <!-- excludeFilterFile/ -->
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>javancss-maven-plugin</artifactId>
-                <version>2.1</version>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jdepend-maven-plugin</artifactId>
-                <version>2.0</version>
+                <version>${findbugs-plugin.version}</version>
             </plugin>
 
         </plugins>
similarity index 58%
rename from src/main/assembly/descriptor.xml
rename to src/assembly/src.xml
index 41810c6..0610012 100644 (file)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <assembly
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+  xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3
-  http://maven.apache.org/xsd/assembly-1.1.3.xsd"
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
+  http://maven.apache.org/xsd/assembly-2.0.0.xsd"
 >
 
 <!--
-    OSDN.JP用リリースファイル構成定義ファイル
-    Maven2(or3) assembly用
+    OSDN.NET用リリースファイル構成定義ファイル
+    Maven3 assembly用
 -->
 
     <id>src</id>
 
     <fileSets>
         <fileSet>
-            <directory>.</directory>
+            <directory>${project.basedir}</directory>
             <includes>
-                <include>pom.xml</include>
-                <include>fixcrlf.xml</include>
+                <include>*.xml</include>
                 <include>*.txt</include>
             </includes>
             <excludes>
@@ -33,7 +32,7 @@
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
         <fileSet>
-            <directory>src/</directory>
+            <directory>${project.basedir}/src</directory>
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
     </fileSets>