This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new fb5ef36ea8 Backport fixes and additional version property replacement
fb5ef36ea8 is described below
commit fb5ef36ea80ad99d33df3ece657ba0dc7ae9d24d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 9 10:09:21 2022 +0100
Backport fixes and additional version property replacement
---
BUILDING.txt | 19 +++++--------------
build.xml | 21 ++++++++++++++++++---
webapps/docs/building.xml | 10 +++++-----
webapps/docs/tomcat-docs.xsl | 3 +++
4 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index cab413dc6a..4c1bfd2625 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -19,8 +19,8 @@
Building The Apache Tomcat @VERSION_MAJOR_MINOR@ Servlet/JSP
Container
====================================================
-This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a
container that
-implements the Servlet 3.1, JSP 2.3, EL 3.0, WebSocket 1.1 and JASPIC 1.1
+This project contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a
container that
+implements the Servlet @SERVLET_SPEC_VERSION@, JSP @JSP_SPEC_VERSION@, EL
@EL_SPEC_VERSION@, WebSocket @WEBSOCKET_SPEC_VERSION@ and JASPIC
@JASPIC_SPEC_VERSION@
specifications from the Java Community Process <https://www.jcp.org/>.
Note: If you just need to run Apache Tomcat, it is not necessary to build
@@ -64,9 +64,9 @@ source distribution, do the following:
into which you installed the JDK release.
-(2) Install Apache Ant version 1.9.10 or later on your computer.
+(2) Install Apache Ant version @ANT_VERSION_REQUIRED@ or later on your
computer.
- 1. If Apache Ant version 1.9.10 or later is already installed on your
+ 1. If Apache Ant version @ANT_VERSION_REQUIRED@ or later is already installed
on your
computer, skip to (3).
2. Download a binary distribution of Ant from:
@@ -94,7 +94,7 @@ source distribution, do the following:
(3.1) Checkout or obtain the source code for Tomcat @VERSION_MAJOR_MINOR@
Clone the source using git, then checkout a specific major branch or
-master for the latest code development, or download and unpack a source
+main for the latest code development, or download and unpack a source
package.
* Tomcat GitHub repository URL:
@@ -298,15 +298,6 @@ You can build them by using the following commands:
codesigning.storepass=request-via-pmc
Release managers will be provided with the necessary credentials by the
PMC.
- It will also be necessary to enable TLS 1.2 and the correct cipher suite to
- for the build process to communicate with the code signing service. The
- simplest way is by setting the ANT_OPTS environment variable.
- E.g. (for Windows):
-
- set ANT_OPTS=-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2
-Dhttps.cipherSuites=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384
-
- You will also need to download and install the Java 7 unlimited strength
- jurisdiction policy files in order to use the above cipher suite.
4. Build the release:
diff --git a/build.xml b/build.xml
index e815e5aaf3..cd634b15a0 100644
--- a/build.xml
+++ b/build.xml
@@ -37,10 +37,18 @@
<property file="build-release.properties"/>
<property file="build.properties.default"/>
+ <!-- Check Ant Version -->
+ <fail message="Ant version ${ant.version.required} or newer is required
(${ant.version} is installed)">
+ <condition>
+ <not><antversion atleast="${ant.version.required}" /></not>
+ </condition>
+ </fail>
+
<!-- Project Name -->
<property name="project" value="apache-tomcat" />
<!-- Version numbers -->
+ <!-- Keep in sync with webapps/docs/tomcat-docs.xsl -->
<property name="version"
value="${version.major}.${version.minor}.${version.build}${version.suffix}" />
<property name="version.number"
value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
<property name="version.major.minor"
value="${version.major}.${version.minor}" />
@@ -94,6 +102,7 @@
<property name="tomcat.pool" value="${tomcat.output}/jdbc-pool"/>
<!-- Java EE 7 platform requires Java 7+ -->
+ <!-- Keep in sync with webapps/docs/tomcat-docs.xsl -->
<property name="compile.release" value="7"/>
<property name="min.java.version" value="7"/>
<property name="build.java.version" value="11"/>
@@ -252,6 +261,12 @@
<filter token="GIT_BRANCH" value="${git.branch}"/>
<filter token="MIN_JAVA_VERSION" value="${min.java.version}"/>
<filter token="BUILD_JAVA_VERSION" value="${build.java.version}"/>
+ <filter token="ANT_VERSION_REQUIRED" value="${ant.version.required}"/>
+ <filter token="SERVLET_SPEC_VERSION" value="${servlet.spec.version}"/>
+ <filter token="JSP_SPEC_VERSION" value="${jsp.spec.version}"/>
+ <filter token="EL_SPEC_VERSION" value="${el.spec.version}"/>
+ <filter token="WEBSOCKET_SPEC_VERSION" value="${websocket.spec.version}"/>
+ <filter token="JASPIC_SPEC_VERSION" value="${jaspic.spec.version}"/>
</filterset>
<!-- Files to change line endings for depending on target platform -->
@@ -1834,9 +1849,9 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/servletapi"
version="true"
- windowtitle="Servlet {servlet.spec.version} API Documentation - Apache
Tomcat ${version}"
- doctitle="Servlet {servlet.spec.version} API - Apache Tomcat ${version}"
- header="<b>Servlet {servlet.spec.version} - Apache Tomcat
${version}</b>"
+ windowtitle="Servlet ${servlet.spec.version} API Documentation - Apache
Tomcat ${version}"
+ doctitle="Servlet ${servlet.spec.version} API - Apache Tomcat ${version}"
+ header="<b>Servlet ${servlet.spec.version} - Apache Tomcat
${version}</b>"
bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
All Rights Reserved."
encoding="UTF-8"
docencoding="UTF-8"
diff --git a/webapps/docs/building.xml b/webapps/docs/building.xml
index 1487a814cb..c075211a97 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.
@@ -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>
diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index 8ab0cc785e..a225298edb 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -35,10 +35,13 @@
<xsl:param name="apache-logo" select="'/images/asf-logo.svg'"/>
<xsl:param name="subdir" select="''"/>
<xsl:param name="relative-path" select="'.'"/>
+ <!-- Keep versions in sync with build.xml -->
<xsl:param name="version" select="'8.5.x'"/>
<xsl:param name="majorversion" select="'8'"/>
<xsl:param name="majorminorversion" select="'8.5'"/>
<xsl:param name="minjavaversion" select="'7'"/>
+ <xsl:param name="buildjavaversion" select="'11'"/>
+ <xsl:param name="antversionrequired" select="'1.9.10'"/>
<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'"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
