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

8313983: jmod create --target-platform should replace existing ModuleTarget attribute #15514

Closed
wants to merge 1 commit into from

Conversation

asotona
Copy link
Member

@asotona asotona commented Aug 31, 2023

ModuleTarget and ModuleResolution attributes were flagged as 'allow multiple' in the Classfile API.
This patch removed the flags and allows at most one instance of each attribute.

Please review.

Thanks,
Adam


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8313983: jmod create --target-platform should replace existing ModuleTarget attribute (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15514

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/15514.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 31, 2023

👋 Welcome back asotona! 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 Aug 31, 2023
@openjdk
Copy link

openjdk bot commented Aug 31, 2023

@asotona The following label will be automatically applied to this pull request:

  • core-libs

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 core-libs core-libs-dev@openjdk.org label Aug 31, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 31, 2023

Webrevs

Copy link
Contributor

@AlanBateman AlanBateman left a comment

Choose a reason for hiding this comment

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

Thanks for fixing this.

@openjdk
Copy link

openjdk bot commented Aug 31, 2023

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

8313983: jmod create --target-platform should replace existing ModuleTarget attribute

Reviewed-by: alanb, mchung

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

  • c8acab1: 8315413: Remove special filtering of Continuation.yield0 in StackWalker
  • ea5aa61: 8315383: jlink SystemModulesPlugin incorrectly parses the options
  • 29ff1e4: 8315445: 8314748 causes crashes in x64 builds
  • 145d8bc: 8315051: jdk/jfr/jvm/TestGetEventWriter.java fails with non-JVMCI GCs
  • 486fa08: 8313873: java/nio/channels/DatagramChannel/SendReceiveMaxSize.java fails on AIX due to small default RCVBUF size and different IPv6 Header interpretation
  • b0353ad: 8315242: G1: Fix -Wconversion warnings around GCDrainStackTargetSize

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 Aug 31, 2023
@mlchung
Copy link
Member

mlchung commented Aug 31, 2023

Would you consider documenting in the javadoc of XXXAttribute in the ClassFile API if it allows multiple? It will make clear to the readers.

@asotona
Copy link
Member Author

asotona commented Sep 1, 2023

Would you consider documenting in the javadoc of XXXAttribute in the ClassFile API if it allows multiple? It will make clear to the readers.

Yes, I'll add that information as a part of javadoc update #14968.
Thanks!

@asotona
Copy link
Member Author

asotona commented Sep 1, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Sep 1, 2023

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

  • 81b5d22: 8315459: Print G1 reserved and committed sizes as separate items in VM.info and hs_err
  • 764f65c: 8315278: Patch 'print-targets' target to print targets separated by new line
  • 7754ac0: 8314925: ChoiceFormat does not specify IllegalArgumentExceptions
  • 2264667: 8315422: getSoTimeout() would be in try block in SSLSocketImpl
  • d5973bd: 6333341: [BI] Doc: java.text.BreakIterator class specification is unclear
  • 63f561f: 8306882: (fs) Path.toRealPath(LinkOption.NOFOLLOW_LINKS) fails when "../../" follows a link
  • 2436fb0: 8312306: Add more Reference.reachabilityFence() calls to the security classes using Cleaner
  • 351c31e: 8315378: [BACKOUT] runtime/NMT/SummarySanityCheck.java failed with "Total committed (MMMMMM) did not match the summarized committed (NNNNNN)"
  • c12ca88: 8312521: Unused field LocaleProviderAdapter#defaultLocaleProviderAdapter could be removed
  • b38bcae: 8313656: assert(!JvmtiExport::can_support_virtual_threads()) with -XX:-DoJVMTIVirtualThreadTransitions
  • ... and 6 more: https://git.openjdk.org/jdk/compare/b594f01fe4872d255f0f2fd2b1a908660e39f426...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 1, 2023

@asotona Pushed as commit c2e01eb.

💡 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
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
3 participants