You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2022/06/09 10:57:13 UTC
[tomcat] branch 9.0.x updated (fcf7dfefd6 -> 6fdd953b14)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from fcf7dfefd6 Add date for 9.0.64.
new dc18cd89a3 Backport fixes and additional version property replacement
new 6fdd953b14 Enable detached signatures for Windows installer
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
BUILDING.txt | 10 +++++-----
build.xml | 34 +++++++++++++++++++++++++++++-----
webapps/docs/building.xml | 10 +++++-----
webapps/docs/tomcat-docs.xsl | 3 +++
4 files changed, 42 insertions(+), 15 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Backport fixes and additional version property replacement
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit dc18cd89a363fd3f28eec78a188c8b2cc02727bb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 9 09:54:12 2022 +0100
Backport fixes and additional version property replacement
---
BUILDING.txt | 10 +++++-----
build.xml | 14 +++++++++++---
webapps/docs/building.xml | 10 +++++-----
webapps/docs/tomcat-docs.xsl | 3 +++
4 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index 96cca3db3a..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 4.0, 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:
diff --git a/build.xml b/build.xml
index e5147c3565..83fdcdb4e2 100644
--- a/build.xml
+++ b/build.xml
@@ -47,6 +47,7 @@
<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}" />
@@ -102,6 +103,7 @@
<property name="tomcat.xreflect" value="${tomcat.output}/xreflect"/>
<!-- Java EE 8 platform requires Java 8+ -->
+ <!-- Keep in sync with webapps/docs/tomcat-docs.xsl -->
<property name="compile.release" value="8"/>
<property name="min.java.version" value="8"/>
<property name="build.java.version" value="11"/>
@@ -258,6 +260,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 -->
@@ -2153,9 +2161,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 a8a2f933a0..0a1ee4c7a5 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 29af97fffb..94904bc02f 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="'9.0.x'"/>
<xsl:param name="majorversion" select="'9'"/>
<xsl:param name="majorminorversion" select="'9.0'"/>
<xsl:param name="minjavaversion" select="'8'"/>
+ <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'"/>
<xsl:param name="year" select="'yyyy'"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Enable detached signatures for Windows installer
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6fdd953b149fd4e12b250dcf980f15b96527f3fb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Mar 23 12:56:57 2022 +0000
Enable detached signatures for Windows installer
---
build.xml | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 83fdcdb4e2..6fdc88cab4 100644
--- a/build.xml
+++ b/build.xml
@@ -2456,8 +2456,13 @@ skip.installer property in build.properties" />
<include name="*.bmp" />
<include name="*.ico" />
<include name="*.xml" />
+ <include name="Uninstall.exe.sig" />
</fileset>
</copy>
+ <copy file="res/install-win/tomcat-installer.exe.sig"
+ tofile="${tomcat.release}/v${version}/bin/${final.name}.exe.sig"
+ failonerror="false"
+ quiet="true" />
<copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" />
@@ -2510,12 +2515,18 @@ skip.installer property in build.properties" />
<target name="-installer-sign-uninstaller"
unless="skip.installer" depends="-installer-create-uninstaller,setup-jsign"
if="${do.codesigning}">
+ <!-- If the detached signature doesn't exist, this will sign the file -->
+ <!-- and create the detached signature. If the detached signature does -->
+ <!-- exist it will be attached to the file. -->
<jsign file="${tomcat.dist}/Uninstall.exe"
storepass="${codesigning.storepass}"
storetype="${codesigning.storetype}"
alias="${codesigning.alias}"
alg="${codesigning.digest}"
- tsaurl="http://timestamp.digicert.com"/>
+ tsaurl="http://timestamp.digicert.com"
+ detached="true"/>
+ <!-- Copy detached signature to source tree -->
+ <copy file="${tomcat.dist}/Uninstall.exe.sig" todir="res/install-win"/>
<!-- Reproducible builds: consistent timestamps for installer files -->
<touch datetime="${tstamp.file}" pattern="yyyy-MM-dd HH:mm:ss">
<fileset dir="${tomcat.dist}"/>
@@ -2547,7 +2558,12 @@ skip.installer property in build.properties" />
storetype="${codesigning.storetype}"
alias="${codesigning.alias}"
alg="${codesigning.digest}"
- tsaurl="http://timestamp.digicert.com"/>
+ tsaurl="http://timestamp.digicert.com"
+ detached="true" />
+ <!-- Copy detached signature to source tree -->
+ <copy file="${tomcat.release}/v${version}/bin/${final.name}.exe.sig"
+ tofile="res/install-win/tomcat-installer.exe.sig"/>
+ <delete file="${tomcat.release}/v${version}/bin/${final.name}.exe.sig" />
<!-- .exe has changed so need to redo checksums and OpenPGP signature -->
<delete file="${tomcat.release}/v${version}/bin/${final.name}.exe.asc" />
<delete file="${tomcat.release}/v${version}/bin/${final.name}.exe.sha512" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org