Bump up Maven Wrapper and Maven Plugins

asakusafw · Aug 30, 2017 · 48925c6 · 48925c6
1 parent 445debe
commit 48925c6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 22 deletions.
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
diff --git a/build-tools/src/main/resources/com/asakusafw/checkstyle.xml b/build-tools/src/main/resources/com/asakusafw/checkstyle.xml
@@ -10,7 +10,7 @@
     <module name="FileContentsHolder"/>
     <module name="JavadocMethod">
       <property name="scope" value="protected"/>
-      <property name="validateThrows" value="true"/>
+      <property name="validateThrows" value="false"/>
       <property name="allowUndeclaredRTE" value="true"/>
       <property name="suppressLoadErrors" value="true"/>
       <property name="tokens" value="METHOD_DEF,CTOR_DEF"/>
@@ -125,6 +125,11 @@
       <property name="severity" value="ignore"/>
       <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
     </module>
+    <module name="SuppressionCommentFilter">
+      <property name="offCommentFormat" value="CHECKSTYLE\:OFF\s+([\w\|\.\*]+)"/>
+      <property name="onCommentFormat" value="CHECKSTYLE\:ON\s+([\w\|\.\*]+)"/>
+      <property name="checkFormat" value="$1"/>
+    </module>
   </module>
   <module name="JavadocPackage"/>
   <module name="NewlineAtEndOfFile">
@@ -143,9 +148,4 @@
     <property name="message" value="Line has trailing spaces."/>
     <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
   </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CHECKSTYLE\:OFF\s+([\w\|\.\*]+)"/>
-    <property name="onCommentFormat" value="CHECKSTYLE\:ON\s+([\w\|\.\*]+)"/>
-    <property name="checkFormat" value="$1"/>
-  </module>
 </module>
diff --git a/pom.xml b/pom.xml
@@ -51,31 +51,31 @@
 
   <properties>
     <!-- plugin versions -->
-    <plugin.resources.version>3.0.1</plugin.resources.version>
-    <plugin.dependency.version>2.10</plugin.dependency.version>
-    <plugin.compiler.version>3.5.1</plugin.compiler.version>
-    <plugin.surefire.version>2.19.1</plugin.surefire.version>
+    <plugin.resources.version>3.0.2</plugin.resources.version>
+    <plugin.dependency.version>3.0.1</plugin.dependency.version>
+    <plugin.compiler.version>3.6.2</plugin.compiler.version>
+    <plugin.surefire.version>2.20</plugin.surefire.version>
     <plugin.source.version>3.0.1</plugin.source.version>
     <plugin.eclipse.version>2.10</plugin.eclipse.version>
-    <plugin.build-helper.version>1.12</plugin.build-helper.version>
+    <plugin.build-helper.version>3.0.0</plugin.build-helper.version>
     <plugin.antrun.version>1.8</plugin.antrun.version>
     <plugin.properties.version>1.0.0</plugin.properties.version>
-    <plugin.assembly.version>2.6</plugin.assembly.version>
+    <plugin.assembly.version>3.1.0</plugin.assembly.version>
     <plugin.jar.version>3.0.2</plugin.jar.version>
-    <plugin.shade.version>2.4.3</plugin.shade.version>
-    <plugin.javadoc.version>2.10.4</plugin.javadoc.version>
-    <plugin.release.version>2.5.2</plugin.release.version>
+    <plugin.shade.version>3.1.0</plugin.shade.version>
+    <plugin.javadoc.version>3.0.0-M1</plugin.javadoc.version>
+    <plugin.release.version>2.5.3</plugin.release.version>
     <plugin.deploy.version>2.8.2</plugin.deploy.version>
-    <plugin.wagon-ssh.version>2.10</plugin.wagon-ssh.version>
+    <plugin.wagon-ssh.version>3.0.0</plugin.wagon-ssh.version>
     <plugin.aws-maven.version>5.0.0.RELEASE</plugin.aws-maven.version>
     <plugin.javacc.version>2.6</plugin.javacc.version>
     <plugin.jflex.version>1.6.1</plugin.jflex.version>
     <plugin.license.version>3.0</plugin.license.version>
-    <plugin.checkstyle.version>2.12.1</plugin.checkstyle.version>
-    <plugin.findbugs.version>3.0.4</plugin.findbugs.version>
-    <plugin.site.version>3.5.1</plugin.site.version>
+    <plugin.checkstyle.version>2.17</plugin.checkstyle.version>
+    <plugin.findbugs.version>3.0.5</plugin.findbugs.version>
+    <plugin.site.version>3.6</plugin.site.version>
     <plugin.project-info-reports.version>2.9</plugin.project-info-reports.version>
-    <plugin.surefire-report.version>2.19.1</plugin.surefire-report.version>
+    <plugin.surefire-report.version>2.20</plugin.surefire-report.version>
 
     <!-- artifact id/versions -->
     <hadoop.version>2.7.3</hadoop.version>
@@ -95,7 +95,7 @@
     <jcommander.version>1.72</jcommander.version>
     <gradle.version>4.1</gradle.version>
     <javacc.version>7.0.2</javacc.version>
-    <checkstyle.version>6.17</checkstyle.version>
+    <checkstyle.version>8.1</checkstyle.version>
 
     <!-- fragile artifacts -->
     <httpclient.version>4.2.6</httpclient.version>
@@ -500,6 +500,8 @@ encoding/<project>=UTF-8
             <configLocation>com/asakusafw/checkstyle.xml</configLocation>
             <suppressionsLocation>com/asakusafw/checkstyle-suppressions.xml</suppressionsLocation>
             <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+            <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
+            <linkXRef>false</linkXRef>
           </configuration>
         </plugin>
         <plugin>