Navigation Menu

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8279182: MakeZipReproducible ZipEntry timestamps not localized to UTC #6926

Closed

Conversation

andrew-m-leonard
Copy link

@andrew-m-leonard andrew-m-leonard commented Dec 23, 2021

MakeZipReproducible was added to enable reproducible building of src.zip. However, as ZipEntry timestamps are a "localized" date with no zone, the specified epoch instant was getting localized in whatever the building timezone was, hence src.zip built from the same source in different zones would differ.
The timestamp should be localized to UTC (like for jar, jmod entries), this PR ensures this.

Signed-off-by: Andrew Leonard anleonar@redhat.com


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8279182: MakeZipReproducible ZipEntry timestamps not localized to UTC

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6926/head:pull/6926
$ git checkout pull/6926

Update a local copy of the PR:
$ git checkout pull/6926
$ git pull https://git.openjdk.java.net/jdk pull/6926/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6926

View PR using the GUI difftool:
$ git pr show -t 6926

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6926.diff

Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@bridgekeeper
Copy link

bridgekeeper bot commented Dec 23, 2021

👋 Welcome back aleonard! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 23, 2021
@openjdk
Copy link

openjdk bot commented Dec 23, 2021

@andrew-m-leonard The following label will be automatically applied to this pull request:

  • build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the build build-dev@openjdk.org label Dec 23, 2021
@mlbridge
Copy link

mlbridge bot commented Dec 23, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Dec 23, 2021

@andrew-m-leonard This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8279182: MakeZipReproducible ZipEntry timestamps not localized to UTC

Reviewed-by: erikj

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 1 new commit pushed to the master branch:

  • 214f98f: 8278766: Enable OpenJDK build support for reproducible jars and jmods using --date

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 23, 2021
@andrew-m-leonard
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Dec 23, 2021

Going to push as commit bc0466c.
Since your change was applied there have been 3 commits pushed to the master branch:

  • 558a682: 8279115: Fix internal doc comment errors.
  • 87cc4e5: 8276302: Locale.filterTags methods ignore actual weight when matching "*" (as if it is 1)
  • 214f98f: 8278766: Enable OpenJDK build support for reproducible jars and jmods using --date

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 23, 2021
@openjdk openjdk bot closed this Dec 23, 2021
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 23, 2021
@openjdk
Copy link

openjdk bot commented Dec 23, 2021

@andrew-m-leonard Pushed as commit bc0466c.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated
2 participants