1. The version of Ant is already available as ${ant.version}. There is
no need to call antversion task explicitly to get it.See built-in properties in Ant Manual http://ant.apache.org/manual-1.9.x/properties.html 2. This change can be mentioned in changelog (in subsection "Other"). чт, 13 сент. 2018 г. в 10:25, <isa...@apache.org>: > > Author: isapir > Date: Thu Sep 13 07:25:26 2018 > New Revision: 1840784 > > URL: http://svn.apache.org/viewvc?rev=1840784&view=rev > Log: > Simplified required Ant version check per BZ 62705 > > Modified: > tomcat/trunk/build.properties.default > tomcat/trunk/build.xml > > Modified: tomcat/trunk/build.properties.default > URL: > http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1840784&r1=1840783&r2=1840784&view=diff > ============================================================================== > --- tomcat/trunk/build.properties.default (original) > +++ tomcat/trunk/build.properties.default Thu Sep 13 07:25:26 2018 > @@ -31,6 +31,7 @@ version.suffix=-dev > > # ----- Build control flags ----- > # Note enabling validation uses Checkstyle which is LGPL licensed > +ant.version.required=1.9.8 > execute.validate=false > execute.test.nio=true > execute.test.nio2=true > > Modified: tomcat/trunk/build.xml > URL: > http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1840784&r1=1840783&r2=1840784&view=diff > ============================================================================== > --- tomcat/trunk/build.xml (original) > +++ tomcat/trunk/build.xml Thu Sep 13 07:25:26 2018 > @@ -33,6 +33,14 @@ > <property file="build.properties"/> > <property file="build.properties.default"/> > > + <!-- Check Ant Version --> > + <antversion property="ant.version.running" /> > + <fail message="Ant version ${ant.version.required} or newer is required > (version ${ant.version.running} is installed)"> > + <condition> > + <not><antversion atleast="${ant.version.required}" /></not> > + </condition> > + </fail> > + > <!-- Project Name --> > <property name="project" value="apache-tomcat" /> > > @@ -41,8 +49,6 @@ --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
