8266974: duplicate property key in java.sql.rowset resource bundle

[shruacha1234]

Signed-off-by: Shruthi.Shruthi1 Shruthi.Shruthi1@ibm.com

OpenJDK PR : openjdk/jdk#7212
OpenJDK bug : https://bugs.openjdk.org/browse/JDK-8266974

---

Progress

• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8266974: duplicate property key in java.sql.rowset resource bundle

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1666

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

Using diff file

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

[bridgekeeper]

👋 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]

@shruacha1234 Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

[openjdk]

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

[openjdk]

⚠️ @shruacha1234 the full name on your profile does not match the author name in this pull requests' HEAD commit. If this pull request gets integrated then the author name from this pull requests' HEAD commit will be used for the resulting commit. If you wish to push a new commit with a different author name, then please run the following commands in a local repository of your personal fork:

$ git checkout 8266974-backport-e3d5c9e
$ git commit --author='Preferred Full Name <you@example.com>' --allow-empty -m 'Update full name'
$ git push

[openjdk]

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

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

8266974: duplicate property key in java.sql.rowset resource bundle

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

• bc29f1e: 8288332: Tier1 validate-source fails after 8279614
• 183bb36: 8271323: [TESTBUG] serviceability/sa/ClhsdbCDSCore.java fails with -XX:TieredStopAtLevel=1
• 363586e: 8262060: compiler/whitebox/BlockingCompilation.java timed out
• 2244467: 8264200: java/nio/channels/DatagramChannel/SRTest.java fails intermittently
• ffac38f: 8264512: jdk/test/jdk/java/util/prefs/ExportNode.java relies on default platform encoding
• eb8c6f5: 8261279: sun/util/resources/cldr/TimeZoneNamesTest.java timed out
• 5f99819: 8261270: MakeMethodNotCompilableTest fails with -XX:TieredStopAtLevel={1,2,3}
• 013aa4d: 8259265: Refactor UncaughtExceptions shell test as java test.
• dbee861: 8260576: Typo in compiler/runtime/safepoints/TestRegisterRestoring.java
• 169b3d2: 8252401: Introduce Utils.TEST_NATIVE_PATH
• ... and 102 more: https://git.openjdk.org/jdk11u-dev/compare/b52d8ad54712270a7b99ac985931eb0d720a9695...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.

➡️ 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).

[mlbridge]

Webrevs

• 00: Full (5b2ea45e)

[shruacha1234]

@RealCLanger
can you please review this PR

[RealCLanger]

No need to review as it applies clean. Next step would be to ask for fix approval (step 6 of JDK Updates process). I can add the request for you if you give me some input for the Fix request text.

[shruacha1234]

@RealCLanger These changes remove duplicate property key in java.sql.rowset resource bundle. Tier1 testing shows no issues. The risk is low.

[GoeLin]

Hi @shruacha1234,
you are supposed to say WHY you think the risk is low.
"The risk is low because it only touches Resource files containing traslations."

[shruacha1234]

Hi @shruacha1234, you are supposed to say WHY you think the risk is low. "The risk is low because it only touches Resource files containing traslations."

Thanks @GoeLin I will keep that in mind next time

[shruacha1234]

/integrate

[openjdk]

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

[RealCLanger]

/sponsor

[openjdk]

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

• c8c63cb: 8303075: [11u] Add CompileClassWithDebugTest to ProblemList for 8303074
• 05db322: 8270609: [TESTBUG] java/awt/print/Dialog/DialogCopies.java does not show instruction
• cb5d79c: 8273895: compiler/ciReplay/TestVMNoCompLevel.java fails due to wrong data size with TieredStopAtLevel=2,3
• b3820b2: 8273806: compiler/cpuflags/TestSSE4Disabled.java should test for CPU feature explicitly
• b396137: 8257928: Test image build failure with clang-10 due to -Wmisleading-indentation
• 411aaff: 8213265: fix missing newlines at end of files
• c692aa9: 8301842: JFR: increase checkpoint event size for stacktrace and string pool
• bc29f1e: 8288332: Tier1 validate-source fails after 8279614
• 183bb36: 8271323: [TESTBUG] serviceability/sa/ClhsdbCDSCore.java fails with -XX:TieredStopAtLevel=1
• 363586e: 8262060: compiler/whitebox/BlockingCompilation.java timed out
• ... and 109 more: https://git.openjdk.org/jdk11u-dev/compare/b52d8ad54712270a7b99ac985931eb0d720a9695...master

Your commit was automatically rebased without conflicts.

[openjdk]

@RealCLanger @shruacha1234 Pushed as commit efe4481.

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