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 13:16:57 UTC
[tomcat] 01/02: Refactor timestamp generation for consistency with other timestamps
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 7b91d7f664f6a6a694482bf497daa0e1376a18bd
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 9 14:16:11 2022 +0100
Refactor timestamp generation for consistency with other timestamps
---
build.xml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/build.xml b/build.xml
index f7be32adf9..69a373b162 100644
--- a/build.xml
+++ b/build.xml
@@ -253,6 +253,7 @@
<format property="today-iso-8601" pattern="yyyy-MM-dd" locale="en" timezone="UTC"/>
<format property="tstamp" pattern="HH:mm:ss" locale="en" timezone="UTC"/>
<format property="tstamp.file" pattern="yyyy-MM-dd HH:mm:ss"/>
+ <format property="tstamp.iso.release" pattern="yyyy-MM-dd'T'HH:mm:ssX" timezone="UTC"/>
</tstamp>
<filterset id="version.filters">
<filter token="YEAR" value="${year}"/>
@@ -1546,7 +1547,8 @@
<echo message="Building Tomcat JDBC pool libraries"/>
<ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
inheritAll="false" target="build">
- <property name="ant.tstamp.now" value ="${ant.tstamp.now}" />
+ <property name="ant.tstamp.now.iso" value ="${ant.tstamp.now.iso}" />
+ <property name="tstamp.file" value ="${tstamp.file}" />
<property name="tomcat.pool" value="${tomcat.pool}" />
<property name="tomcat.juli.jar" value="${tomcat-juli.jar}" />
<property name="skip.download" value="set"/>
@@ -2645,9 +2647,6 @@ skip.installer property in build.properties" />
<target name="pre-release" depends="-pre-release-lone-target-check, -pre-release-read-asf-username"
description="Prepares for a release build by writing build.properties.release which contains information about the release-build environment.">
- <tstamp>
- <format pattern="yyyy-MM-dd'T'HH:mm:ss'Z'" property="now-readable" timezone="UTC" />
- </tstamp>
<echo file="build.properties.release"># -----------------------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -2666,7 +2665,7 @@ skip.installer property in build.properties" />
# -----------------------------------------------------------------------------
# These ant.tstamp properties specify the build-timestamp for repeatable builds.
-ant.tstamp.now.iso=${now-readable}
+ant.tstamp.now.iso=${tstamp.iso.release}
# This is the ASF user who is the Release Manager for this release.
release.asfusername=${release.asfusername}
# Set the version-suffix to "" (empty string) as this is not a development release.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] 01/02: Refactor timestamp generation for consistency with other timestamps
Posted by Christopher Schultz <ch...@christopherschultz.net>.
Mark,
On 6/9/22 09:16, 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 7b91d7f664f6a6a694482bf497daa0e1376a18bd
> Author: Mark Thomas <ma...@apache.org>
> AuthorDate: Thu Jun 9 14:16:11 2022 +0100
>
> Refactor timestamp generation for consistency with other timestamps
> ---
> build.xml | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/build.xml b/build.xml
> index f7be32adf9..69a373b162 100644
> --- a/build.xml
> +++ b/build.xml
> @@ -253,6 +253,7 @@
> <format property="today-iso-8601" pattern="yyyy-MM-dd" locale="en" timezone="UTC"/>
> <format property="tstamp" pattern="HH:mm:ss" locale="en" timezone="UTC"/>
> <format property="tstamp.file" pattern="yyyy-MM-dd HH:mm:ss"/>
> + <format property="tstamp.iso.release" pattern="yyyy-MM-dd'T'HH:mm:ssX" timezone="UTC"/>
> </tstamp>
> <filterset id="version.filters">
> <filter token="YEAR" value="${year}"/>
> @@ -1546,7 +1547,8 @@
> <echo message="Building Tomcat JDBC pool libraries"/>
> <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
> inheritAll="false" target="build">
> - <property name="ant.tstamp.now" value ="${ant.tstamp.now}" />
> + <property name="ant.tstamp.now.iso" value ="${ant.tstamp.now.iso}" />
> + <property name="tstamp.file" value ="${tstamp.file}" />
Thanks for this. I didn't realize that parts of the build used external
ant calls (which will reset the properties values).
> <property name="tomcat.pool" value="${tomcat.pool}" />
> <property name="tomcat.juli.jar" value="${tomcat-juli.jar}" />
> <property name="skip.download" value="set"/>
> @@ -2645,9 +2647,6 @@ skip.installer property in build.properties" />
>
> <target name="pre-release" depends="-pre-release-lone-target-check, -pre-release-read-asf-username"
> description="Prepares for a release build by writing build.properties.release which contains information about the release-build environment.">
> - <tstamp>
> - <format pattern="yyyy-MM-dd'T'HH:mm:ss'Z'" property="now-readable" timezone="UTC" />
> - </tstamp>
> <echo file="build.properties.release"># -----------------------------------------------------------------------------
> # Licensed to the Apache Software Foundation (ASF) under one or more
> # contributor license agreements. See the NOTICE file distributed with
> @@ -2666,7 +2665,7 @@ skip.installer property in build.properties" />
> # -----------------------------------------------------------------------------
>
> # These ant.tstamp properties specify the build-timestamp for repeatable builds.
> -ant.tstamp.now.iso=${now-readable}
> +ant.tstamp.now.iso=${tstamp.iso.release}
> # This is the ASF user who is the Release Manager for this release.
> release.asfusername=${release.asfusername}
> # Set the version-suffix to "" (empty string) as this is not a development release.
-chris
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org