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:52 UTC
[tomcat] 05/05: Add comments to remind committers to keep files in sync
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
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