OSDN Git Service

Merge release/v3.303.106 release-3.303.106
authorOlyutorskii <olyutorskii@users.osdn.me>
Tue, 7 May 2019 12:31:59 +0000 (21:31 +0900)
committerOlyutorskii <olyutorskii@users.osdn.me>
Tue, 7 May 2019 12:31:59 +0000 (21:31 +0900)
13 files changed:
.gitattributes [new file with mode: 0644]
.gitignore [new file with mode: 0644]
.hgeol [deleted file]
.hgignore [deleted file]
CHANGELOG.txt
README.txt
SCM.txt [deleted file]
config/checkstyle/checkstyle-suppressions.xml
config/checkstyle/checkstyle.xml
config/pmd/pmdrules.xml
fixcrlf.xml [deleted file]
pom.xml
src/assembly/src.xml

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..ded193f
--- /dev/null
@@ -0,0 +1,25 @@
+### Git attributes  https://git-scm.com/docs/gitattributes
+
+* text=auto
+
+*.java text diff=java
+
+*.xml text eol=lf
+*.xsd text eol=lf
+*.dtd text eol=lf
+*.properties text eol=lf
+
+*.txt text
+*.md text
+*.yml text
+
+*.html text
+*.css text
+*.js text
+
+*.gif binary
+*.png binary
+*.jpeg binary
+*.jpg binary
+
+### EOF ###
diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..3bf3b09
--- /dev/null
@@ -0,0 +1,67 @@
+##### Git ignore pattern   https://git-scm.com/docs/gitignore
+
+
+### Unix
+
+/tmp/
+*~
+*.swp
+*.orig
+# core
+
+
+### macOS
+
+*.DS_Store
+._*
+__MACOSX
+
+
+### Windows
+
+Thumbs.db
+desktop.ini
+
+
+### JDK
+
+hs_err_pid*
+
+
+### Maven
+
+/target/
+
+
+### Netbeans
+
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/nbproject/
+/nbactions.xml
+/nb-configuration.xml
+
+
+### Eclipse
+
+/bin/
+/.settings/
+/.metadata/
+/.externalToolBuilders/
+/.classpath
+/.project
+/.checkstyle
+
+
+### IntelliJ
+
+/.idea/
+/out/
+*.iws
+*.iml
+*.ipr
+
+
+### EOF ###
diff --git a/.hgeol b/.hgeol
deleted file mode 100644 (file)
index 8458257..0000000
--- a/.hgeol
+++ /dev/null
@@ -1,19 +0,0 @@
-[patterns]
-
-**.txt = native
-
-**.java = native
-**.properties = LF
-
-**.xml = LF
-**.xsd = LF
-**.dtd = LF
-
-**.html = LF
-**.htm = LF
-**.css = LF
-
-**.png = BIN
-**.gif = BIN
-**.jpeg = BIN
-**.jpg = BIN
diff --git a/.hgignore b/.hgignore
deleted file mode 100644 (file)
index 155107c..0000000
--- a/.hgignore
+++ /dev/null
@@ -1,40 +0,0 @@
-#########################
-# for Mercurial hgignore
-#########################
-
-
-#####################
-syntax: regexp
-
-^nb-configuration\.xml$
-^nbactions\.xml$
-^\.classpath$
-^\.project$
-
-\.orig$
-\.orig\..*$
-\.chg\..*$
-\.rej$
-\.conflict\~$
-^target/
-^build/
-^bin/
-^nbproject/
-^\.settings/
-
-\.iml$
-
-
-#####################
-syntax: glob
-
-.DS_Store
-__MACOSX
-[Tt]humbs.db
-[Dd]esktop.ini
-core
-
-.idea
-
-
-### EOF ###
index f86a143..a5da832 100644 (file)
@@ -4,6 +4,12 @@
 Jindolf 変更履歴
 
 
+3.303.106 (2019-05-07)
+    ・必須環境をJavaSE8に引き上げ。
+    ・Mercurial(3.303.5-SNAPSHOT)からGit(3.303.105-SNAPSHOT)へSCMを移行。
+    ・JinParser 2.101.106 に対応。
+    ・Jovsonz 1.101.104 に対応。
+
 3.303.4 (2018-07-09)
     ・JDK9以降のWindows HiDPI環境に対応。
     ・キャスト表Wiki出力の見栄えを改善。
index cc2f6e0..a0d237c 100644 (file)
@@ -20,9 +20,9 @@
 
 === 実行環境 ===
 
- - JindolfはJava言語(JavaSE7)で記述されたプログラムです。
- - JindolfはJRE1.7に準拠したJava実行環境で利用できるように作られています。
-   原則として、JRE1.7に準拠した実行系であれば、プラットフォームを選びません。
+ - JindolfはJava言語(JavaSE8)で記述されたプログラムです。
+ - JindolfはJavaSE8に準拠したJava実行環境で利用できるように作られています。
+   原則として、JavaSE8に準拠した実行系であれば、プラットフォームを選びません。
  - JindolfはGUIを通じて操作するプログラムのため、その実行においては
    ビットマップディスプレイとポインティングデバイスとキーボードへの接続を
    必要とします。
@@ -34,7 +34,7 @@
 
 === 依存ライブラリ ===
 
- - Jindolfはビルドおよび実行に際してJinCore,JinParserおよびJovsonzライブラリを
+ - Jindolfはビルドおよび実行に際してJinParserおよびJovsonzライブラリを
    必要とします。開発時はMaven等を用いてこれらのライブラリを用意してください。
 
 
@@ -61,9 +61,6 @@
 ./LICENSE.txt
     ライセンスに関して。
 
-./SCM.txt
-    ソースコード管理に関して。
-
 ./pom.xml
     Maven3用プロジェクト構成定義ファイル。
 
diff --git a/SCM.txt b/SCM.txt
deleted file mode 100644 (file)
index 99c9ae2..0000000
--- a/SCM.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-[UTF-8 Japanese]
-
-                               J i n d o l f
-                    バージョン管理システムに関する情報
-
-                                              Copyright(c) 2011 olyutorskii
-
-
-=== バージョン管理体制 ===
-
-  このアーカイブの原本は、Mercurial(hg)でバージョン管理されています。
-  このアーカイブの原本となる開発資産は、
-      https://ja.osdn.net/projects/jindolf/scm/hg/Jindolf/
-  を上位に持つMercurialリポジトリで管理されています。
-  アーカイブの代わりにMercurialを通じての開発資産へのアクセスが可能です。
-  # hg clone http://hg.osdn.net/view/jindolf/Jindolf
-
-
-=== 各種設定ファイル ===
-
-./.hgignore
-
-Mercurial 管理の対象外にさせたいファイル群の設定です。
-IDE独自の設定ファイルは基本的に管理対象外とする方針です。
-
-
-./.hgeol
-
-Mercurial の EOL Extension 用の設定です。
-非バイナリなテキストファイルの改行コードに関する設定です。
-・拡張子が *.txt なローカルファイルの改行文字はローカルの環境に合わせる。
-・拡張子が *.java なローカルファイルの改行文字はローカルの環境に合わせる。
-・それ以外の非バイナリなローカルファイルの改行文字は基本LFで統一。
-・リポジトリ上の全ての非バイナリファイルの改行文字は基本LFで統一。
-というポリシーで運用しています。
-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
-・https://tortoisehg.bitbucket.io/
-
-
---- EOF ---
index 4cff696..6ada9ac 100644 (file)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!DOCTYPE suppressions PUBLIC
-    "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <!--
     Checkstyle suppressions
-    for Checkstyle 6.19 or later
+    for Checkstyle 8.20 or later
 
-    [ http://checkstyle.sourceforge.net/ ]
+    [ https://checkstyle.org/ ]
 
-    Copyright(c) 2010 olyutorskii
+    Copyright(c) 2019 olyutorskii
 -->
 
 
@@ -18,6 +18,9 @@
 
     <suppress files="Jindolf.java" checks="UncommentedMain" />
 
+    <!-- Annotations -->
+    <suppress files="" checks="AnnotationOnSameLine" />
+
     <!-- Class Design -->
     <suppress files="" checks="DesignForExtension" />
 
@@ -25,6 +28,7 @@
     <suppress files="" checks="ExplicitInitialization" />
     <suppress files="" checks="FinalLocalVariable" />
     <suppress files="" checks="MagicNumber" />
+    <suppress files="" checks="OneStatementPerLine" />
 
     <!-- Imports -->
     <suppress files="" checks="ImportControl" />
@@ -36,6 +40,9 @@
     <suppress files="" checks="FinalParameters" />
     <suppress files="" checks="TrailingComment" />
 
+    <!-- Modifiers -->
+    <suppress files="" checks="InterfaceMemberImpliedModifier" />
+
     <!-- Whitespace -->
     <suppress files="" checks="SingleSpaceSeparator" />
 
index 8522b2a..59fd165 100644 (file)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <!--
     Checkstyle modules
-    for Checkstyle 6.18 or later
+    for Checkstyle 8.20 or later
 
-    [ http://checkstyle.sourceforge.net/ ]
+    [ https://checkstyle.org/ ]
 
-    Copyright(c) 2010 olyutorskii
+    Copyright(c) 2019 olyutorskii
 -->
 
 
 
     <!-- Filters -->
     <module name="SeverityMatchFilter" />
-    <module name="SuppressionCommentFilter" />
-    <module name="SuppressionFilter" />
+    <!--module name="SuppressionFilter" /-->
     <module name="SuppressWarningsFilter" />
-    <module name="SuppressWithNearbyCommentFilter" />
+    <module name="SuppressWithPlainTextCommentFilter" />
 
 
     <!-- Headers -->
     <module name="FileTabCharacter" />
 
 
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="module\-info\.java$" />
+    </module>
+
+
     <module name="TreeWalker">
 
-        <property name="tabWidth" value="8"/>
-        <property name="fileExtensions" value="java"/>
+        <property name="tabWidth" value="8" />
+        <property name="fileExtensions" value="java" />
 
         <module name="SuppressWarningsHolder" />
 
 
+    <!-- Filters -->
+
+        <module name="SuppressionCommentFilter" />
+        <module name="SuppressWithNearbyCommentFilter" />
+        <!--module name="SuppressionXpathFilter" /-->
+        <!--module name="SuppressionXpathSingleFilter" /-->
+
+
     <!-- Annotations -->
 
         <module name="AnnotationLocation" />
+        <module name="AnnotationOnSameLine" />
         <module name="AnnotationUseStyle" />
         <module name="MissingDeprecated" />
         <module name="MissingOverride" />
         <module name="PackageDeclaration" />
         <module name="ParameterAssignment" />
         <module name="RequireThis">
-            <!--property name="checkMethods" value="false" /-->
+            <property name="checkMethods" value="false" />
+        </module>
+        <module name="ReturnCount">
+            <property name="max" value="5" />
+            <property name="maxForVoid" value="5" />
         </module>
-        <module name="ReturnCount" />
         <module name="SimplifyBooleanExpression" />
         <module name="SimplifyBooleanReturn" />
         <module name="StringLiteralEquality" />
         <module name="AvoidStaticImport" />
         <module name="CustomImportOrder" />
         <module name="IllegalImport" />
-        <module name="ImportControl" />
+        <!--module name="ImportControl" /-->
         <module name="ImportOrder" />
         <module name="RedundantImport" />
         <module name="UnusedImports" />
 
         <module name="ArrayTypeStyle" />
         <module name="AvoidEscapedUnicodeCharacters">
-            <property name="allowEscapesForControlCharacters" value="true"/>
-            <property name="allowByTailComment" value="true"/>
-            <property name="allowIfAllCharactersEscaped" value="true"/>
-            <property name="allowNonPrintableEscapes" value="true"/>
+            <property name="allowEscapesForControlCharacters" value="true" />
+            <property name="allowByTailComment" value="true" />
+            <property name="allowIfAllCharactersEscaped" value="true" />
+            <property name="allowNonPrintableEscapes" value="true" />
         </module>
         <module name="CommentsIndentation" />
         <module name="DescendantToken" />
-        <module name="FileContentsHolder" />
         <module name="FinalParameters" />
         <module name="Indentation">
             <property name="caseIndent" value="0" />
 
     <!-- Modifiers -->
 
+        <module name="ClassMemberImpliedModifier" />
+        <module name="InterfaceMemberImpliedModifier" />
         <module name="ModifierOrder" />
         <module name="RedundantModifier" />
 
         <module name="ClassTypeParameterName" />
         <module name="ConstantName" />
         <module name="InterfaceTypeParameterName" />
+        <module name="LambdaParameterName" />
         <module name="LocalFinalVariableName" />
         <module name="LocalVariableName" />
         <module name="MemberName" />
             <property name="tokens" value="DOT" />
             <property name="option" value="nl" />
         </module>
-        <!-- *6.19* module name="SingleSpaceSeparator" /-->
+        <module name="SingleSpaceSeparator" />
         <module name="TypecastParenPad" />
         <module name="WhitespaceAfter" >
-            <property name="tokens" value="COMMA, SEMI,"/>
+            <property name="tokens" value="COMMA, SEMI," />
         </module>
         <module name="WhitespaceAround">
             <property
index 5f249ce..f9c0994 100644 (file)
@@ -2,9 +2,9 @@
 
 <!--
     Custom rule set
-    for PMD [ https://pmd.github.io/ ] 6.4.0 or later
+    for PMD [ https://pmd.github.io/ ] 6.13.0 or later
 
-    Copyright(c) 2016 olyutorskii
+    Copyright(c) 2019 olyutorskii
 -->
 
 <ruleset
@@ -24,6 +24,8 @@
     <rule ref="category/java/codestyle.xml" >
         <exclude name="CommentDefaultAccessModifier" />
         <exclude name="DefaultPackage" />
+        <exclude name="IfElseStmtsMustUseBraces" />
+        <exclude name="IfStmtsMustUseBraces" />
         <exclude name="LocalVariableCouldBeFinal" />
         <exclude name="MethodArgumentCouldBeFinal" />
         <exclude name="OnlyOneReturn" />
@@ -44,6 +46,8 @@
     </rule>
 
     <rule ref="category/java/design.xml" >
+        <exclude name="AvoidThrowingNullPointerException" />
+        <exclude name="AvoidUncheckedExceptionsInSignatures" />
         <exclude name="LawOfDemeter" />
         <exclude name="LoosePackageCoupling" />
     </rule>
diff --git a/fixcrlf.xml b/fixcrlf.xml
deleted file mode 100644 (file)
index 90a7b46..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.8.0 or later.        -->
-<!-- ====================================================================== -->
-
-<project basedir=".">
-<description>
-CAUTION : This is not build-file for project-building.
-It's just adapting project-files for native environment.
-</description>
-
-<!-- ====================================================================== -->
-<!-- sanitize files for native environment                                  -->
-<!-- ====================================================================== -->
-
-    <target description="sanitize files" name="sanitize" >
-        <echo message="sanitize files..." />
-
-        <fixcrlf
-            srcDir="." includes="*.txt"
-            encoding="UTF-8" outputencoding="UTF-8"
-            tablength="8" tab="remove"
-            eof="remove"
-        />
-
-        <fixcrlf
-            srcDir="./src/" includes="**/*.java"
-            encoding="UTF-8" outputencoding="UTF-8"
-            tablength="4" tab="remove" javafiles="true"
-            eof="remove"
-        />
-
-        <fixcrlf
-            srcDir="./src/" includes="**/*.properties"
-            encoding="ISO-8859-1" outputencoding="ISO-8859-1"
-            eol="lf"
-            eof="remove"
-        />
-
-        <fixcrlf
-            srcDir="./src/" includes="**/*.xml,**/*.xsd,**/*.dtd"
-            encoding="UTF-8" outputencoding="UTF-8"
-            tablength="8" tab="remove"
-            eol="lf"
-            eof="remove"
-        />
-
-        <fixcrlf
-            srcDir="./src/" includes="**/*.html,**/*.htm,**/*.css"
-            encoding="UTF-8" outputencoding="UTF-8"
-            tablength="8" tab="remove"
-            eol="lf"
-            eof="remove"
-        />
-
-        <chmod type="file" perm="a-x">
-            <fileset dir="." includes="**/*" excludes="**/*.sh" />
-        </chmod>
-
-    </target>
-
-</project>
-
-<!-- EOF -->
diff --git a/pom.xml b/pom.xml
index 576bb61..6eb41cf 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
     <groupId>jp.sourceforge.jindolf</groupId>
     <artifactId>jindolf</artifactId>
 
-    <version>3.303.4</version>
+    <version>3.303.106</version>
 
     <packaging>jar</packaging>
     <name>Jindolf</name>
     <modules/>
 
     <scm>
-        <connection>scm:hg:http://hg.osdn.net/view/jindolf/Jindolf</connection>
-        <developerConnection>scm:hg:ssh://hg.osdn.net//hgroot/jindolf/Jindolf</developerConnection>
-        <url>https://osdn.net/projects/jindolf/scm/hg/Jindolf/</url>
+        <connection>scm:git:git://git.osdn.net/gitroot/jindolf/Jindolf.git</connection>
+        <developerConnection>scm:git:https://scm.osdn.net/gitroot/jindolf/Jindolf.git</developerConnection>
+        <url>https://osdn.net/projects/jindolf/scm/git/Jindolf/</url>
     </scm>
 
     <issueManagement>
-        <system>OSDN.NET</system>
+        <system>OSDN.net</system>
         <url>https://ja.osdn.net/projects/jindolf/ticket/</url>
     </issueManagement>
 
@@ -77,8 +77,8 @@
     <distributionManagement/>
 
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
 
         <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
         <maven.compiler.showWarnings>true</maven.compiler.showWarnings>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <site.locales>en</site.locales>
-        <javadoc.locale>en</javadoc.locale>
-        <findbugs.jvmArgs>-Duser.language=en</findbugs.jvmArgs>
+        <locale>en</locale>
+        <site.locales>${locale}</site.locales>
+        <javadoc.locale>${locale}</javadoc.locale>
+        <spotbugs.jvmArgs>-Duser.language=${locale}</spotbugs.jvmArgs>
 
-        <jacoco-plugin.version>0.8.1</jacoco-plugin.version>
+        <!-- Walk around: JDK 11 javadoc + Maven -->
+        <detectJavaApiLink>false</detectJavaApiLink>
+
+        <surefire-plugin.version>3.0.0-M3</surefire-plugin.version>
+        <jacoco-plugin.version>0.8.3</jacoco-plugin.version>
 
         <checkstyle-plugin.version>3.0.0</checkstyle-plugin.version>
-        <!-- checkstyleruntime.version>6.19</checkstyleruntime.version -->
+        <checkstyleruntime.version>8.20</checkstyleruntime.version>
         <checkstyle.config.location>${project.basedir}/config/checkstyle/checkstyle.xml</checkstyle.config.location>
         <checkstyle.suppressions.location>${project.basedir}/config/checkstyle/checkstyle-suppressions.xml</checkstyle.suppressions.location>
         <checkstyle.enable.rss>false</checkstyle.enable.rss>
 
-        <pmd-plugin.version>3.10.0</pmd-plugin.version>
+        <pmd-plugin.version>3.12.0</pmd-plugin.version>
         <pmd.analysisCache>true</pmd.analysisCache>
 
-        <findbugs-plugin.version>3.0.5</findbugs-plugin.version>
-        <findbugs.effort>Max</findbugs.effort>
-        <findbugs.threshold>Low</findbugs.threshold>
+        <spotbugs-plugin.version>3.1.11</spotbugs-plugin.version>
+        <spotbugs.effort>Max</spotbugs.effort>
+        <spotbugs.threshold>Low</spotbugs.threshold>
         <!-- for Jenkins -->
-        <findbugs.xmlOutput>true</findbugs.xmlOutput>
+        <spotbugs.xmlOutput>true</spotbugs.xmlOutput>
 
         <project.mainentry>jp.sfjp.jindolf.Jindolf</project.mainentry>
         <project.splash>jp/sfjp/jindolf/resources/image/logo.png</project.splash>
         <dependency>
             <groupId>jp.osdn.jindolf</groupId>
             <artifactId>jinparser</artifactId>
-            <version>2.101.4</version>
+            <version>2.101.106</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>jp.sourceforge.jovsonz</groupId>
             <artifactId>jovsonz</artifactId>
-            <version>1.101.2</version>
+            <version>1.101.104</version>
             <scope>compile</scope>
         </dependency>
 
                     <artifactId>maven-checkstyle-plugin</artifactId>
                     <version>${checkstyle-plugin.version}</version>
                     <dependencies>
-                        <!-- dependency>
+                        <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <artifactId>checkstyle-backport-jre6</artifactId>
                             <version>${checkstyleruntime.version}</version>
-                        </dependency -->
+                        </dependency>
                     </dependencies>
                 </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M1</version>
-                <configuration>
-                    <rules>
-                        <requireMavenVersion>
-                            <version>[3.0.1,)</version>
-                        </requireMavenVersion>
-                        <requireJavaVersion>
-                            <version>[1.7,)</version>
-                        </requireJavaVersion>
-                    </rules>
-                </configuration>
+                <version>3.0.0-M2</version>
+                <executions>
+                    <execution>
+                        <id>enforce-versions</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>[3.3.9,)</version>
+                                </requireMavenVersion>
+                                <requireJavaVersion>
+                                    <version>[1.8,)</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
 
             <plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.7</source>  <!-- for NetBeans IDE -->
-                    <target>1.7</target>
+                    <source>1.8</source>  <!-- for NetBeans IDE -->
+                    <target>1.8</target>
                     <compilerArguments>
                         <Xlint/>
                     </compilerArguments>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.0</version>
+                <version>${surefire-plugin.version}</version>
                 <configuration>
                     <enableAssertions>true</enableAssertions>
                 </configuration>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.1.1</version>
                 <configuration>
                     <archive>
                         <manifest>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
-                <version>2.5.2</version>
+                <version>3.0.0-M1</version>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.2</version>
+                <version>3.0.0-M1</version>
             </plugin>
 
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.1.1</version>
                 <configuration>
                     <descriptors>
                         <descriptor>src/assembly/src.xml</descriptor>
                 <version>${checkstyle-plugin.version}</version>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>${pmd-plugin.version}</version>
+                <configuration>
+                    <rulesets>
+                        <ruleset>${project.basedir}/config/pmd/pmdrules.xml</ruleset>
+                    </rulesets>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <version>${spotbugs-plugin.version}</version>
+            </plugin>
+
         </plugins>
 
         <resources>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.1.0</version>
                 <configuration>
                     <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>
+                    <locale>${javadoc.locale}</locale>
+                    <!-- for JDK11 javadoc -->
+                    <additionalJOption>-J-Duser.language=${javadoc.locale}</additionalJOption>
                 </configuration>
                 <reportSets>
                     <reportSet>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.5</version>
+                <version>3.0.0</version>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.21.0</version>
+                <version>${surefire-plugin.version}</version>
             </plugin>
 
             <plugin>
             </plugin>
 
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>${findbugs-plugin.version}</version>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <version>${spotbugs-plugin.version}</version>
             </plugin>
 
         </plugins>
index aea3064..b4f4424 100644 (file)
@@ -8,7 +8,7 @@
 >
 
 <!--
-    OSDN.NET用リリースファイル構成定義ファイル
+    OSDN.net用リリースファイル構成定義ファイル
     Maven3 assembly用
 -->
 
@@ -24,6 +24,7 @@
             <includes>
                 <include>*.xml</include>
                 <include>*.txt</include>
+                <include>*.md</include>
             </includes>
             <excludes>
                 <exclude>nb-configuration.xml</exclude>
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/config</directory>
+            <directory>${project.basedir}/src</directory>
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/src</directory>
+            <directory>${project.basedir}/config</directory>
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
     </fileSets>