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

8243666: ModuleHashes attribute generated for JMOD and JAR files depends on timestamps #916

Closed
wants to merge 1 commit into from

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Mar 18, 2022

Clean backport, only resolved one copyright header diff.

I'm backporting this because it resolves an issue with jlink when using it with a debian package that was built with debuild. We got a report here in SapMachine: SAP/SapMachine#1009

debuild seems to modify the jmod files in a way that the hash computation as of JDK11 will yield different results (e.g. timestamps of files differ). The modified hash calculation solves this.


Progress

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

Issue

  • JDK-8243666: ModuleHashes attribute generated for JMOD and JAR files depends on timestamps

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/916/head:pull/916
$ git checkout pull/916

Update a local copy of the PR:
$ git checkout pull/916
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/916/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 916

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/916.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 18, 2022

👋 Welcome back clanger! A progress list of the required criteria for merging this PR into pr/915 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 changed the title Backport fe152cdcc5c6ef7e7f3f8c0acf065049e40ee2ea 8243666: ModuleHashes attribute generated for JMOD and JAR files depends on timestamps Mar 18, 2022
@openjdk
Copy link

openjdk bot commented Mar 18, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Mar 18, 2022
@RealCLanger
Copy link
Contributor Author

/clean

@openjdk openjdk bot added the clean label Mar 18, 2022
@openjdk
Copy link

openjdk bot commented Mar 18, 2022

@RealCLanger This backport pull request is now marked as clean

@mlbridge
Copy link

mlbridge bot commented Mar 18, 2022

Webrevs

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/915 to master Mar 19, 2022
@openjdk-notifier
Copy link

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout backport-8240734
git fetch https://git.openjdk.java.net/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Mar 19, 2022

@RealCLanger This change now passes all automated pre-integration checks.

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

8243666: ModuleHashes attribute generated for JMOD and JAR files depends on timestamps

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Mar 19, 2022
@RealCLanger
Copy link
Contributor Author

GHA error unrelated - runtime/Thread/SuspendAtExit.java will be fixed with JDK-8283270.

@RealCLanger
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 22, 2022

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

  • 03da67b: 8265261: java/nio/file/Files/InterruptCopy.java fails with java.lang.RuntimeException: Copy was not interrupted
  • 9714b69: 8206330: Revisit com/sun/jdi/RedefineCrossEvent.java
  • d568fc8: 8283420: [AOT] Exclude TrackedFlagTest/NotTrackedFlagTest in 11u because of intermittent java.lang.AssertionError: duplicate classes for name Ljava/lang/Boolean;
  • bb54eeb: 8209883: ZGC: Compile without C1 broken
  • 6e5000f: 8283424: compiler/loopopts/LoopUnswitchingBadNodeBudget.java fails with release VMs due to lack of -XX:+UnlockDiagnosticVMOptions
  • cf52a6f: 8263364: sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java wedged in getInputStream
  • f14b932: 8246494: introduce vm.flagless at-requires property
  • e66e3e5: 8210108: sun/tools/jstatd test build failures after JDK-8210022
  • dd6ba08: 8210649: AssertionError @ jdk.compiler/com.sun.tools.javac.comp.Modules.enter(Modules.java:244)

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 22, 2022

@RealCLanger Pushed as commit 7c29f0e.

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

@RealCLanger RealCLanger deleted the backport-8243666 branch Mar 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant