From 1fa5d66b987dcfa90b50de7136e1b9da7c08c46f Mon Sep 17 00:00:00 2001 From: "arseniy.tashoyan" Date: Sat, 27 Jul 2019 15:16:30 +0300 Subject: [PATCH 1/8] Extract artifact versions to Maven properties. Upgrade Maven API and tools. Upgrade JUnit. Upgrade Java to 1.8. --- pom.xml | 54 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index 2714406..8efb3e5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,26 +10,40 @@ maven-plugin 1.1.0-SNAPSHOT Scalastyle Maven Plugin - Integrates Scalastyle style checker for Scala with maven + Integrates Scalastyle style checker for Scala with Maven 2012 - ${maven.version} + ${maven.compat.version} - scalastyle_2.11 + UTF-8 + + 1.8 + 2.11 + 3.6.1 + 3.0 + + 3.6.0 + 3.8.1 + 3.1.0 + 3.2.0 + 1.6 + 1.0.0 + 3.6.1 + 3.6.0 + 1.1.0 + 3.3.0 + 1.1.0-SNAPSHOT - 3.0 - 1.5 - 1.5 - 4.11 + 4.12 org.scalastyle - ${scalastyle.artifactId} + scalastyle_${compiler.scala.compat.version} ${scalastyle.version} @@ -41,7 +55,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.2 + ${maven-plugin-annotations.version} provided @@ -53,7 +67,7 @@ org.codehaus.plexus plexus-resources - 1.0-alpha-7 + ${plexus-resources.version} @@ -66,7 +80,7 @@ org.apache.maven.plugin-testing maven-plugin-testing-harness - 1.2 + ${maven-plugin-testing-harness.version} test @@ -77,7 +91,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.2 + ${maven-plugin-plugin.version} true @@ -99,17 +113,17 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + ${maven-compiler-plugin.version} - 1.5 - 1.5 - UTF-8 + ${compiler.java.version} + ${compiler.java.version} + ${project.build.sourceEncoding} org.apache.maven.plugins maven-source-plugin - 2.1.2 + ${maven-source-plugin.version} attach-sources @@ -122,7 +136,7 @@ maven-invoker-plugin - 1.5 + ${maven-invoker-plugin.version} src/it/settings.xml ${project.build.directory}/it @@ -157,7 +171,7 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 + ${lifecycle-mapping.version} @@ -210,7 +224,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.1 + ${maven-gpg-plugin.version} sign-artifacts From f1dfca62a802d1e3db597e55773f3642a70ab25f Mon Sep 17 00:00:00 2001 From: "arseniy.tashoyan" Date: Sat, 27 Jul 2019 15:17:40 +0300 Subject: [PATCH 2/8] Set Scalastyle version to the latest release: 1.0.0 - hopefuly the plugin release will not depend on a snapshot --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8efb3e5..ee3561d 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 1.1.0 3.3.0 - 1.1.0-SNAPSHOT + 1.0.0 4.12 From d8dad6c2344a2cd77c062d32e1c766f982267415 Mon Sep 17 00:00:00 2001 From: "arseniy.tashoyan" Date: Sat, 27 Jul 2019 15:19:53 +0300 Subject: [PATCH 3/8] Upgrade to Scala 2.12 compatible Scalastyle --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ee3561d..9f9a9d7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ UTF-8 1.8 - 2.11 + 2.12 3.6.1 3.0 From f35d14827b23ae5948128f4448ebf1c12bcb8ee8 Mon Sep 17 00:00:00 2001 From: "arseniy.tashoyan" Date: Sat, 27 Jul 2019 15:22:21 +0300 Subject: [PATCH 4/8] Use a property instead of hardcode --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f9a9d7..57831e3 100644 --- a/pom.xml +++ b/pom.xml @@ -264,7 +264,7 @@ ${basedir}/src/test/scala ${basedir}/build-tools/scalastyle_config.xml ${project.build.directory}/scalastyle-output.xml - UTF-8 + ${project.build.sourceEncoding} From ad841e8d2240b0ddd4faf9f96f7f1f39367b0c9a Mon Sep 17 00:00:00 2001 From: "arseniy.tashoyan" Date: Sat, 27 Jul 2019 15:29:17 +0300 Subject: [PATCH 5/8] Remove unused property --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 57831e3..2a7e7c0 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,6 @@ 3.2.0 1.6 1.0.0 - 3.6.1 3.6.0 1.1.0 3.3.0 From 2d04d2d8f3844151776935d9e147c9245148c218 Mon Sep 17 00:00:00 2001 From: "arseniy.tashoyan" Date: Sat, 27 Jul 2019 15:31:09 +0300 Subject: [PATCH 6/8] Update the plugin version in the doc --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d648224..ca44560 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Default phase of execution is `verify`. The following is an example of a configu org.scalastyle scalastyle-maven-plugin - 0.8.0 + 1.1.0 false true From ac95ed63aa4ca0c79ad4bb437a8509af06aabf1d Mon Sep 17 00:00:00 2001 From: "arseniy.tashoyan" Date: Sat, 27 Jul 2019 15:35:09 +0300 Subject: [PATCH 7/8] Upgrade Scala to 2.12 and Java to 8 --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index de2cd35..621483b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: scala scala: - - 2.10.3 + - 2.12.8 jdk: - - oraclejdk7 - - openjdk7 + - oraclejdk8 + - openjdk8 notifications: email: - matthew@farwell.co.uk From 70c5cd886bf374fe957e6e43e89b02f4ed47052e Mon Sep 17 00:00:00 2001 From: "arseniy.tashoyan" Date: Sat, 27 Jul 2019 15:37:30 +0300 Subject: [PATCH 8/8] Workaround for build failures on Travis CI when using oraclejdk8: Expected feature release number in range of 9 to 14, but got: 8 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 621483b..92f029f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: scala +dist: trusty scala: - 2.12.8 jdk: