Author: kkolinko
Date: Fri Dec 5 09:28:13 2014
New Revision: 1643205
URL: http://svn.apache.org/viewvc?rev=1643205&view=rev
Log:
Update to Checkstyle 6.1.1
Fixed trailing whitespace in changelog file.
Merged r1643121 from tomcat/trunk.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/build.properties.default
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 5 09:28:13 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642668,1642679,1642697,1642699,1643066
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642668,1642679,1642697,1642699,1643066,1643121
Modified: tomcat/tc8.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/build.properties.default?rev=1643205&r1=1643204&r2=1643205&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/build.properties.default (original)
+++ tomcat/tc8.0.x/trunk/build.properties.default Fri Dec 5 09:28:13 2014
@@ -213,7 +213,7 @@ objenesis.loc=https://objenesis.googleco
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
# ----- Checkstyle, version 6.0 or later -----
-checkstyle.version=6.0
+checkstyle.version=6.1.1
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.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1643205&r1=1643204&r2=1643205&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Fri Dec 5 09:28:13 2014
@@ -63,7 +63,7 @@
<fix>
<bug>57190</bug>: Fix <code>ServletContext.getContext(String)</code>
when parallel deployment is used so that the correct ServletContext is
- returned. (markt)
+ returned. (markt)
</fix>
<fix>
<bug>57208</bug>: Prevent NPE in JNDI Realm when no results are found
@@ -156,7 +156,7 @@
(<code>base.path</code>). (kkolinko)
</update>
<update>
- Update optional Checkstyle library to 6.0. (kkolinko)
+ Update optional Checkstyle library to 6.1.1. (kkolinko)
</update>
<update>
Simplify <code>setproxy</code> task in <code>build.xml</code>.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
