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

8315383: jlink SystemModulesPlugin incorrectly parses the options #127

Closed
wants to merge 2 commits into from

Conversation

mlchung
Copy link
Member

@mlchung mlchung commented Sep 1, 2023

Clean backports from the openjdk/jdk repository:


Progress

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

Issues

  • JDK-8315383: jlink SystemModulesPlugin incorrectly parses the options (Bug - P3)
  • JDK-8311591: Add SystemModulesPlugin test case that splits module descriptors with new local variables defined by DedupSetBuilder (Bug - P3)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u.git pull/127/head:pull/127
$ git checkout pull/127

Update a local copy of the PR:
$ git checkout pull/127
$ git pull https://git.openjdk.org/jdk21u.git pull/127/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 127

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u/pull/127.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 1, 2023

👋 Welcome back mchung! 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 changed the title Backport ea5aa61c8cc5caa04f7c7eac9634df28011581dc 8315383: jlink SystemModulesPlugin incorrectly parses the options Sep 1, 2023
@openjdk
Copy link

openjdk bot commented Sep 1, 2023

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

@mlchung
Copy link
Member Author

mlchung commented Sep 1, 2023

/clean

@mlbridge
Copy link

mlbridge bot commented Sep 1, 2023

Webrevs

@mlchung
Copy link
Member Author

mlchung commented Sep 1, 2023

/issue add 8311591

@openjdk openjdk bot added the clean label Sep 1, 2023
@openjdk
Copy link

openjdk bot commented Sep 1, 2023

@mlchung This backport pull request is now marked as clean

@openjdk
Copy link

openjdk bot commented Sep 1, 2023

@mlchung 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:

8315383: jlink SystemModulesPlugin incorrectly parses the options
8311591: Add SystemModulesPlugin test case that splits module descriptors with new local variables defined by DedupSetBuilder

Reviewed-by: phh

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 8 new commits pushed to the master branch:

  • f07c8f2: 8315688: Update jdk21u fix version to 21.0.2
  • 49bef91: 8313323: javac -g on a java file which uses unnamed variable leads to ClassFormatError when launching that class
  • a4d64ab: 8315534: Incorrect warnings about implicit annotation processing
  • fbc194a: 8299658: C1 compilation crashes in LinearScan::resolve_exception_edge
  • b86a0ce: 8309032: jpackage does not work for module projects unless --module-path is specified
  • efb11c1: 8314024: SIGSEGV in PhaseIdealLoop::build_loop_late_post_work due to bad immediate dominator info
  • 91e37e9: 8311033: [macos] PrinterJob does not take into account Sides attribute
  • 72980bd: 8315051: jdk/jfr/jvm/TestGetEventWriter.java fails with non-JVMCI GCs

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 Sep 1, 2023
@openjdk
Copy link

openjdk bot commented Sep 1, 2023

@mlchung
Adding additional issue to issue list: 8311591: Add SystemModulesPlugin test case that splits module descriptors with new local variables defined by DedupSetBuilder.

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clean backport, but per #66 request, looks good.

@mlchung
Copy link
Member Author

mlchung commented Sep 1, 2023

Thanks for the quick review, Paul.

@mlchung
Copy link
Member Author

mlchung commented Sep 5, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Sep 5, 2023

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

  • f1e8b19: 8313167: Update to use jtreg 7.3
  • f07c8f2: 8315688: Update jdk21u fix version to 21.0.2
  • 49bef91: 8313323: javac -g on a java file which uses unnamed variable leads to ClassFormatError when launching that class
  • a4d64ab: 8315534: Incorrect warnings about implicit annotation processing
  • fbc194a: 8299658: C1 compilation crashes in LinearScan::resolve_exception_edge
  • b86a0ce: 8309032: jpackage does not work for module projects unless --module-path is specified
  • efb11c1: 8314024: SIGSEGV in PhaseIdealLoop::build_loop_late_post_work due to bad immediate dominator info
  • 91e37e9: 8311033: [macos] PrinterJob does not take into account Sides attribute
  • 72980bd: 8315051: jdk/jfr/jvm/TestGetEventWriter.java fails with non-JVMCI GCs

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 5, 2023

@mlchung Pushed as commit b207ce7.

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

@mlchung mlchung deleted the backport-8311591-8315383 branch September 5, 2023 15:27
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
2 participants