Author: kkolinko Date: Wed Apr 6 00:33:28 2016 New Revision: 1737903 URL: http://svn.apache.org/viewvc?rev=1737903&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59276 Update to Checkstyle 6.17
As I described in Bugzilla, this includes a configuration change, breaking compatibility with versions earlier than 6.16. Modified: tomcat/trunk/build.properties.default tomcat/trunk/res/checkstyle/checkstyle.xml tomcat/trunk/res/checkstyle/javax-checkstyle.xml tomcat/trunk/res/checkstyle/org-checkstyle.xml tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1737903&r1=1737902&r2=1737903&view=diff ============================================================================== --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Wed Apr 6 00:33:28 2016 @@ -216,8 +216,8 @@ objenesis.home=${base.path}/objenesis-${ objenesis.loc=https://objenesis.googlecode.com/files/objenesis-${objenesis.version}-bin.zip objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar -# ----- Checkstyle, version 6.0 or later ----- -checkstyle.version=6.15 +# ----- Checkstyle, version 6.16 or later ----- +checkstyle.version=6.17 checkstyle.home=${base.path}/checkstyle-${checkstyle.version} checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar Modified: tomcat/trunk/res/checkstyle/checkstyle.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/checkstyle.xml?rev=1737903&r1=1737902&r2=1737903&view=diff ============================================================================== --- tomcat/trunk/res/checkstyle/checkstyle.xml (original) +++ tomcat/trunk/res/checkstyle/checkstyle.xml Wed Apr 6 00:33:28 2016 @@ -23,6 +23,10 @@ <!-- 'Standard Checks' in the Checkstyle documentation: --> <!-- http://checkstyle.sourceforge.net/config_coding.html --> + <!-- Cache what has passed checkstyle --> + <property name="cacheFile" + value="${tomcat.output}/res/checkstyle/cachefile-checkstyle.xml"/> + <!-- Headers --> <module name="RegexpHeader"> <property name="headerFile" value="${basedir}/res/checkstyle/header-al2.txt"/> @@ -38,9 +42,6 @@ </module> <module name="TreeWalker"> - <!-- Cache what has passed checkstyle --> - <property name="cacheFile" - value="${tomcat.output}/res/checkstyle/cachefile-checkstyle.xml"/> <!-- Block Checks --> <module name="AvoidNestedBlocks"> Modified: tomcat/trunk/res/checkstyle/javax-checkstyle.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/javax-checkstyle.xml?rev=1737903&r1=1737902&r2=1737903&view=diff ============================================================================== --- tomcat/trunk/res/checkstyle/javax-checkstyle.xml (original) +++ tomcat/trunk/res/checkstyle/javax-checkstyle.xml Wed Apr 6 00:33:28 2016 @@ -23,13 +23,13 @@ <!-- 'Standard Checks' in the Checkstyle documentation: --> <!-- http://checkstyle.sourceforge.net/config_coding.html --> + <!-- Cache what has passed checkstyle --> + <property name="cacheFile" + value="${tomcat.output}/res/checkstyle/cachefile-javax-checkstyle.xml"/> + <!-- Specific checks for javax.* packages --> <module name="TreeWalker"> - <!-- Cache what has passed checkstyle --> - <property name="cacheFile" - value="${tomcat.output}/res/checkstyle/cachefile-javax-checkstyle.xml"/> - <module name="ImportControl"> <property name="file" value="${basedir}/res/checkstyle/javax-import-control.xml"/> </module> Modified: tomcat/trunk/res/checkstyle/org-checkstyle.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/org-checkstyle.xml?rev=1737903&r1=1737902&r2=1737903&view=diff ============================================================================== --- tomcat/trunk/res/checkstyle/org-checkstyle.xml (original) +++ tomcat/trunk/res/checkstyle/org-checkstyle.xml Wed Apr 6 00:33:28 2016 @@ -23,13 +23,13 @@ <!-- 'Standard Checks' in the Checkstyle documentation: --> <!-- http://checkstyle.sourceforge.net/config_coding.html --> + <!-- Cache what has passed checkstyle --> + <property name="cacheFile" + value="${tomcat.output}/res/checkstyle/cachefile-org-checkstyle.xml"/> + <!-- Specific checks for javax.* packages --> <module name="TreeWalker"> - <!-- Cache what has passed checkstyle --> - <property name="cacheFile" - value="${tomcat.output}/res/checkstyle/cachefile-org-checkstyle.xml"/> - <module name="ImportControl"> <property name="file" value="${basedir}/res/checkstyle/org-import-control.xml"/> </module> Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1737903&r1=1737902&r2=1737903&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Apr 6 00:33:28 2016 @@ -177,7 +177,8 @@ by Huxing Zhang. (violetagg) </fix> <update> - Update optional Checkstyle library to 6.15. (kkolinko) + <bug>59276</bug>: Update optional Checkstyle library to 6.17. + (kkolinko) </update> <update> Update the NSIS Installer used to build the Windows Installers to --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org