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

8310643: Misformatted copyright messages in FFM #15042

Closed
wants to merge 4 commits into from

Conversation

minborg
Copy link
Contributor

@minborg minborg commented Jul 26, 2023

This PR suggests updating some of the ill-formed copyright headers in the FFM API and the implementation and test thereof.

Some of the test files will have now the "classpath" exception. Is this correct?


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-8310643: Misformatted copyright messages in FFM (Bug - P5)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15042

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 26, 2023

👋 Welcome back pminborg! 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 Jul 26, 2023
@openjdk
Copy link

openjdk bot commented Jul 26, 2023

@minborg 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 Jul 26, 2023
@mlbridge
Copy link

mlbridge bot commented Jul 26, 2023

Webrevs

@JornVernee
Copy link
Member

Some of the test files will have now the "classpath" exception. Is this correct?

No. The test files should not have the classpath exception.

@mcimadamore
Copy link
Contributor

Thanks for looking into this. As commented by @JornVernee, it is deliberate that tests do not have CP exception. So the fix there is the opposite: we should be looking for text with the exception text, and drop it.

@offamitkumar
Copy link
Member

Hi @minborg,

Would you add below patch in this PR. This will add "classpath" exception copyright header for some files in java/lang/foreign dir.

I have reverted the changes from my PR as @mcimadamore suggested.

java_lang_foreign_CP_exception.patch

Comment on lines 25 to 30
/*
* @test
* @enablePreview
* @requires jdk.foreign.linker != "UNSUPPORTED"
* @modules java.base/jdk.internal.foreign
* @run testng/othervm --enable-native-access=ALL-UNNAMED TestIllegalLink
Copy link
Member

Choose a reason for hiding this comment

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

This is removing the jtreg test.

@openjdk
Copy link

openjdk bot commented Aug 7, 2023

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

8310643: Misformatted copyright messages in FFM

Reviewed-by: jvernee

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

  • 538f955: 8313701: GHA: RISC-V should use the official repository for bootstrap
  • 226cdc6: 8312585: Rename DisableTHPStackMitigation flag to THPStackMitigation
  • dc01604: 8305636: Expand and clean up predicate classes and move them into separate files
  • a38fdaf: 8166900: If you wrap a JTable in a JLayer, the cursor is moved to the last row of table by you press the page down key.
  • c1f4595: 8311160: [macOS, Accessibility] VoiceOver: No announcements on JRadioButtonMenuItem and JCheckBoxMenuItem
  • 90d795a: 8313141: Missing check for os_thread type in os_windows.cpp
  • 6d18529: 8313795: Fix for JDK-8313564 breaks ppc and s390x builds
  • ad6e9e7: 8313554: Fix -Wconversion warnings for ResolvedFieldEntry
  • b463c6d: 8311517: Add performance information to ArrayList javadoc
  • b2add96: 8159527: Collections mutator methods should all be marked as optional operations
  • ... and 98 more: https://git.openjdk.org/jdk/compare/e7726fbd69232bfa34725c87a7dfd387cce118a0...master

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 7, 2023
@minborg
Copy link
Contributor Author

minborg commented Aug 7, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Aug 7, 2023

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

  • 538f955: 8313701: GHA: RISC-V should use the official repository for bootstrap
  • 226cdc6: 8312585: Rename DisableTHPStackMitigation flag to THPStackMitigation
  • dc01604: 8305636: Expand and clean up predicate classes and move them into separate files
  • a38fdaf: 8166900: If you wrap a JTable in a JLayer, the cursor is moved to the last row of table by you press the page down key.
  • c1f4595: 8311160: [macOS, Accessibility] VoiceOver: No announcements on JRadioButtonMenuItem and JCheckBoxMenuItem
  • 90d795a: 8313141: Missing check for os_thread type in os_windows.cpp
  • 6d18529: 8313795: Fix for JDK-8313564 breaks ppc and s390x builds
  • ad6e9e7: 8313554: Fix -Wconversion warnings for ResolvedFieldEntry
  • b463c6d: 8311517: Add performance information to ArrayList javadoc
  • b2add96: 8159527: Collections mutator methods should all be marked as optional operations
  • ... and 98 more: https://git.openjdk.org/jdk/compare/e7726fbd69232bfa34725c87a7dfd387cce118a0...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 7, 2023

@minborg Pushed as commit 0b4387e.

💡 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
Development

Successfully merging this pull request may close these issues.

5 participants