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

8272916: Copyright year was modified unintentionally in jlink.properties and ImagePluginStack.java #5240

Closed

Conversation

@calvinccheung
Copy link
Member

@calvinccheung calvinccheung commented Aug 24, 2021

Please review this trivial change for fixing the copyright year of the two files (jlink.properties and ImagePluginStack.java) which were modified unintentionally during the fix for JDK-8264322.


Progress

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

Issue

  • JDK-8272916: Copyright year was modified unintentionally in jlink.properties and ImagePluginStack.java

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5240/head:pull/5240
$ git checkout pull/5240

Update a local copy of the PR:
$ git checkout pull/5240
$ git pull https://git.openjdk.java.net/jdk pull/5240/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5240

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5240.diff

@calvinccheung
Copy link
Member Author

@calvinccheung calvinccheung commented Aug 24, 2021

/label add core-libs

Loading

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 24, 2021

👋 Welcome back ccheung! 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.

Loading

@openjdk openjdk bot added the core-libs label Aug 24, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 24, 2021

@calvinccheung
The core-libs label was successfully added.

Loading

@calvinccheung calvinccheung marked this pull request as ready for review Aug 24, 2021
@openjdk openjdk bot added the rfr label Aug 24, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 24, 2021

Webrevs

Loading

bplb
bplb approved these changes Aug 24, 2021
Copy link
Member

@bplb bplb left a comment

I verified that in the commit to fix JDK-8264322 no content changes were actually made to the files in this commit. Approved.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Aug 24, 2021

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

8272916: Copyright year was modified unintentionally in jlink.properties and ImagePluginStack.java

Reviewed-by: bpb

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

  • aaedac6: 8265261: java/nio/file/Files/InterruptCopy.java fails with java.lang.RuntimeException: Copy was not interrupted
  • d34f17c: 8270195: Add missing links between methods of JavaFX properties

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.

Loading

@openjdk openjdk bot added the ready label Aug 24, 2021
@calvinccheung
Copy link
Member Author

@calvinccheung calvinccheung commented Aug 24, 2021

@bplb Thanks for your quick review.

Loading

@calvinccheung
Copy link
Member Author

@calvinccheung calvinccheung commented Aug 24, 2021

/integrate

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Aug 24, 2021

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

  • aaedac6: 8265261: java/nio/file/Files/InterruptCopy.java fails with java.lang.RuntimeException: Copy was not interrupted
  • d34f17c: 8270195: Add missing links between methods of JavaFX properties

Your commit was automatically rebased without conflicts.

Loading

@openjdk openjdk bot closed this Aug 24, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Aug 24, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 24, 2021

@calvinccheung Pushed as commit c547ead.

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

Loading

@calvinccheung calvinccheung deleted the 8272916-copyright-year branch Aug 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants