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

8289471: Issue in Initialization of keys in ErrorMsg.java and XPATHErrorResources.java #1273

Conversation

shruacha1234
Copy link
Contributor

@shruacha1234 shruacha1234 commented Jul 26, 2022

OpenJDK PR : openjdk/jdk#9369
OpenJDK bug : https://bugs.openjdk.org/browse/JDK-8289471


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-8289471: Issue in Initialization of keys in ErrorMsg.java and XPATHErrorResources.java

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1273

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 26, 2022

👋 Welcome back shruacha1234! 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
Copy link

openjdk bot commented Jul 26, 2022

@shruacha1234 this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout key_initialization_issue_backport_987656d
git fetch https://git.openjdk.org/jdk11u-dev master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch rfr Pull request is ready for review and removed merge-conflict Pull request has merge conflict with target branch rfr Pull request is ready for review labels Jul 26, 2022
@shruacha1234 shruacha1234 force-pushed the key_initialization_issue_backport_987656d branch from cb4c852 to af3752c Compare July 26, 2022 08:10
@openjdk-notifier
Copy link

@shruacha1234 Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

@shruacha1234 shruacha1234 changed the title Backport 987656d69065b5b61d658cec3704a181a4aef18b Backport 987656d69065b5b61d658cec3704a181a4aef18b Jul 27, 2022
@openjdk openjdk bot changed the title Backport 987656d69065b5b61d658cec3704a181a4aef18b 8289471: Issue in Initialization of keys in ErrorMsg.java and XPATHErrorResources.java Jul 27, 2022
@openjdk
Copy link

openjdk bot commented Jul 27, 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 Jul 27, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 27, 2022

Webrevs

@shruacha1234
Copy link
Contributor Author

@RealCLanger Can you please review this PR

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.

Looks clean, lgtm.

@openjdk
Copy link

openjdk bot commented Jul 28, 2022

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

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

8289471: Issue in Initialization of keys in ErrorMsg.java and XPATHErrorResources.java

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 23 new commits pushed to 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 Jul 28, 2022
@shruacha1234
Copy link
Contributor Author

/integrate

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

openjdk bot commented Aug 2, 2022

@shruacha1234
Your change (at version af3752c) is now ready to be sponsored by a Committer.

@RealCLanger
Copy link
Contributor

Same here: Before integration, this needs maintainer approval. See point 6 of the Wiki. @phohensee ?

@phohensee
Copy link
Member

Tagged and commented on the JBS issue.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 3, 2022

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

  • ac89673: 8290000: Bump macOS GitHub actions to macOS 11
  • d647021: 8283624: Create an automated regression test for RFE-4390885
  • 9796aac: 8223543: [TESTBUG] Regression test java/awt/Graphics2D/DrawString/LCDTextSrcEa.java has issues
  • 3210c99: 8283245: Create a test for JDK-4670319
  • 7318cdc: 8221871: javadoc should not set role=region on
    elements
  • 93666ae: 8218413: make reconfigure ignores configure-time AUTOCONF environment variable
  • 954d57a: 8287432: C2: assert(tn->in(0) != __null) failed: must have live top node
  • 9cf9879: 8267880: Upgrade the default PKCS12 MAC algorithm
  • e80c7e1: 8238268: Many SA tests are not running on OSX because they do not attempt to use sudo when available
  • 8871303: 8282933: Create a test for JDK-4529616
  • ... and 22 more: https://git.openjdk.org/jdk11u-dev/compare/37ca256b782ac4793e30edb18edadf64de562ea5...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 3, 2022

@phohensee @shruacha1234 Pushed as commit 1c96cac.

💡 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
3 participants