This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 5382736 Fix build fail when locale is not 'en'
5382736 is described below
commit 53827364b61bafa9dabe452b2ed2e663b39fac9a
Author: Dachuan J <jpc00...@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 4bf6e98..d30526a 100644
--- a/build.xml
+++ b/build.xml
@@ -268,7 +268,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}"/>
@@ -1413,7 +1413,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>
@@ -2248,7 +2248,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>
@@ -2279,7 +2279,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>
@@ -2521,7 +2521,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>
@@ -2574,7 +2574,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>
@@ -2603,7 +2603,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>
@@ -2653,7 +2653,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 59e81ca..408e890 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 78a33a2..246de40 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 8.5.70 (schultz)" rtext="2021-08-16">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
