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

8318983: Fix comment typo in PKCS12Passwd.java #2514

Closed
wants to merge 1 commit into from

Conversation

amosshi
Copy link
Contributor

@amosshi amosshi commented Feb 7, 2024

Backport of JDK-8318983

Testing

  • Local: Passed, on MacOS M1 Laptop
  • Pipeline: All checks have passed
  • Testing Machine: SAP nightlies passed on 2024-02-11

Progress

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

Issue

  • JDK-8318983: Fix comment typo in PKCS12Passwd.java (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2514

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 7, 2024

👋 Welcome back ashi! 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 949846986f572dfb82912e7d71e7bfd37a90871e 8318983: Fix comment typo in PKCS12Passwd.java Feb 7, 2024
@openjdk
Copy link

openjdk bot commented Feb 7, 2024

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

@openjdk
Copy link

openjdk bot commented Feb 7, 2024

⚠️ @amosshi 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 Feb 7, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 7, 2024

Webrevs

@amosshi
Copy link
Contributor Author

amosshi commented Feb 12, 2024

/approval request “Backporting for parity with jdk 11.0.23-oracle. Clean backport. Test case only, no risk. SAP nightlies passed on 2024-02-11”

@openjdk
Copy link

openjdk bot commented Feb 12, 2024

@amosshi
8318983: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Feb 12, 2024
@openjdk
Copy link

openjdk bot commented Feb 15, 2024

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

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

8318983: Fix comment typo in PKCS12Passwd.java

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

  • 10894a0: 8304314: StackWalkTest.java fails after CODETOOLS-7903373
  • 1047521: 8318603: Parallelize sun/java2d/marlin/ClipShapeTest.java
  • 1f516f6: 8324307: [11u] hotspot fails to build with GCC 12 and newer (non-static data member initializers)
  • bcdad92: 8249087: Always initialize _body[0..1] in Symbol constructor
  • daf393a: 8304725: AsyncGetCallTrace can cause SIGBUS on M1
  • 621048a: 8247818: GCC 10 warning stringop-overflow with symbol code
  • a60fb5a: 8325150: (tz) Update Timezone Data to 2024a
  • 1f85c15: 8318608: Enable parallelism in vmTestbase/nsk/stress/threads tests
  • 5aa8538: 8318607: Enable parallelism in vmTestbase/nsk/stress/jni tests
  • 54d1857: 8325096: Test java/security/cert/CertPathBuilder/akiExt/AKISerialNumber.java is failing

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 Feb 15, 2024
@amosshi
Copy link
Contributor Author

amosshi commented Feb 16, 2024

/integrate

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

openjdk bot commented Feb 16, 2024

@amosshi
Your change (at version 8355dc7) is now ready to be sponsored by a Committer.

@GoeLin
Copy link
Member

GoeLin commented Feb 19, 2024

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 19, 2024

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

  • cc88c3c: 8317307: test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java fails with ConnectException: Connection timed out: no further information
  • ccd4c98: 8319668: Fixup of jar filename typo in BadFactoryTest.sh
  • a5e6577: 8315680: java/lang/ref/ReachabilityFenceTest.java should run with -Xbatch
  • 92cb5eb: 8319456: jdk/jfr/event/gc/collection/TestGCCauseWith[Serial|Parallel].java : GC cause 'GCLocker Initiated GC' not in the valid causes
  • ddc3e41: 8318736: com/sun/jdi/JdwpOnThrowTest.java failed with "transport error 202: bind failed: Address already in use"
  • 6ecf198: 8316001: GC: Make TestArrayAllocatorMallocLimit use createTestJvm
  • f7cd14c: 8307123: Fix deprecation warnings in DPrinter
  • 8af22e7: 8324347: Enable "maybe-uninitialized" warning for FreeType 2.13.1
  • 10894a0: 8304314: StackWalkTest.java fails after CODETOOLS-7903373
  • 1047521: 8318603: Parallelize sun/java2d/marlin/ClipShapeTest.java
  • ... and 8 more: https://git.openjdk.org/jdk11u-dev/compare/4c25b228c95aab583329c12129c19819507b480f...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 19, 2024

@GoeLin @amosshi Pushed as commit 38a60d7.

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

@amosshi amosshi deleted the backport-8318983 branch February 22, 2024 07:20
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
Development

Successfully merging this pull request may close these issues.

2 participants