Allow reproducible builds of all JDBC JAR files#566
Merged
Conversation
Contributor
Author
|
I found how to test the Tomcat JDBC Connection Pool test JAR files ( 94c94
< tomcat.project.loc=https://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/project.xml
---
> tomcat.project.loc=https://github.com/apache/tomcat/tree/main/webapps/docs/project.xml
97c97
< tomcat.xsl.loc=https://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/tomcat-docs.xsl
---
> tomcat.xsl.loc=https://github.com/apache/tomcat/tree/main/webapps/docs/tomcat-docs.xslWith those changes, I could run: $ cd modules/jdbc-pool
$ ant build-test
$ mv output output1
$ ant build-test
$ mv output output2Before this pull request, two consecutive builds show the following differences: $ diff -qr output1 output2
Files output1/tomcat-jdbc-src.jar and output2/tomcat-jdbc-src.jar differ
Files output1/tomcat-jdbc-test-src.jar and output2/tomcat-jdbc-test-src.jar differ
Files output1/tomcat-jdbc-test.jar and output2/tomcat-jdbc-test.jar differAfter this pull request, the contents of the two output directories are identical. |
Contributor
Author
|
After this fix, the only remaining difference that I have found between any two builds of Tomcat using the default Ant target is the build path that gets included in two XML files: $ diff -qr lxd/output1 kvm/output1
Files lxd/output1/jdbc-pool/doc/changelog.xml and kvm/output1/jdbc-pool/doc/changelog.xml differ
Files lxd/output1/jdbc-pool/doc/jdbc-pool.xml and kvm/output1/jdbc-pool/doc/jdbc-pool.xml differdiff -r lxd/output1/jdbc-pool/doc/changelog.xml kvm/output1/jdbc-pool/doc/changelog.xml
19c19
< <!ENTITY project SYSTEM "/home/ubuntu/src/tomcat/modules/jdbc-pool/includes/project.xml">
---
> <!ENTITY project SYSTEM "/home/john/src/tomcat/modules/jdbc-pool/includes/project.xml">
diff -r lxd/output1/jdbc-pool/doc/jdbc-pool.xml kvm/output1/jdbc-pool/doc/jdbc-pool.xml
19c19
< <!ENTITY project SYSTEM "/home/ubuntu/src/tomcat/modules/jdbc-pool/includes/project.xml">
---
> <!ENTITY project SYSTEM "/home/john/src/tomcat/modules/jdbc-pool/includes/project.xml"> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes Bug 66346. Only the first change is required to fix the timestamps in
tomcat-jdbc-src.jar, but this seemed a good time to fix the timestamps in the other two JAR files as well (tomcat-jdbc-test.jarandtomcat-jdbc-test-src.jar).Can someone let me know how I might test the building of those two test JAR files? I couldn't figure out which Ant target to use for building and comparing them. I did run the unit test cases, which were successful: