Author: markt
Date: Thu Nov 6 11:21:35 2014
New Revision: 1637081
URL: http://svn.apache.org/r1637081
Log:
Fix timestamps in Tomcat build to use 24-hour format instead of 12-hour one and
use UTC timezone.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/extras.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1637081&r1=1637080&r2=1637081&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 6 11:21:35 2014
@@ -76,12 +76,6 @@ PATCHES PROPOSED TO BACKPORT:
slightly different "null" behavior in Oracle/OpenJDK versus
IBM JVMs.
-* Fix timestamps in Tomcat build to use 24-hour format instead of 12-hour
- one and use UTC timezone.
- https://people.apache.org/~kkolinko/patches/2014-10-20_tc6_tstamp.patch
- +1: kkolinko, schultz, markt
- -1:
-
PATCHES/ISSUES THAT ARE STALLED:
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=1637081&r1=1637080&r2=1637081&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Thu Nov 6 11:21:35 2014
@@ -99,9 +99,9 @@
<!-- Version info filter set -->
<tstamp>
- <format property="year" pattern="yyyy" locale="en"/>
- <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
- <format property="TSTAMP" pattern="hh:mm:ss"/>
+ <format property="year" pattern="yyyy" locale="en" timezone="UTC"/>
+ <format property="TODAY" pattern="MMM d yyyy" locale="en" timezone="UTC"/>
+ <format property="TSTAMP" pattern="HH:mm:ss" locale="en" timezone="UTC"/>
</tstamp>
<filterset id="version.filters">
<filter token="YEAR" value="${year}"/>
@@ -109,7 +109,7 @@
<filter token="VERSION_NUMBER" value="${version.number}"/>
<filter token="VERSION_MAJOR" value="${version.major}"/>
<filter token="VERSION_MAJOR_MINOR" value="${version.major.minor}"/>
- <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
+ <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP} UTC"/>
<filter token="JDT_VERSION" value="${jdt.version}"/>
</filterset>
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=1637081&r1=1637080&r2=1637081&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Thu Nov 6 11:21:35 2014
@@ -38,7 +38,7 @@
<property name="project" value="apache-tomcat" />
<property name="name" value="Apache Tomcat" />
<tstamp>
- <format property="year" pattern="yyyy" locale="en"/>
+ <format property="year" pattern="yyyy" locale="en" timezone="UTC"/>
</tstamp>
<property name="version.major" value="6" />
<property name="version.minor" value="0" />
Modified: tomcat/tc6.0.x/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=1637081&r1=1637080&r2=1637081&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Thu Nov 6 11:21:35 2014
@@ -38,7 +38,7 @@
<property name="project" value="apache-tomcat" />
<property name="name" value="Apache Tomcat" />
<tstamp>
- <format property="year" pattern="yyyy" locale="en"/>
+ <format property="year" pattern="yyyy" locale="en" timezone="UTC"/>
</tstamp>
<property name="version.major" value="6" />
<property name="version.minor" value="0" />
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1637081&r1=1637080&r2=1637081&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Nov 6 11:21:35 2014
@@ -92,6 +92,10 @@
pick up the Windows binaries that are based on OpenSSL 1.0.1j and APR
1.5.1. (markt)
</update>
+ <fix>
+ Fix timestamps in Tomcat build to use 24-hour instead of 12-hour format
+ and use UTC timezone. (kkolinko)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
