Author: markt
Date: Wed Jun 15 13:41:09 2016
New Revision: 1748578
URL: http://svn.apache.org/viewvc?rev=1748578&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59276
Update to Checkstyle 6.17
This includes a configuration change, breaking compatibility with versions
earlier than 6.16.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/build.properties.default
tomcat/tc8.5.x/trunk/res/checkstyle/checkstyle.xml
tomcat/tc8.5.x/trunk/res/checkstyle/javax-checkstyle.xml
tomcat/tc8.5.x/trunk/res/checkstyle/org-checkstyle.xml
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 15 13:41:09 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747924,1747980,1747993,1748
001,1748253,1748452,1748547
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747924,1747980,1747
993,1748001,1748253,1748452,1748547
Modified: tomcat/tc8.5.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.properties.default?rev=1748578&r1=1748577&r2=1748578&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/build.properties.default (original)
+++ tomcat/tc8.5.x/trunk/build.properties.default Wed Jun 15 13:41:09 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.14.1
+# ----- 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/tc8.5.x/trunk/res/checkstyle/checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/checkstyle/checkstyle.xml?rev=1748578&r1=1748577&r2=1748578&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/res/checkstyle/checkstyle.xml (original)
+++ tomcat/tc8.5.x/trunk/res/checkstyle/checkstyle.xml Wed Jun 15 13:41:09 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/tc8.5.x/trunk/res/checkstyle/javax-checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/checkstyle/javax-checkstyle.xml?rev=1748578&r1=1748577&r2=1748578&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/res/checkstyle/javax-checkstyle.xml (original)
+++ tomcat/tc8.5.x/trunk/res/checkstyle/javax-checkstyle.xml Wed Jun 15
13:41:09 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/tc8.5.x/trunk/res/checkstyle/org-checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/checkstyle/org-checkstyle.xml?rev=1748578&r1=1748577&r2=1748578&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/res/checkstyle/org-checkstyle.xml (original)
+++ tomcat/tc8.5.x/trunk/res/checkstyle/org-checkstyle.xml Wed Jun 15 13:41:09
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/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1748578&r1=1748577&r2=1748578&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Jun 15 13:41:09 2016
@@ -59,6 +59,13 @@
</add>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <update>
+ <bug>59276</bug>: Update optional Checkstyle library to 6.17.
(kkolinko)
+ </update>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 8.5.3" rtext="2016-06-13">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
