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 #1121

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/jdk11u-dev pull/1121/head:pull/1121
$ git checkout pull/1121

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1121

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/1121.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.

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

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

mlbridge bot commented May 31, 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?

@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!

@JoeWang-Java
Copy link
Member

@shruacha1234 @backwaterred Not sure if you saw my msg for the 17u backport. Please note that I'm in dev, not involved in update releases (and not on the update aliases that update PRs get sent to). I saw this only because of the GitHub msg. For future backport requests, you may ask people in the update aliases. Thanks, and sorry for the delay.

@backwaterred
Copy link
Contributor

Thanks @JoeWang-Java; I saw your message. I got busy with other things and these PRs fell off my radar, so no worries that you hadn't responded.

Is there a list of folks to contact for a review? Maybe the maintainer's listed here?

@JoeWang-Java
Copy link
Member

Thanks Tyler @backwaterred. That looks like the right list of people to me. I regretted a bit sponsoring 17u as they have their own procedure for update releases. Fortunately, it was a minor fix, so hopefully they don't mind :-)

@backwaterred
Copy link
Contributor

backwaterred commented Jul 19, 2022

Thanks Joe. I have chatted with @RealCLanger recently, and they are on both lists (11u and 17u). Christoph, we are looking for a review on this PR and this PR, before completing the JBS ceremony.

Copy link
Contributor

@RealCLanger RealCLanger left a comment

Choose a reason for hiding this comment

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

LGTM

@openjdk
Copy link

openjdk bot commented Jul 20, 2022

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

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

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

Reviewed-by: tsteele, clanger

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

  • a1a0459: 8290886: [11u]: Backport of JDK-8266250 introduced test failures
  • 69a3003: 8289853: Update HarfBuzz to 4.4.1
  • c291490: 8283087: Create a test or JDK-4715503
  • f53f3e6: 8282548: Create a regression test for JDK-4330998
  • 32d002f: 8282234: Create a regression test for JDK-4532513
  • 6fe25c7: 8282343: Create a regression test for JDK-4518432
  • 458c611: 8169468: NoResizeEventOnDMChangeTest.java fails because FS Window didn't receive all resizes!
  • 7d065b5: 6854300: [TEST_BUG] java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java fails in jdk6u14 & jdk7
  • be044d4: 8017175: [TESTBUG] javax/swing/JPopupMenu/4634626/bug4634626.java sometimes failed on mac
  • 8b9f01d: 8255724: [XRender] the BlitRotateClippedArea test fails on Linux in the XR pipeline
  • ... and 139 more: https://git.openjdk.org/jdk11u-dev/compare/1c93a6e011588ef3c491768d156552681f2480c4...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 (@RealCLanger) 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).

@GoeLin
Copy link
Member

GoeLin commented Jul 21, 2022

What is wrong with the pre-submit tests?

@backwaterred
Copy link
Contributor

@GoeLin the two win64 tests which are failing[1 & 2] don't seem to be related to this change. The tests are failing to load a class 'Lib' or 'Lib2', but these changes do not affect the classloader in any way that I am aware of.

[1] Lib
[2] Lib2

@shruacha1234
Copy link
Contributor Author

/integrate

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

openjdk bot commented Jul 25, 2022

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

@RealCLanger
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Jul 25, 2022

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

  • a1a0459: 8290886: [11u]: Backport of JDK-8266250 introduced test failures
  • 69a3003: 8289853: Update HarfBuzz to 4.4.1
  • c291490: 8283087: Create a test or JDK-4715503
  • f53f3e6: 8282548: Create a regression test for JDK-4330998
  • 32d002f: 8282234: Create a regression test for JDK-4532513
  • 6fe25c7: 8282343: Create a regression test for JDK-4518432
  • 458c611: 8169468: NoResizeEventOnDMChangeTest.java fails because FS Window didn't receive all resizes!
  • 7d065b5: 6854300: [TEST_BUG] java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java fails in jdk6u14 & jdk7
  • be044d4: 8017175: [TESTBUG] javax/swing/JPopupMenu/4634626/bug4634626.java sometimes failed on mac
  • 8b9f01d: 8255724: [XRender] the BlitRotateClippedArea test fails on Linux in the XR pipeline
  • ... and 139 more: https://git.openjdk.org/jdk11u-dev/compare/1c93a6e011588ef3c491768d156552681f2480c4...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 25, 2022

@RealCLanger @shruacha1234 Pushed as commit 37ca256.

💡 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
Development

Successfully merging this pull request may close these issues.

5 participants