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

Closed
wants to merge 1 commit into from

Conversation

masyano
Copy link

@masyano masyano commented Jan 25, 2022

I have removed the duplicate property keys.
Could you please review the fix?


Progress

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

Issue

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7212

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 25, 2022

👋 Welcome back myano! 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 added the rfr Pull request is ready for review label Jan 25, 2022
@openjdk
Copy link

openjdk bot commented Jan 25, 2022

@masyano 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.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Jan 25, 2022
@mlbridge
Copy link

mlbridge bot commented Jan 25, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Jan 25, 2022

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

Reviewed-by: lancea

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

  • a183bfb: 8280377: MethodHandleProxies does not correctly invoke default methods with varags
  • 2eab86b: 8213905: reflection not working for type annotations applied to exception types in the inner class constructor
  • 295c047: 8279242: Reflection newInstance() error message when constructor has no access modifiers could use improvement
  • 841eae6: 8269542: JDWP: EnableCollection support is no longer spec compliant after JDK-8255987
  • 76fe03f: 8280166: Extend java/lang/instrument/GetObjectSizeIntrinsicsTest.java test cases
  • cebaad1: 8280041: Retry loop issues in java.io.ClassCache
  • cbe8395: 8280168: Add Objects.toIdentityString
  • f4575e4: 8279946: (ch) java.nio.channels.FileChannel tryLock and write methods are missing @throws NonWritableChannelException
  • 674a97b: 8280396: G1: Full gc mark stack draining should prefer to make work available to other threads
  • fe77250: 8280414: Memory leak in DefaultProxySelector
  • ... and 4 more: https://git.openjdk.java.net/jdk/compare/c43ce85f01c96a4b80b971865306254c9417e549...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 (@LanceAndersen) 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 Jan 25, 2022
@masyano
Copy link
Author

masyano commented Jan 26, 2022

/integrate

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

openjdk bot commented Jan 26, 2022

@masyano
Your change (at version 53d0f0f) is now ready to be sponsored by a Committer.

@masyano
Copy link
Author

masyano commented Feb 1, 2022

@LanceAndersen Could you please commit this fix as a sponsor?

@LanceAndersen
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 2, 2022

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

  • 47800bf: 8280868: LineBodyHandlerTest.java creates and discards too many clients
  • 9d57853: 8281042: G1: Remove unused init_threshold in G1FullGCCompactionPoint
  • 87ab099: 8280944: Enable Unix domain sockets in Windows Selector notification mechanism
  • ce71e8b: 8279917: Refactor subclassAudits in Thread to use ClassValue
  • 4ea6037: 8281035: Serial: Move RemoveForwardedPointerClosure to local scope
  • ae2504b: 8278254: Cleanup doclint warnings in java.desktop module
  • de826ba: 8280600: C2: assert(!had_error) failed: bad dominance
  • 4304a77: 8279535: C2: Dead code in PhaseIdealLoop::create_loop_nest after JDK-8276116
  • ab63834: 8280885: Shenandoah: Some tests failed with "EA: missing allocation reference path"
  • 48a32b5: 8280976: Incorrect encoding of avx512 vpsraq instruction with mask and constant shift.
  • ... and 97 more: https://git.openjdk.java.net/jdk/compare/c43ce85f01c96a4b80b971865306254c9417e549...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 2, 2022

@LanceAndersen @masyano Pushed as commit e3d5c9e.

💡 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
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
2 participants