This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 897dd46996855cf76584f437c3241ed6b1e4c43d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 9 09:07:42 2022 +0100
Parameterise the minimum Ant version in the docs webapp
---
webapps/docs/building.xml | 8 ++++----
webapps/docs/tomcat-docs.xsl | 4 ++++
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/webapps/docs/building.xml b/webapps/docs/building.xml
index d531a5c305..5151d38962 100644
--- a/webapps/docs/building.xml
+++ b/webapps/docs/building.xml
@@ -59,17 +59,17 @@ directory into which you installed the JDK release.
</section>
-<section name="Install Apache Ant 1.9.10 or later">
+<section name="Install Apache Ant">
<p>
-Download a binary distribution of Ant 1.9.10 or later from
+Download a binary distribution of Ant <ant-version-required/> or later from
<a href="https://ant.apache.org/bindownload.cgi";>here</a>.
</p>
<p>
Unpack the binary distribution into a convenient location so that the
Ant release resides in its own directory (conventionally named
-<code>apache-ant-1.9.x</code>). For the remainder of this guide,
+<code>apache-ant-[version]</code>). For the remainder of this guide,
the symbolic name <code>${ant.home}</code> is used to refer to the full
pathname of
the Ant installation directory.
</p>
@@ -227,7 +227,7 @@ Variables</em> to add two new <em>Classpath Variables</em>:
<table class="defaultTable">
<tr><td>TOMCAT_LIBS_BASE</td><td>The same location as the
<code>base.path</code>
setting in <code>build.properties</code>, where the binary dependencies have
been downloaded</td></tr>
- <tr><td>ANT_HOME</td><td>the base path of Ant 1.9.10 or later</td></tr>
+ <tr><td>ANT_HOME</td><td>the base path of Ant <ant-version-required/> or
later</td></tr>
</table>
diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index acdb0e4cd2..d16b71d533 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -39,6 +39,7 @@
<xsl:param name="majorversion" select="'10'"/>
<xsl:param name="majorminorversion" select="'10.1'"/>
<xsl:param name="minjavaversion" select="'8'"/>
+ <xsl:param name="antversionrequired" select="'1.10.2'"/>
<xsl:param name="build-date" select="'MMM d yyyy'"/>
<xsl:param name="build-date-iso-8601" select="'yyyy-MM-dd'"/>
<xsl:param name="year" select="'yyyy'"/>
@@ -429,6 +430,9 @@
<xsl:template match="min-java-version">
<xsl:value-of select="$minjavaversion"/>
</xsl:template>
+ <xsl:template match="ant-version-required">
+ <xsl:value-of select="$antversionrequired"/>
+ </xsl:template>
<!-- Process everything else by just passing it through -->
<xsl:template match="*|@*">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
