Author: kkolinko
Date: Tue Nov 18 17:40:12 2014
New Revision: 1640400
URL: http://svn.apache.org/r1640400
Log:
Update to Checkstyle 6.0
Download just a checkstyle-6.0-all.jar instead of the whole bin.zip that
contains that file.
Merged r1638726 from tomcat/tc8.0.x/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1638720-1638725
Merged /tomcat/tc8.0.x/trunk:r1638726
Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1640400&r1=1640399&r2=1640400&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Tue Nov 18 17:40:12 2014
@@ -193,10 +193,10 @@ hamcrest.home=${base.path}/hamcrest-${ha
hamcrest.jar=${hamcrest.home}/hamcrest-core-${hamcrest.version}.jar
hamcrest.loc=${base-maven.loc}/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar
-# ----- Checkstyle, version 5.1 or later -----
-checkstyle.version=5.7
+# ----- Checkstyle, version 6.0 or later -----
+checkstyle.version=6.0
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
-checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-bin.zip
+checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
# ----- JSON Libraries (for bayeux module) -----
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1640400&r1=1640399&r2=1640400&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Tue Nov 18 17:40:12 2014
@@ -2596,7 +2596,7 @@ Apache Tomcat ${version} native binaries
description="Download components necessary to validate source"
if="${execute.validate}">
- <antcall target="downloadzip">
+ <antcall target="downloadfile">
<param name="sourcefile" value="${checkstyle.loc}"/>
<param name="destfile" value="${checkstyle.jar}"/>
<param name="destdir" value="${base.path}"/>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1640400&r1=1640399&r2=1640400&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Nov 18 17:40:12 2014
@@ -81,6 +81,9 @@
for temporary file and automatically create destination directory
(<code>base.path</code>). (kkolinko)
</update>
+ <update>
+ Update optional Checkstyle library to 6.0. (kkolinko)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
