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 08:22:47 UTC
[tomcat] branch main updated (9d2971fede -> d79b39d55f)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 9d2971fede Add minimum Ant version change to change log
new abd87e59e4 Parameterise the minimum Ant version in BUILDING.txt
new 897dd46996 Parameterise the minimum Ant version in the docs webapp
new 76fe18e862 Update minimum Java version in docs. Parameterise build Java version.
new b1202867f4 Fix display of download link
new d79b39d55f Add comments to remind committers to keep files in sync
The 5 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 | 4 ++--
build.xml | 3 +++
webapps/docs/building.xml | 14 +++++++-------
webapps/docs/tomcat-docs.xsl | 11 ++++++++++-
4 files changed, 22 insertions(+), 10 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/05: Fix display of download link
Posted by ma...@apache.org.
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 b1202867f414ad41a0decfdf67f7f3ac3405d400
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 9 09:19:28 2022 +0100
Fix display of download link
---
webapps/docs/building.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webapps/docs/building.xml b/webapps/docs/building.xml
index f777b6d9a5..ee78249027 100644
--- a/webapps/docs/building.xml
+++ b/webapps/docs/building.xml
@@ -91,7 +91,7 @@ available, which will be used to actually perform the build.
</p>
<p>
Tomcat source packages:
- <download>https://tomcat.apache.org/download-<version-major/>0.cgi</download>.
+ <download>https://tomcat.apache.org/download-<version-major/>.cgi</download>.
</p>
<p>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/05: Parameterise the minimum Ant version in BUILDING.txt
Posted by ma...@apache.org.
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 abd87e59e43990c716a2cb457ff9f64aa534e114
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 9 09:03:51 2022 +0100
Parameterise the minimum Ant version in BUILDING.txt
---
BUILDING.txt | 4 ++--
build.xml | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index e8d62dfa56..5534dd9d92 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -65,9 +65,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:
diff --git a/build.xml b/build.xml
index b2141ccecc..c73a418a07 100644
--- a/build.xml
+++ b/build.xml
@@ -263,6 +263,7 @@
<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}"/>
</filterset>
<!-- Files to change line endings for depending on target platform -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/05: Parameterise the minimum Ant version in the docs webapp
Posted by ma...@apache.org.
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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/05: Update minimum Java version in docs. Parameterise build Java version.
Posted by ma...@apache.org.
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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] 05/05: Add comments to remind committers to keep files in sync
Posted by Christopher Schultz <ch...@christopherschultz.net>.
Mark,
On 6/9/22 08:32, Mark Thomas wrote:
> On 09/06/2022 13:27, Christopher Schultz wrote:
>> Mark,
>>
>> On 6/9/22 04:22, markt@apache.org wrote:
>>> 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 d79b39d55f1d193276a5b846867260de07c41f7e
>>> Author: Mark Thomas <ma...@apache.org>
>>> AuthorDate: Thu Jun 9 09:20:20 2022 +0100
>>>
>>> Add comments to remind committers to keep files in sync
>>> ---
>>> build.xml | 2 ++
>>> webapps/docs/tomcat-docs.xsl | 1 +
>>> 2 files changed, 3 insertions(+)
>>>
>>> diff --git a/build.xml b/build.xml
>>> index c73a418a07..4244141561 100644
>>> --- a/build.xml
>>> +++ b/build.xml
>>> @@ -48,6 +48,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}" />
>>> @@ -103,6 +104,7 @@
>>> <property name="tomcat.xreflect" value="${tomcat.output}/xreflect"/>
>>> <!-- Jakarta EE 10 platform requires Java 11+ -->
>>> + <!-- Keep in sync with webapps/docs/tomcat-docs.xsl -->
>>> <property name="compile.release" value="11"/>
>>> <property name="min.java.version" value="11"/>
>>> <property name="build.java.version" value="11"/>
>>> diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
>>> index 8ca64ea0dc..7fc73609ea 100644
>>> --- a/webapps/docs/tomcat-docs.xsl
>>> +++ b/webapps/docs/tomcat-docs.xsl
>>> @@ -35,6 +35,7 @@
>>> <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="'10.1.x'"/>
>>> <xsl:param name="majorversion" select="'10'"/>
>>> <xsl:param name="majorminorversion" select="'10.1'"/>
>>>
>>
>> It seems like this could be automatically kept in sync, no? There's
>> nothing wrong with patching the tomcat-docs.xsl during the
>> documentation build process.
>
> Potentially. I was juggling a lot of changes at the time so went for the
> simpler option.
>
> If the xsl file is copied before it is used, filtering will be easy. If
> it isn't, we'd need to jump through a few more hoops but should be doable.
I think <replace> will work with a file in-place. I can take a look.
-chris
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] 05/05: Add comments to remind committers to keep files in sync
Posted by Mark Thomas <ma...@apache.org>.
On 09/06/2022 13:27, Christopher Schultz wrote:
> Mark,
>
> On 6/9/22 04:22, markt@apache.org wrote:
>> 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 d79b39d55f1d193276a5b846867260de07c41f7e
>> Author: Mark Thomas <ma...@apache.org>
>> AuthorDate: Thu Jun 9 09:20:20 2022 +0100
>>
>> Add comments to remind committers to keep files in sync
>> ---
>> build.xml | 2 ++
>> webapps/docs/tomcat-docs.xsl | 1 +
>> 2 files changed, 3 insertions(+)
>>
>> diff --git a/build.xml b/build.xml
>> index c73a418a07..4244141561 100644
>> --- a/build.xml
>> +++ b/build.xml
>> @@ -48,6 +48,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}" />
>> @@ -103,6 +104,7 @@
>> <property name="tomcat.xreflect"
>> value="${tomcat.output}/xreflect"/>
>> <!-- Jakarta EE 10 platform requires Java 11+ -->
>> + <!-- Keep in sync with webapps/docs/tomcat-docs.xsl -->
>> <property name="compile.release" value="11"/>
>> <property name="min.java.version" value="11"/>
>> <property name="build.java.version" value="11"/>
>> diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
>> index 8ca64ea0dc..7fc73609ea 100644
>> --- a/webapps/docs/tomcat-docs.xsl
>> +++ b/webapps/docs/tomcat-docs.xsl
>> @@ -35,6 +35,7 @@
>> <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="'10.1.x'"/>
>> <xsl:param name="majorversion" select="'10'"/>
>> <xsl:param name="majorminorversion" select="'10.1'"/>
>>
>
> It seems like this could be automatically kept in sync, no? There's
> nothing wrong with patching the tomcat-docs.xsl during the documentation
> build process.
Potentially. I was juggling a lot of changes at the time so went for the
simpler option.
If the xsl file is copied before it is used, filtering will be easy. If
it isn't, we'd need to jump through a few more hoops but should be doable.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] 05/05: Add comments to remind committers to keep files in sync
Posted by Christopher Schultz <ch...@christopherschultz.net>.
Mark,
On 6/9/22 04:22, markt@apache.org wrote:
> 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 d79b39d55f1d193276a5b846867260de07c41f7e
> Author: Mark Thomas <ma...@apache.org>
> AuthorDate: Thu Jun 9 09:20:20 2022 +0100
>
> Add comments to remind committers to keep files in sync
> ---
> build.xml | 2 ++
> webapps/docs/tomcat-docs.xsl | 1 +
> 2 files changed, 3 insertions(+)
>
> diff --git a/build.xml b/build.xml
> index c73a418a07..4244141561 100644
> --- a/build.xml
> +++ b/build.xml
> @@ -48,6 +48,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}" />
> @@ -103,6 +104,7 @@
> <property name="tomcat.xreflect" value="${tomcat.output}/xreflect"/>
>
> <!-- Jakarta EE 10 platform requires Java 11+ -->
> + <!-- Keep in sync with webapps/docs/tomcat-docs.xsl -->
> <property name="compile.release" value="11"/>
> <property name="min.java.version" value="11"/>
> <property name="build.java.version" value="11"/>
> diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
> index 8ca64ea0dc..7fc73609ea 100644
> --- a/webapps/docs/tomcat-docs.xsl
> +++ b/webapps/docs/tomcat-docs.xsl
> @@ -35,6 +35,7 @@
> <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="'10.1.x'"/>
> <xsl:param name="majorversion" select="'10'"/>
> <xsl:param name="majorminorversion" select="'10.1'"/>
>
It seems like this could be automatically kept in sync, no? There's
nothing wrong with patching the tomcat-docs.xsl during the documentation
build process.
-chris
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 05/05: Add comments to remind committers to keep files in sync
Posted by ma...@apache.org.
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 d79b39d55f1d193276a5b846867260de07c41f7e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 9 09:20:20 2022 +0100
Add comments to remind committers to keep files in sync
---
build.xml | 2 ++
webapps/docs/tomcat-docs.xsl | 1 +
2 files changed, 3 insertions(+)
diff --git a/build.xml b/build.xml
index c73a418a07..4244141561 100644
--- a/build.xml
+++ b/build.xml
@@ -48,6 +48,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}" />
@@ -103,6 +104,7 @@
<property name="tomcat.xreflect" value="${tomcat.output}/xreflect"/>
<!-- Jakarta EE 10 platform requires Java 11+ -->
+ <!-- Keep in sync with webapps/docs/tomcat-docs.xsl -->
<property name="compile.release" value="11"/>
<property name="min.java.version" value="11"/>
<property name="build.java.version" value="11"/>
diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index 8ca64ea0dc..7fc73609ea 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -35,6 +35,7 @@
<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="'10.1.x'"/>
<xsl:param name="majorversion" select="'10'"/>
<xsl:param name="majorminorversion" select="'10.1'"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org