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

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

Closed

Conversation

shruacha1234
Copy link
Contributor

@shruacha1234 shruacha1234 commented Jan 20, 2023

Signed-off-by: Shruthi 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/jdk17u-dev pull/1091/head:pull/1091
$ git checkout pull/1091

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1091

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

Using diff file

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

Signed-off-by: Shruthi <Shruthi.Shruthi1@ibm.com>
@bridgekeeper
Copy link

bridgekeeper bot commented Jan 20, 2023

👋 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 e3d5c9e7c4ab210ae7a4417a47632603910744a1 8266974: duplicate property key in java.sql.rowset resource bundle Jan 20, 2023
@openjdk
Copy link

openjdk bot commented Jan 20, 2023

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

@openjdk
Copy link

openjdk bot commented Jan 20, 2023

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

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

  • da62b2b: 8299970: Speed up compiler/arraycopy/TestArrayCopyConjoint.java
  • fcd9110: 8298472: AArch64: Detect Ampere-1 and Ampere-1A CPUs and set default options
  • a6f4cf1: 8302152: Speed up tests with infinite loops, sleep less
  • 49ff97c: 8301342: Prefer ArrayList to LinkedList in LayoutComparator
  • 5027f56: 8288332: Tier1 validate-source fails after 8279614
  • d0e0633: 8302692: [17u] Update GHA Boot JDK to 17.0.6
  • fb6d6fe: 8301842: JFR: increase checkpoint event size for stacktrace and string pool
  • cf5490b: 8297437: javadoc cannot link to old docs (with old style anchors)
  • 334ec9a: 8282958: Rendering Issues with Borders on Windows High-DPI systems
  • d2409a7: 8295777: java/net/httpclient/ConnectExceptionTest.java should not rely on system resolver
  • ... and 110 more: https://git.openjdk.org/jdk17u-dev/compare/48b8fec1125528763222525aff587a3711ac71c1...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).

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 20, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 20, 2023

Webrevs

@shruacha1234
Copy link
Contributor Author

@RealCLanger
can you please review this PR

@RealCLanger
Copy link
Contributor

RealCLanger commented Jan 24, 2023

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
Copy link
Contributor Author

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

@shruacha1234
Copy link
Contributor Author

@RealCLanger Thanks for adding the fix-request tag in the OpenJDK issue

@shruacha1234
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Feb 22, 2023
@openjdk
Copy link

openjdk bot commented Feb 22, 2023

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

@RealCLanger
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 24, 2023

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 24, 2023

@RealCLanger @shruacha1234 Pushed as commit 9bacd0c.

💡 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 clean integrated Pull request has been integrated
2 participants