diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 6637cedb28..56bb0164ec 100644 --- 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 \ No newline at end of file +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip \ No newline at end of file diff --git a/build-tools/src/main/resources/com/asakusafw/checkstyle.xml b/build-tools/src/main/resources/com/asakusafw/checkstyle.xml index 9548184dd9..be9cbbd4d0 100644 --- a/build-tools/src/main/resources/com/asakusafw/checkstyle.xml +++ b/build-tools/src/main/resources/com/asakusafw/checkstyle.xml @@ -10,7 +10,7 @@ - + @@ -125,6 +125,11 @@ + + + + + @@ -143,9 +148,4 @@ - - - - - diff --git a/pom.xml b/pom.xml index 37b2c76dc4..16aa1a3b78 100644 --- a/pom.xml +++ b/pom.xml @@ -51,31 +51,31 @@ - 3.0.1 - 2.10 - 3.5.1 - 2.19.1 + 3.0.2 + 3.0.1 + 3.6.2 + 2.20 3.0.1 2.10 - 1.12 + 3.0.0 1.8 1.0.0 - 2.6 + 3.1.0 3.0.2 - 2.4.3 - 2.10.4 - 2.5.2 + 3.1.0 + 3.0.0-M1 + 2.5.3 2.8.2 - 2.10 + 3.0.0 5.0.0.RELEASE 2.6 1.6.1 3.0 - 2.12.1 - 3.0.4 - 3.5.1 + 2.17 + 3.0.5 + 3.6 2.9 - 2.19.1 + 2.20 2.7.3 @@ -95,7 +95,7 @@ 1.72 4.1 7.0.2 - 6.17 + 8.1 4.2.6 @@ -500,6 +500,8 @@ encoding/=UTF-8 com/asakusafw/checkstyle.xml com/asakusafw/checkstyle-suppressions.xml checkstyle.suppressions.file + ${project.build.sourceDirectory} + false