Author: kkolinko
Date: Mon Oct 20 10:25:34 2014
New Revision: 1633092
URL: http://svn.apache.org/r1633092
Log:
Fix timestamps in Tomcat build and jdbc-pool to use 24-hour format instead of
12-hour one and use UTC timezone.
Merged revisions 1630088,1630094,1630216,1631381 from tomcat/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1630088,1630094,1630216,1631381
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1633092&r1=1633091&r2=1633092&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Mon Oct 20 10:25:34 2014
@@ -213,12 +213,11 @@
</fileset>
</path>
-
<!-- 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}"/>
@@ -226,7 +225,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/tc7.0.x/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml?rev=1633092&r1=1633091&r2=1633092&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml Mon Oct 20 10:25:34 2014
@@ -39,7 +39,9 @@
<!-- Project Properties -->
<property name="name" value="Apache Tomcat JDBC Pool" />
<tstamp>
- <format property="year" pattern="yyyy" locale="en"/>
+ <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>
<property name="project" value="apache-tomcat-jdbc-pool" />
@@ -83,16 +85,12 @@
</fileset>
<!-- Version info filter set -->
- <tstamp>
- <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
- <format property="TSTAMP" pattern="hh:mm:ss"/>
- </tstamp>
<filterset id="version.filters">
<filter token="YEAR" value="${year}"/>
<filter token="VERSION" value="${version}"/>
<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="TOMCAT_PROJECT_DEST" value="${tomcat.project.dest}"/>
</filterset>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1633092&r1=1633091&r2=1633092&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Oct 20 10:25:34 2014
@@ -146,6 +146,10 @@
Tomcat Windows service monitor application are now digitally
signed. (markt)
</update>
+ <fix>
+ Fix timestamps in Tomcat build and jdbc-pool to use 24-hour format
+ instead of 12-hour one and use UTC timezone. (markt/kkolinko)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
