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

8311081: KeytoolReaderP12Test.java fail on localized Windows platform #37

Closed
wants to merge 2 commits into from

Conversation

tkiriyama
Copy link
Contributor

@tkiriyama tkiriyama commented Dec 15, 2023

Hi all,

I want to backport JDK-8311081 for jdk21u.
This is clean backport.
I verified that KeytoolReaderP12Test.java passes with this fix.

Would you review and sponsor this fix, please?


Progress

  • Change must not contain extraneous whitespace
  • JDK-8311081 needs maintainer approval
  • Commit message must refer to an issue

Issue

  • JDK-8311081: KeytoolReaderP12Test.java fail on localized Windows platform (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 37

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 15, 2023

👋 Welcome back tkiriyama! 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 b4b2fecb42d9f14d73e8d79a9e59dee4d697f9cf 8311081: KeytoolReaderP12Test.java fail on localized Windows platform Dec 15, 2023
@openjdk
Copy link

openjdk bot commented Dec 15, 2023

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

@openjdk
Copy link

openjdk bot commented Dec 15, 2023

⚠️ @tkiriyama This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 15, 2023
@mlbridge
Copy link

mlbridge bot commented Dec 15, 2023

Webrevs

@tkiriyama
Copy link
Contributor Author

/approval request This is clean backport. It fixes only one test and the risk is low. The test fixed in this commit is passed.

@openjdk
Copy link

openjdk bot commented Dec 15, 2023

@tkiriyama
8311081: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Dec 15, 2023
@openjdk
Copy link

openjdk bot commented Dec 18, 2023

⚠️ @tkiriyama 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 8311081
$ git commit --author='Preferred Full Name <you@example.com>' --allow-empty -m 'Update full name'
$ git push

@openjdk
Copy link

openjdk bot commented Dec 18, 2023

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

8311081: KeytoolReaderP12Test.java fail on localized Windows platform

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

  • 3e4adb6: 8320168: handle setsocktopt return values
  • c725f4b: 8321374: Add a configure option to explicitly set CompanyName property in VersionInfo resource for Windows exe/dll
  • 2433635: 8314220: Configurable InlineCacheBuffer size
  • 03acee8: 8314578: Non-verifiable code is emitted when two guards declare pattern variables in colon-switch
  • af6df77: 8305971: NPE in JavacProcessingEnvironment for missing enum constructor body
  • f55a91a: 8319897: Move StackWatermark handling out of LockStack::contains
  • b8a0d9f: 8316229: Enhance class initialization logging
  • 5d32860: 8310807: java/nio/channels/DatagramChannel/Connect.java timed out
  • 0c92460: 8309302: java/net/Socket/Timeouts.java fails with AssertionError on test temporal post condition
  • 6644066: 8313621: test/jdk/jdk/internal/math/FloatingDecimal/TestFloatingDecimal should use RandomFactory
  • ... and 19 more: https://git.openjdk.org/jdk21u-dev/compare/e8cf56c21f18cd9910df30576a742aac83f5ef66...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 and removed approval labels Dec 18, 2023
@tkiriyama
Copy link
Contributor Author

/integrate

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

openjdk bot commented Dec 20, 2023

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

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 20, 2023

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

  • bd552ef: 8313229: DHEKeySizing.java should be modified to use TLS versions TLSv1, TLSv1.1, TLSv1.2
  • 34fc725: 8317307: test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java fails with ConnectException: Connection timed out: no further information
  • 3e4adb6: 8320168: handle setsocktopt return values
  • c725f4b: 8321374: Add a configure option to explicitly set CompanyName property in VersionInfo resource for Windows exe/dll
  • 2433635: 8314220: Configurable InlineCacheBuffer size
  • 03acee8: 8314578: Non-verifiable code is emitted when two guards declare pattern variables in colon-switch
  • af6df77: 8305971: NPE in JavacProcessingEnvironment for missing enum constructor body
  • f55a91a: 8319897: Move StackWatermark handling out of LockStack::contains
  • b8a0d9f: 8316229: Enhance class initialization logging
  • 5d32860: 8310807: java/nio/channels/DatagramChannel/Connect.java timed out
  • ... and 21 more: https://git.openjdk.org/jdk21u-dev/compare/e8cf56c21f18cd9910df30576a742aac83f5ef66...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 20, 2023

@phohensee @tkiriyama Pushed as commit 9aad573.

💡 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