This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push: new 9d1fd3f Fix build fail when locale is not 'en' 9d1fd3f is described below commit 9d1fd3f8d495f98bba1a114830824cbbfe79d27f 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 32c59ef..1aef121 100644 --- a/build.xml +++ b/build.xml @@ -270,7 +270,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}"/> @@ -1794,7 +1794,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> @@ -2567,7 +2567,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> @@ -2598,7 +2598,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> @@ -2833,7 +2833,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> @@ -2886,7 +2886,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> @@ -2915,7 +2915,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> @@ -2967,7 +2967,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 d2cf0c5..b6f0f82 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 9.0.52 (remm)" rtext="in progress"> <subsection name="Catalina"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org