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

8313949: Missing word in GPLv2 license text in StackMapTableAttribute.java #15269

Closed
wants to merge 1 commit into from

Conversation

dimitryc
Copy link
Contributor

@dimitryc dimitryc commented Aug 14, 2023

The PR suggests updating copyright headers in two files so that they are the same as in other files.


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-8313949: Missing word in GPLv2 license text in StackMapTableAttribute.java (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15269

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 14, 2023

👋 Welcome back dcherepanov! 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 14, 2023
@openjdk
Copy link

openjdk bot commented Aug 14, 2023

@dimitryc 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 14, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 14, 2023

Webrevs

Copy link
Member

@irisclark irisclark left a comment

Choose a reason for hiding this comment

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

The updated license appears to match the expected license:

https://github.com/openjdk/jdk/blob/master/make/data/license-templates/gpl-cp-header

@openjdk
Copy link

openjdk bot commented Aug 14, 2023

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

8313949: Missing word in GPLv2 license text in StackMapTableAttribute.java

Reviewed-by: iris

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

  • f41c267: 8314045: ArithmeticException in GaloisCounterMode
  • 911d1db: 8314078: HotSpotConstantPool.lookupField() asserts due to field changes in ConstantPool.cpp
  • 6574dd7: 8314025: Remove JUnit-based test in java/lang/invoke from problem list

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 14, 2023
Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Looks good.

I'm very surprised our header validation process did not pick this up.

Thanks.

@dimitryc
Copy link
Contributor Author

Thanks for the reviews!

@dimitryc
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 15, 2023

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

  • 6338927: 8314197: AttachListener::pd_find_operation always returning nullptr
  • b7dee21: 8314244: Incorrect file headers in new tests from JDK-8312597
  • 37c6b23: 8308340: C2: Idealize Fma nodes
  • 583cb75: 8313406: nep_invoker_blob can be simplified more
  • 0074b48: 8312597: Convert TraceTypeProfile to UL
  • 1f1c5c6: 8314241: Add test/jdk/sun/security/pkcs/pkcs7/SignerOrder.java to ProblemList
  • f142470: 8311981: Test gc/stringdedup/TestStringDeduplicationAgeThreshold.java#ZGenerational timed out
  • 595fdd3: 8314059: Remove PKCS7.verify()
  • 49b2984: 8313854: Some tests in serviceability area fail on localized Windows platform
  • c132176: 8114830: (fs) Files.copy fails due to interference from something else changing the file system
  • ... and 5 more: https://git.openjdk.org/jdk/compare/207bd00c5101fce06b5ac12e76893d989b0093e2...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 15, 2023

@dimitryc Pushed as commit f4e72c5.

💡 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