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

8285097: Duplicate XML keys in XPATHErrorResources.java and XSLTErrorResources.java #427

Conversation

shruacha1234
Copy link
Contributor

@shruacha1234 shruacha1234 commented May 31, 2022

Removing the Duplicate XML keys in XPATHErrorResources.java and XSLTErrorResources.java

The bug report for the same: https://bugs.openjdk.java.net/browse/JDK-8285097
OpenJDK PR openjdk/jdk#8318


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-8285097: Duplicate XML keys in XPATHErrorResources.java and XSLTErrorResources.java

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 427

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented May 31, 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.

@TheRealMDoerr
Copy link
Contributor

I guess you need to remove the additional space from the title.

@shruacha1234 shruacha1234 changed the title Backport  b5a3d2843be3c093cd3a534caece87a32e5c47cc Backport b5a3d2843be3c093cd3a534caece87a32e5c47cc Jun 1, 2022
@openjdk openjdk bot changed the title Backport b5a3d2843be3c093cd3a534caece87a32e5c47cc 8285097: Duplicate XML keys in XPATHErrorResources.java and XSLTErrorResources.java Jun 1, 2022
@openjdk
Copy link

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

mlbridge bot commented Jun 1, 2022

Webrevs

Copy link
Contributor

@backwaterred backwaterred left a comment

Choose a reason for hiding this comment

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

Looks like a good and straightforward backport of the original changes.

@backwaterred
Copy link
Contributor

Hi @JoeWang-Java, could we please have a review on this backport? I think my unofficial review may have confused the process; we require approval from a full-fledged Reviewer before proceeding.

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 18, 2022

@shruacha1234 This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@openjdk
Copy link

openjdk bot commented Jul 18, 2022

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

8285097: Duplicate XML keys in XPATHErrorResources.java and XSLTErrorResources.java

Reviewed-by: tsteele, joehw

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

  • bebb612: 8288499: Restore cancel-in-progress in GHA
  • fc6fa1c: 8284014: Menu items with submenus in JPopupMenu are not spoken on macOS
  • d3b1956: 8282407: Missing ')' in MacResources.properties
  • 100c802: 8272815: jpackage --type rpm produces an error: Invalid or unsupported type: [null]
  • 4bab0eb: 8273040: Turning off JpAllowDowngrades (or Upgrades)
  • d755049: 8288003: log events for os::dll_unload
  • 881ff36: 8287906: Rewrite of GitHub Actions (GHA) sanity tests
  • b7ea51f: 8274434: move os::get_default_process_handle and os::dll_lookup to os_posix for POSIX platforms
  • a087c51: 8289147: unify os::infinite_sleep on posix platforms
  • 528693c: 8290082: [PPC64] ZGC C2 load barrier stub needs to preserve vector registers
  • ... and 120 more: https://git.openjdk.org/jdk17u-dev/compare/9439a87f728b2303e305fd955a7bc39686921bf3...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.

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 (@JoeWang-Java) 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 18, 2022
@shruacha1234
Copy link
Contributor Author

/integrate

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

openjdk bot commented Jul 18, 2022

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

@JoeWang-Java
Copy link
Member

@shruacha1234 @backwaterred Please note that I'm in dev, usually not involved in update releases (or the update aliases). I saw this only because of a GitHub msg this morning. For future backport requests, you may ask people in the update aliases. Thanks, and sorry for the delay.

@JoeWang-Java
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jul 18, 2022

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

  • bebb612: 8288499: Restore cancel-in-progress in GHA
  • fc6fa1c: 8284014: Menu items with submenus in JPopupMenu are not spoken on macOS
  • d3b1956: 8282407: Missing ')' in MacResources.properties
  • 100c802: 8272815: jpackage --type rpm produces an error: Invalid or unsupported type: [null]
  • 4bab0eb: 8273040: Turning off JpAllowDowngrades (or Upgrades)
  • d755049: 8288003: log events for os::dll_unload
  • 881ff36: 8287906: Rewrite of GitHub Actions (GHA) sanity tests
  • b7ea51f: 8274434: move os::get_default_process_handle and os::dll_lookup to os_posix for POSIX platforms
  • a087c51: 8289147: unify os::infinite_sleep on posix platforms
  • 528693c: 8290082: [PPC64] ZGC C2 load barrier stub needs to preserve vector registers
  • ... and 120 more: https://git.openjdk.org/jdk17u-dev/compare/9439a87f728b2303e305fd955a7bc39686921bf3...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 18, 2022
@openjdk openjdk bot closed this Jul 18, 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 Jul 18, 2022
@openjdk
Copy link

openjdk bot commented Jul 18, 2022

@JoeWang-Java @shruacha1234 Pushed as commit 4f79e18.

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

@RealCLanger
Copy link
Contributor

I think you already noticed, that you were missing to request for backport approval by setting the jdk17u-fix-request label and awaiting the jdk17u-fix-yes. I have approved it retroactively, but please take care next time, e.g. with openjdk/jdk11u-dev#1121

@backwaterred
Copy link
Contributor

Thanks @RealCLanger, we will watch out for that next time.

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
Development

Successfully merging this pull request may close these issues.

5 participants