This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 2934d5f Switch to Checkstyle JRE6 backport
2934d5f is described below
commit 2934d5f5da9db93de4432e0a2e4b80dc168104a0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Mar 21 19:44:24 2019 +0000
Switch to Checkstyle JRE6 backport
Allows Gump (using latest snapshot) and local Java 6 build to use the
same Checkstyle configuration file.
---
build.properties.default | 15 +++++++++++----
webapps/docs/changelog.xml | 6 ++++++
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 9eaa9af..f8782c3 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -83,6 +83,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
+
# ----- Commons Logging, version 1.1 or later -----
# If this version is updated, check the versions required for the dependencies
below
# - avalon-framework
@@ -272,14 +275,18 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
# ----- Checkstyle, version 6.0 or later -----
# Limited to 6.1.1 since that is the latest release that supports Java 6
-checkstyle.version=6.1.1
+# Gump uses the latest checkstyle and the configuration format is incompatible
+# between the latest version and 6.1.1
+# Therefore, use checkstyle-backport-jre6
+checkstyle.version=8.17
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=MD5|SHA-1
-checkstyle.checksum.value=bfbbd909c0b9c6724434421a202e0912|aeb92ff49b80c958fd29f5e8f349f8b5fd4342bd
-checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
-checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
+checkstyle.checksum.value=e268f16a5cab5b291546fae909e3f9b3|b626c3e518f315faf860b521807c31a03c9e2d8a
+checkstyle.home=${base.path}/checkstyle-backport-jre6-${checkstyle.version}
+checkstyle.loc=${base-checkstyle.loc}/com/puppycrawl/tools/checkstyle-backport-jre6/${checkstyle.version}/checkstyle-backport-jre6-${checkstyle.version}-all.jar
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
+
# ----- JSON Libraries (for bayeux module) -----
json-lib.home=${base.path}/json-20080701
json-lib.lib=http://repo1.maven.org/maven2/org/json/json/20080701/json-20080701.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 79d78b3..0499770 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -181,6 +181,12 @@
Add JDBC 4.1 support to the default database connection pool provided
by
Tomcat. (markt)
</add>
+ <update>
+ Switch from Checkstyle to the JRE6 backport and update to version 8.17.
+ This allows Tomcat 7 to use the newer configuration format (required by
+ Gump that uses the latest Checkstyle snapshot) while still building
with
+ Java 6. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
