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

shruacha1234 · 2022-04-20T15:37:13Z

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

The bug report for the same: https://bugs.openjdk.java.net/browse/JDK-8285097

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed (1 review required, with at least 1 reviewer)

Issue

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

Reviewers

Joe Wang (@JoeWang-Java - Reviewer)
Tyler Steele (@backwaterred - Author) ⚠️ Review applies to c294a150

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8318

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

Using diff file

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

…rrorResources.java

bridgekeeper · 2022-04-20T15:38:59Z

Hi @shruacha1234, welcome to this OpenJDK project and thanks for contributing!

We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing /signed in a comment in this pull request.

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user shruacha1234" as summary for the issue.

If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing /covered in a comment in this pull request.

openjdk · 2022-04-20T15:41:11Z

@shruacha1234 The following label will be automatically applied to this pull request:

core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

backwaterred · 2022-04-20T15:59:55Z

@shruacha1234, a few notes specific to openJDK PRs:

Please change the issue name to: "8285097: Duplicate XML keys in XPATHErrorResources.java and XSLTErrorResources.java" this will correctly link the issue in bugs.openjdk.net
Please enable github actions. This allows the pre-tests to run.

shruacha1234 · 2022-04-22T11:38:23Z

This contribution is on behalf of my employer, IBM, which is a corporate OCA signatory.

shruacha1234 · 2022-04-22T11:38:51Z

/covered

mlbridge · 2022-04-27T23:14:13Z

Webrevs

src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java

JoeWang-Java

Looks good.

openjdk · 2022-05-02T01:00:22Z

@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: joehw, tsteele

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

5e5500c: 6782021: It is not possible to read local computer certificates with the SunMSCAPI provider
d65fba4: 8286452: The array length of testSmallConstArray should be small and const
125efe6: 8286744: failure_handler: dmesg command on macos fails to collect data due to permission issues
40f4dab: 8286756: Cleanup foreign API benchmarks
af2918f: 8286787: Expand use of @inheritdoc in AudioInputStream
24cab0a: 8286740: JFR: Active Setting event emitted incorrectly
a31130f: 7131823: bug in GIFImageReader
4bc7b7d: 8286760: Update citation of "Effective Java" second edition to third edition
c044cb8: 8286399: Address possibly lossy conversions in JDK Build Tools
b884db8: 8285844: TimeZone.getTimeZone(ZoneOffset) does not work for all ZoneOffsets and returns GMT unexpected
... and 373 more: https://git.openjdk.java.net/jdk/compare/46b2e547a9f680a2a93fecc2b223e895c26e96d7...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).

shruacha1234 · 2022-05-02T07:39:39Z

/integrate

backwaterred · 2022-05-02T14:11:59Z

@shruacha1234 Please don't integrate without addressing the comments left in my review. There are several files that still use the old key incorrectly.

backwaterred · 2022-05-02T14:14:44Z

It also looks like you have not run the pre-tests yet. Please enable them in GitHub Actions and confirm that they pass.

https://wiki.openjdk.java.net/display/SKARA/Testing

JoeWang-Java · 2022-05-02T19:36:47Z

Note that I've run the tests locally. The default test configuration is tier1, which isn't really helpful in this case excepting heating up the planet. If you plan to do more on java.xml, you may run tier2 to verify your changes.

…ErrorResources language files

src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java

backwaterred · 2022-05-06T14:58:14Z

LGTM. Nicely done @shruacha1234

JoeWang-Java · 2022-05-06T20:21:05Z

Changing resource bundles is not required as the L10n resource files update would cover that. As you've modified the files, you'll need to update the license header, using XPATHErrorResources_ja.java as an example and update the year and LastModified tag.

JoeWang-Java · 2022-05-09T18:53:09Z

After the last update, the years in the copyright header and LastModified tag do not match. For example, the header for XPATHErrorResources_de.java starts like: Copyright (c) 2019, 2021, where 2021 needs to be updated to 2022. When I mentioned using XPATHErrorResources_ja.java as an example, I meant replacing "reserved comment block" with the copyright header and then update the copyright year. Sorry if I wasn't clear enough. But basically using that as a template for the format of the header, and keep the year updated to the current. Thanks.

src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java

JoeWang-Java · 2022-05-12T15:51:15Z

Copyright years for XRTreeFragSelectWrapper.java and XSLTErrorResources.java were still not updated, with the later missing the LastModified tag. Please double check all files before integrate.

JoeWang-Java

They all look good now. Thanks.

shruacha1234 · 2022-05-13T12:56:14Z

@JoeWang-Java
Added Copyright header year and Last-Modified tag, with this commit the test is failing could you please suggest the same

JoeWang-Java · 2022-05-13T18:51:47Z

Did you mean the failure (Pre-submit tests - Linux x86 - Test (tier1) ) above? That's not related to your change.

shruacha1234 · 2022-05-16T04:50:51Z

@JoeWang-Java Yes.
Shall I comment as integrate then?

JoeWang-Java · 2022-05-16T16:24:51Z

@JoeWang-Java Yes. Shall I comment as integrate then?

Yes, please go ahead with integrate.

shruacha1234 · 2022-05-16T16:26:41Z

integrate

JoeWang-Java · 2022-05-16T16:33:17Z

integrate

I think you missed slash, it's slash integrate.

shruacha1234 · 2022-05-16T16:35:16Z

/integrate

JoeWang-Java · 2022-05-16T17:41:24Z

/sponsor

openjdk · 2022-05-16T17:42:04Z

@JoeWang-Java The change author (@shruacha1234) must issue an integrate command before the integration can be sponsored.

JoeWang-Java · 2022-05-16T18:16:22Z

/integrate

There may be sth. with your input, it's not recognized as Git command. Try again, or copy this command instead.

naotoj · 2022-05-16T18:23:23Z

Do not enclose the skara command within backquotes.

JoeWang-Java · 2022-05-16T18:27:23Z

Do not enclose the skara command within backquotes.

Thanks Naoto! I didn't realize that's what he did :-)

shruacha1234 · 2022-05-17T05:22:58Z

/integrate

openjdk · 2022-05-17T05:24:12Z

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

shruacha1234 · 2022-05-18T06:53:22Z

@JoeWang-Java I have issued the integrate command. Now it is ready to be sponsored. Please do the needful

JoeWang-Java · 2022-05-18T18:11:47Z

/sponsor

openjdk · 2022-05-18T18:13:34Z

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

6b9c152: 8286366: (cs) Charset.put can use putIfAbsent instead of containsKey+put
9becf7d: 8283705: Make javax.sound.midi.Track a final class
a03438c: 8285397: JNI exception pending in CUPSfuncs.c:250
9ab29b6: 8286869: unify os::dir_is_empty across posix platforms
ee45a0a: 8286669: Replace MethodHandle specialization with ASM in mainline
d8b0b32: 8286763: [REDO] (fc) Tune FileChannel.transferFrom()
ac7e019: 8286925: Move JSON parser used in JFR tests to test library
e934a2c: 8286637: (fc) Memory mapped regions bigger than 2GB do not work correctly on Windows
69ff86a: 8286870: Memory leak with RepeatCompilation
81e4bdb: 8283689: Update the foreign linker VM implementation
... and 413 more: https://git.openjdk.java.net/jdk/compare/46b2e547a9f680a2a93fecc2b223e895c26e96d7...master

Your commit was automatically rebased without conflicts.

openjdk · 2022-05-18T18:13:56Z

@JoeWang-Java @shruacha1234 Pushed as commit b5a3d28.

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

Removing Duplicate keys present in XSLTErrorResources.java and XPATHE…

8c93a25

…rrorResources.java

bridgekeeper bot added the oca Needs verification of OCA signatory status label Apr 20, 2022

openjdk bot added the core-libs core-libs-dev@openjdk.org label Apr 20, 2022

shruacha1234 changed the title ~~Removing Duplicate keys present in XSLTErrorResources.java and XPATHErrorResources.java~~ 8285097: Duplicate XML keys in XPATHErrorResources.java and XSLTErrorResources.java Apr 22, 2022

bridgekeeper bot removed the oca Needs verification of OCA signatory status label Apr 27, 2022

openjdk bot added the rfr Pull request is ready for review label Apr 27, 2022

JoeWang-Java reviewed Apr 28, 2022

View reviewed changes

src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java Show resolved Hide resolved

Updating last modified tag and XRTreeFragSelectWrapper.java

d53ca37

JoeWang-Java approved these changes May 2, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label May 2, 2022

Replace the ER_RTF_NOT_SUPPORTED_XRTREEFRAGSELECTWRAPPER key in XPATH…

c294a15

…ErrorResources language files

backwaterred approved these changes May 6, 2022

View reviewed changes

src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java Show resolved Hide resolved

Add last modified tag

b1dcd44

shruacha1234 force-pushed the Remove_duplicates branch from ef9d444 to b1dcd44 Compare May 9, 2022 06:55

update copyright header

0cf1f9b

JoeWang-Java reviewed May 10, 2022

View reviewed changes

src/java.xml/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java Outdated Show resolved Hide resolved

Modify copyright year

bcad12e

shruacha1234 force-pushed the Remove_duplicates branch from 283f8ef to bcad12e Compare May 12, 2022 17:58

JoeWang-Java approved these changes May 12, 2022

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label May 17, 2022

openjdk bot added the integrated Pull request has been integrated label May 18, 2022

openjdk bot closed this May 18, 2022

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 May 18, 2022

This was referenced May 31, 2022

8285097: Duplicate XML keys in XPATHErrorResources.java and XSLTErrorResources.java openjdk/jdk11u-dev#1121

Closed

8285097: Duplicate XML keys in XPATHErrorResources.java and XSLTErrorResources.java openjdk/jdk17u-dev#427

Closed

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

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

Conversation

shruacha1234 commented Apr 20, 2022 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Apr 20, 2022

openjdk bot commented Apr 20, 2022

backwaterred commented Apr 20, 2022

shruacha1234 commented Apr 22, 2022 • edited by bridgekeeper bot Loading

shruacha1234 commented Apr 22, 2022 • edited by bridgekeeper bot Loading

mlbridge bot commented Apr 27, 2022 • edited Loading

Webrevs

JoeWang-Java left a comment

Choose a reason for hiding this comment

openjdk bot commented May 2, 2022 • edited Loading

shruacha1234 commented May 2, 2022

backwaterred commented May 2, 2022

backwaterred commented May 2, 2022

JoeWang-Java commented May 2, 2022

backwaterred commented May 6, 2022

JoeWang-Java commented May 6, 2022

JoeWang-Java commented May 9, 2022

JoeWang-Java commented May 12, 2022

JoeWang-Java left a comment

Choose a reason for hiding this comment

shruacha1234 commented May 13, 2022

JoeWang-Java commented May 13, 2022

shruacha1234 commented May 16, 2022

JoeWang-Java commented May 16, 2022

shruacha1234 commented May 16, 2022

JoeWang-Java commented May 16, 2022 • edited Loading

shruacha1234 commented May 16, 2022

JoeWang-Java commented May 16, 2022

openjdk bot commented May 16, 2022

JoeWang-Java commented May 16, 2022

naotoj commented May 16, 2022

JoeWang-Java commented May 16, 2022

shruacha1234 commented May 17, 2022

openjdk bot commented May 17, 2022

shruacha1234 commented May 18, 2022

JoeWang-Java commented May 18, 2022

openjdk bot commented May 18, 2022

openjdk bot commented May 18, 2022

shruacha1234 commented Apr 20, 2022 •

edited by openjdk bot

Loading

shruacha1234 commented Apr 22, 2022 •

edited by bridgekeeper bot

Loading

shruacha1234 commented Apr 22, 2022 •

edited by bridgekeeper bot

Loading

mlbridge bot commented Apr 27, 2022 •

edited

Loading

openjdk bot commented May 2, 2022 •

edited

Loading

JoeWang-Java commented May 16, 2022 •

edited

Loading