[tomcat] branch 8.5.x updated: Update to Checkstyle 8.22

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new c810721  Update to Checkstyle 8.22
c810721 is described below

commit c8107214e6462e15c4df017bce45da08758f15b0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jul 5 18:22:53 2019 +0100

    Update to Checkstyle 8.22
---
 build.properties.default   | 14 +++++++++-----
 webapps/docs/changelog.xml |  9 +++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index f30d21e..0c5113a 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -103,6 +103,9 @@ base-maven.loc=https://repo.maven.apache.org/maven2
 # Mirror, was used when there were problems with the main SF downloads site
 # base-sf.loc=https://sunet.dl.sourceforge.net
 
+# checkstyle-backport-jre6
+base-checkstyle.loc=https://rnveach.github.io/checkstyle-backport-jre6/maven2
+
 # ----- Webservices - JAX RPC -----
 jaxrpc-lib.version=1.1-rc4
 jaxrpc-lib.checksum.enabled=true
@@ -247,14 +250,15 @@ objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
 objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
 
 # ----- Checkstyle, version 6.16 or later -----
-# Checksums are available at https://sourceforge.net/projects/checkstyle/files/OldFiles/6.17/
-checkstyle.version=6.17
+# Checkstyle 7 requires Java 8
+# Therefore, use checkstyle-backport-jre6
+checkstyle.version=8.22
 checkstyle.checksum.enabled=true
 checkstyle.checksum.algorithm=MD5|SHA-1
-checkstyle.checksum.value=9180ab8b8219b262bfe88f26fd95d26d|11a02d7b0374f8a82fbd76361a69756faa6aefa0
-checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
+checkstyle.checksum.value=03cb9ae24d4103134095ccd650b3bbb7|32d2996bedc97ee4e22c50e6ff5a8b571c8d816e
+checkstyle.home=${base.path}/checkstyle-backport-jre6-${checkstyle.version}
 checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
-checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
+checkstyle.loc=${base-checkstyle.loc}/com/puppycrawl/tools/checkstyle-backport-jre6/${checkstyle.version}/checkstyle-backport-jre6-${checkstyle.version}-all.jar
 
 # ----- Cobertura code coverage tool -----
 cobertura.version=2.1.1
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5becb35..d9d75bc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,15 @@
   issues do not "pop up" wrt. others).
 -->
 <section name="Tomcat 8.5.44 (markt)" rtext="in development">
+  <subsection name="Other">
+    <changelog>
+      <update>
+        Switch from Checkstyle to the JRE6 backport and update to version 8.22.
+        This allows Tomcat 8.5 to use the newer Checkstyle releases while still
+        building with Java 7. (markt)
+      </update>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 8.5.43 (markt)" rtext="release in progress">
   <subsection name="Catalina">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org