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 2021/08/17 12:51:46 UTC
[tomcat] branch main updated: Fix build fail when locale is not 'en'
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
The following commit(s) were added to refs/heads/main by this push:
new 27b8664 Fix build fail when locale is not 'en'
27b8664 is described below
commit 27b86640335bba9e0e167425102ab916e79e4d3f
Author: Dachuan J <jp...@aliyun.com>
AuthorDate: Tue Aug 10 14:28:16 2021 +0800
Fix build fail when locale is not 'en'
---
build.xml | 16 ++++++++--------
modules/jdbc-pool/build.xml | 2 +-
webapps/docs/changelog.xml | 8 ++++++++
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/build.xml b/build.xml
index 80f0495..3a3011e 100644
--- a/build.xml
+++ b/build.xml
@@ -244,7 +244,7 @@
<format property="today" pattern="MMM d yyyy" locale="en" timezone="UTC"/>
<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="MM/dd/yyyy hh:mm:ss aa"/>
+ <format property="tstamp.file" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
<filterset id="version.filters">
<filter token="YEAR" value="${year}"/>
@@ -1785,7 +1785,7 @@
</fixcrlf>
<!-- Reproducible builds: consistent timestamps for distributed files -->
- <touch datetime="${tstamp.file}" pattern="MM/dd/yyyy hh:mm:ss aa">
+ <touch datetime="${tstamp.file}" pattern="yyyy-MM-dd HH:mm:ss">
<fileset dir="${tomcat.embed}"/>
</touch>
@@ -2556,7 +2556,7 @@ skip.installer property in build.properties" />
<patternset refid="text.files" />
</fixcrlf>
<!-- Reproducible builds: consistent timestamps for installer files -->
- <touch datetime="${tstamp.file}" pattern="MM/dd/yyyy hh:mm:ss aa">
+ <touch datetime="${tstamp.file}" pattern="yyyy-MM-dd HH:mm:ss">
<fileset dir="${tomcat.dist}"/>
</touch>
</target>
@@ -2587,7 +2587,7 @@ skip.installer property in build.properties" />
<arg value="${tomcat.dist}/tempinstaller.exe" />
</exec>
<!-- Reproducible builds: consistent timestamps for installer files -->
- <touch datetime="${tstamp.file}" pattern="MM/dd/yyyy hh:mm:ss aa">
+ <touch datetime="${tstamp.file}" pattern="yyyy-MM-dd HH:mm:ss">
<fileset dir="${tomcat.dist}"/>
</touch>
</target>
@@ -2822,7 +2822,7 @@ skip.installer property in build.properties" />
</fixcrlf>
<!-- Reproducible builds: consistent timestamps for distributed files -->
- <touch datetime="${tstamp.file}" pattern="MM/dd/yyyy hh:mm:ss aa">
+ <touch datetime="${tstamp.file}" pattern="yyyy-MM-dd HH:mm:ss">
<fileset dir="${tomcat.dist}"/>
</touch>
@@ -2875,7 +2875,7 @@ skip.installer property in build.properties" />
</fixcrlf>
<!-- Reproducible builds: consistent timestamps for distributed files -->
- <touch datetime="${tstamp.file}" pattern="MM/dd/yyyy hh:mm:ss aa">
+ <touch datetime="${tstamp.file}" pattern="yyyy-MM-dd HH:mm:ss">
<fileset dir="${tomcat.dist}"/>
<fileset dir="${tomcat.deployer}"/>
</touch>
@@ -2904,7 +2904,7 @@ skip.installer property in build.properties" />
</fixcrlf>
<!-- Reproducible builds: consistent timestamps for distributed files -->
- <touch datetime="${tstamp.file}" pattern="MM/dd/yyyy hh:mm:ss aa">
+ <touch datetime="${tstamp.file}" pattern="yyyy-MM-dd HH:mm:ss">
<fileset dir="${tomcat.dist}"/>
</touch>
@@ -2956,7 +2956,7 @@ skip.installer property in build.properties" />
</fixcrlf>
<!-- Reproducible builds: consistent timestamps for distributed files -->
- <touch datetime="${tstamp.file}" pattern="MM/dd/yyyy hh:mm:ss aa">
+ <touch datetime="${tstamp.file}" pattern="yyyy-MM-dd HH:mm:ss">
<fileset dir="${tomcat.dist}"/>
</touch>
diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 6d9f8bb..2feb3a4 100644
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -86,7 +86,7 @@
<!-- Version info filter set -->
<tstamp>
- <format property="tstamp.file" pattern="MM/dd/yyyy hh:mm:ss aa"/>
+ <format property="tstamp.file" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
<filterset id="version.filters">
<filter token="YEAR" value="${year}"/>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7e63112..eee49bb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -151,6 +151,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ Fix failing build when building on non-English locales. Pull request
+ <pr>441</pr> provided by Dachuan J. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.1.0-M4 (markt)" rtext="release in progress">
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org