[tomcat] branch 8.5.x updated: Allow reproducible builds of all JDBC JAR files

[markt]

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


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 49258540a6 Allow reproducible builds of all JDBC JAR files
49258540a6 is described below

commit 49258540a674495965fabf474c33e72f46d681fb
Author: John Neffenger <j...@status6.com>
AuthorDate: Sat Nov 12 18:05:24 2022 -0800

    Allow reproducible builds of all JDBC JAR files
---
 modules/jdbc-pool/build.xml | 12 +++++++++---
 webapps/docs/changelog.xml  |  8 ++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index b66a306dd6..54207a4bd1 100644
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -185,7 +185,9 @@
 
   <target name="build-src">
     <!-- connection pool source file-->
-    <jar jarfile="${tomcat-jdbc-src.jar}" update="true">
+    <jar jarfile="${tomcat-jdbc-src.jar}"
+         update="true"
+         modificationtime="${tstamp.file}">
       <fileset dir="${basedir}/src/main/java">
         <include name="org/apache/tomcat/jdbc/**" />
       </fileset>
@@ -207,7 +209,9 @@
       <include name="org/apache/tomcat/jdbc/**" />
     </javac>
     <!-- connection pool JAR File -->
-    <jar jarfile="${tomcat-jdbc-test.jar}" update="true">
+    <jar jarfile="${tomcat-jdbc-test.jar}"
+         update="true"
+         modificationtime="${tstamp.file}">
       <fileset dir="${tomcat.testclasses}">
         <include name="org/apache/tomcat/jdbc/**" />
       </fileset>
@@ -216,7 +220,9 @@
       </fileset>
       <fileset refid="license.notice"/>
     </jar>
-    <jar jarfile="${tomcat-jdbc-test-src.jar}" update="true">
+    <jar jarfile="${tomcat-jdbc-test-src.jar}"
+         update="true"
+         modificationtime="${tstamp.file}">
       <fileset dir="${basedir}/src/test/java">
         <include name="org/apache/tomcat/jdbc/**" />
       </fileset>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2cda700947..1c639c9772 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -206,6 +206,14 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="jdbc-pool">
+    <changelog>
+      <fix>
+        <bug>66346</bug>: Ensure all JDBC pool JARs are reproducible. Pull
+        request <pr>566</pr> provided by John Neffenger. (markt)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Other">
     <changelog>
       <update>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org