This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1b6d862f7bbb75586cdf97480d1ecf130a125ebe
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 | 42 +++++-------------------------
modules/jdbc-pool/build.properties.default | 3 ++-
modules/jdbc-pool/build.xml | 4 ++-
3 files changed, 12 insertions(+), 37 deletions(-)
diff --git a/build.xml b/build.xml
index 14c3657..254d5b4 100644
--- a/build.xml
+++ b/build.xml
@@ -1753,12 +1753,6 @@
<classpath refid="compile.classpath" />
</javac>
- <!-- Reproducible builds: consistent timestamps for class files and other
- files placed in JARs -->
- <touch datetime="${tstamp.file}" pattern="MM/dd/yyyy hh:mm:ss aa">
- <fileset dir="${xreflect.directory}/classes"/>
- </touch>
-
<!-- Create the binary JAR file -->
<jarIt jarfile="${tomcat-embed-programmatic.jar}"
filesDir="${xreflect.directory}/classes"
@@ -1795,12 +1789,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="**" />
@@ -2732,12 +2722,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}">
@@ -2772,13 +2758,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}">
@@ -2806,6 +2788,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}">
@@ -2848,13 +2831,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="**" />
@@ -2987,12 +2965,8 @@ skip.installer property in build.properties" />
<include name="res/graal/*.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}" />
@@ -3852,10 +3826,8 @@ Read the Building page on the Apache Tomcat
documentation site for details on ho
<copy todir="${tomcat.graal}/${graalPrefix}">
<fileset dir="${basedir}/${graalFiles}" />
</copy>
- <touch datetime="${tstamp.file}" pattern="MM/dd/yyyy hh:mm:ss aa">
- <fileset dir="${tomcat.graal}/${graalPrefix}"/>
- </touch>
<zip destfile="${jarfile}" update="true" filesonly="true"
+ modificationtime="${tstamp.file}"
encoding="UTF8">
<zipfileset dir="${tomcat.graal}/${graalPrefix}"
prefix="META-INF/native-image/${graalPrefix}" includes="*.*"/>
</zip>
diff --git a/modules/jdbc-pool/build.properties.default
b/modules/jdbc-pool/build.properties.default
index 6131bd7..45e4c7d 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 21372bc..6d9f8bb 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
