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 76fe18e862d77a40bf2abeb4f6a0eba672ba8c34
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 9 09:10:22 2022 +0100
Update minimum Java version in docs. Parameterise build Java version.
---
webapps/docs/building.xml | 4 ++--
webapps/docs/tomcat-docs.xsl | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/webapps/docs/building.xml b/webapps/docs/building.xml
index 5151d38962..f777b6d9a5 100644
--- a/webapps/docs/building.xml
+++ b/webapps/docs/building.xml
@@ -43,10 +43,10 @@ The following is a quick step by step guide.
</section>
-<section name="Download a Java Development Kit (JDK) version 11 or later">
+<section name="Download a Java Development Kit (JDK)">
<p>
-Building Apache Tomcat requires a JDK (version 11) or later to be installed.
You
+Building Apache Tomcat requires a JDK (version <build-java-version/>) or later
to be installed. You
can download one from
<a
href="https://adoptium.net/temurin/releases";>https://adoptium.net/temurin/releases</a>
or another JDK vendor.
diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index d16b71d533..8ca64ea0dc 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -38,7 +38,8 @@
<xsl:param name="version" select="'10.1.x'"/>
<xsl:param name="majorversion" select="'10'"/>
<xsl:param name="majorminorversion" select="'10.1'"/>
- <xsl:param name="minjavaversion" select="'8'"/>
+ <xsl:param name="minjavaversion" select="'11'"/>
+ <xsl:param name="buildjavaversion" select="'11'"/>
<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'"/>
@@ -430,6 +431,9 @@
<xsl:template match="min-java-version">
<xsl:value-of select="$minjavaversion"/>
</xsl:template>
+ <xsl:template match="build-java-version">
+ <xsl:value-of select="$buildjavaversion"/>
+ </xsl:template>
<xsl:template match="ant-version-required">
<xsl:value-of select="$antversionrequired"/>
</xsl:template>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
