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 @@
<property name="version.number"
value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
<property name="version.major.minor"
value="${version.major}.${version.minor}" />
- <property name="ant.min.version" value="1.9.8" />
-
<!-- constant to declare a file binary for md5sum -->
<property name="md5sum.binary-prefix" value=" *" />
@@ -510,17 +516,6 @@
<!-- =========================== Build targets ===========================
-->
- <target name="check-ant-version">
- <antversion property="version.running" />
- <fail message="Ant version ${ant.min.version} or newer is required.
Current version is ${version.running}.">
- <condition>
- <not>
- <antversion atleast="${ant.min.version}" />
- </not>
- </condition>
- </fail>
- </target>
-
<target name="build-prepare">
<!-- Required so we can compile -->
@@ -693,7 +688,7 @@
</copy>
</target>
- <target name="compile" depends="check-ant-version,download-compile,validate">
+ <target name="compile" depends="download-compile,validate">
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
debug="${compile.debug}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
