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

8252145: Unify Info.plist files with correct version strings #1323

Conversation

earthling-amzn
Copy link
Contributor

@earthling-amzn earthling-amzn commented Aug 12, 2022

This is a backport of https://bugs.openjdk.org/browse/JDK-8252145. Backport ticket is https://bugs.openjdk.org/browse/JDK-8292307. The Skara bot said this was not a clean backport: openjdk/jdk@7df8610#commitcomment-81065611, but it was clean for me when I performed it locally.


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-8252145: Unify Info.plist files with correct version strings

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev pull/1323/head:pull/1323
$ git checkout pull/1323

Update a local copy of the PR:
$ git checkout pull/1323
$ git pull https://git.openjdk.org/jdk11u-dev pull/1323/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1323

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/1323.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 12, 2022

👋 Welcome back wkemper! 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 7df86108cb42079df8ade07b4d07587c1f0cbe83 8252145: Unify Info.plist files with correct version strings Aug 12, 2022
@openjdk
Copy link

openjdk bot commented Aug 12, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Aug 12, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 12, 2022

Webrevs

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.

The pre-submit Windows test failure appears unrelated to this patch. Lgtm.

@openjdk
Copy link

openjdk bot commented Aug 15, 2022

@earthling-amzn This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8252145: Unify Info.plist files with correct version strings

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:

  • faf1f86: 7131823: bug in GIFImageReader
  • 44e1ff4: Merge
  • ba80426: Merge jdk-11.0.16.1 into master
  • 63e4b5c: 8292260: [BACKOUT] JDK-8279219: [REDO] C2 crash when allocating array of size too large
  • e068eba: 8292255: Bump update version for OpenJDK: jdk-11.0.16.1
  • 38c632f: 8247546: Pattern matching does not skip correctly over supplementary characters
  • 03a5c25: 8289549: ISO 4217 Amendment 172 Update
  • 7d32ed9: 8209052: Low contrast in docs/api/constant-values.html

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 15, 2022
@earthling-amzn
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 17, 2022
@openjdk
Copy link

openjdk bot commented Aug 17, 2022

@earthling-amzn
Your change (at version f6173d0) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

Got the approval.

@openjdk
Copy link

openjdk bot commented Aug 17, 2022

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

  • faf1f86: 7131823: bug in GIFImageReader
  • 44e1ff4: Merge
  • ba80426: Merge jdk-11.0.16.1 into master
  • 63e4b5c: 8292260: [BACKOUT] JDK-8279219: [REDO] C2 crash when allocating array of size too large
  • e068eba: 8292255: Bump update version for OpenJDK: jdk-11.0.16.1
  • 38c632f: 8247546: Pattern matching does not skip correctly over supplementary characters
  • 03a5c25: 8289549: ISO 4217 Amendment 172 Update
  • 7d32ed9: 8209052: Low contrast in docs/api/constant-values.html

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 17, 2022

@phohensee @earthling-amzn Pushed as commit 3db29c4.

💡 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
backport integrated Pull request has been integrated
2 participants