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
commit 85bde4cb749b131a1b65515bf70c9870bffabc7d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Mar 24 12:20:57 2021 +0000
Use modificationtime attribute rather than touch task where possible
---
build.xml | 32 ++++++------------------------
modules/jdbc-pool/build.properties.default | 3 ++-
modules/jdbc-pool/build.xml | 4 +++-
3 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/build.xml b/build.xml
index a581ff7..19be6ed 100644
--- a/build.xml
+++ b/build.xml
@@ -1386,12 +1386,8 @@
<patternset refid="text.files" />
</fixcrlf>
- <!-- Reproducible builds: consistent timestamps for distributed files -->
- <touch datetime="${tstamp.file}" pattern="MM/dd/yyyy hh:mm:ss aa">
- <fileset dir="${tomcat.embed}"/>
- </touch>
-
<zip destfile="${tomcat.embed}/${final.name}-embed.zip"
+ modificationtime="${tstamp.file}"
encoding="UTF8">
<fileset dir="${tomcat.embed}">
<include name="**" />
@@ -2392,12 +2388,8 @@ skip.installer property in build.properties" />
<patternset refid="text.files" />
</fixcrlf>
- <!-- Reproducible builds: consistent timestamps for distributed files -->
- <touch datetime="${tstamp.file}" pattern="MM/dd/yyyy hh:mm:ss aa">
- <fileset dir="${tomcat.dist}"/>
- </touch>
-
<zip zipfile="${tomcat.release}/v${version}/bin/${final.name}.zip"
+ modificationtime="${tstamp.file}"
encoding="UTF8">
<zipfileset file="${tomcat.dist}" fullpath="${final.name}"/>
<zipfileset dir="${tomcat.dist}" prefix="${final.name}">
@@ -2432,13 +2424,9 @@ skip.installer property in build.properties" />
<patternset refid="text.files" />
</fixcrlf>
- <!-- Reproducible builds: consistent timestamps for distributed files -->
- <touch datetime="${tstamp.file}" pattern="MM/dd/yyyy hh:mm:ss aa">
- <fileset dir="${tomcat.dist}"/>
- </touch>
-
<!-- Windows x86 package -->
<zip
zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-x86.zip"
+ modificationtime="${tstamp.file}"
encoding="UTF8">
<zipfileset file="${tomcat.dist}" fullpath="${final.name}"/>
<zipfileset dir="${tomcat.dist}" prefix="${final.name}">
@@ -2466,6 +2454,7 @@ skip.installer property in build.properties" />
<!-- Windows x64 package -->
<zip
zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip"
+ modificationtime="${tstamp.file}"
encoding="UTF8">
<zipfileset file="${tomcat.dist}" fullpath="${final.name}"/>
<zipfileset dir="${tomcat.dist}" prefix="${final.name}">
@@ -2508,13 +2497,8 @@ skip.installer property in build.properties" />
<patternset refid="text.files" />
</fixcrlf>
- <!-- Reproducible builds: consistent timestamps for distributed files -->
- <touch datetime="${tstamp.file}" pattern="MM/dd/yyyy hh:mm:ss aa">
- <fileset dir="${tomcat.dist}"/>
- <fileset dir="${tomcat.deployer}"/>
- </touch>
-
<zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip"
+ modificationtime="${tstamp.file}"
encoding="UTF8">
<zipfileset file="${tomcat.deployer}" fullpath="${final.name}-deployer"/>
<zipfileset dir="${tomcat.deployer}" prefix="${final.name}-deployer"
includes="**" />
@@ -2646,12 +2630,8 @@ skip.installer property in build.properties" />
<include name=".travis/*.sh" />
</fixcrlf>
- <!-- Reproducible builds: consistent timestamps for distributed files -->
- <touch datetime="${tstamp.file}" pattern="MM/dd/yyyy hh:mm:ss aa">
- <fileset dir="${tomcat.dist}"/>
- </touch>
-
<zip zipfile="${tomcat.release}/v${version}/src/${final-src.name}.zip"
+ modificationtime="${tstamp.file}"
encoding="UTF8">
<zipfileset file="${tomcat.dist}/src" fullpath="${final-src.name}" />
<zipfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />
diff --git a/modules/jdbc-pool/build.properties.default
b/modules/jdbc-pool/build.properties.default
index 1e1d03a..41a0be8 100644
--- a/modules/jdbc-pool/build.properties.default
+++ b/modules/jdbc-pool/build.properties.default
@@ -31,7 +31,8 @@ version.suffix=
# ----- Reproducible builds -----
# Uncomment and set to current time for reproducible builds
-#ant.tstamp.now.iso=2021-03-18T06:00:00Z
+#2021-03-18T06:00:00Z
+#ant.tstamp.now=1616047200
# ----- Default Base Path for Dependent Packages -----
# Please note this path must be absolute, not relative,
diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 3394e18..59e81ca 100644
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -139,7 +139,9 @@
<sourcepath location="${basedir}/src/main/java"/>
</javadoc>
<!-- connection pool API file-->
- <jar jarfile="${tomcat-jdbc-api.jar}" update="true">
+ <jar jarfile="${tomcat-jdbc-api.jar}"
+ update="true"
+ modificationtime="${tstamp.file}">
<fileset dir="${tomcat.api}"/>
<fileset refid="license.notice"/>
</jar>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
