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

8304760: Add 2 Microsoft TLS roots #1349

Closed
wants to merge 1 commit into from

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented May 16, 2023

Backport 8304760


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1349

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 16, 2023

👋 Welcome back mbaesken! 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 c7e1df832837c2f19629cf0d5a5d3e65142ac208 8304760: Add 2 Microsoft TLS roots May 16, 2023
@openjdk
Copy link

openjdk bot commented May 16, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels May 16, 2023
@mlbridge
Copy link

mlbridge bot commented May 16, 2023

Webrevs

@MBaesken
Copy link
Member Author

The patch needs a bit of adjustments (different checksum in test/jdk/sun/security/lib/cacerts/VerifyCACerts.java , src/java.base/share/data/cacerts/microsoft* goes to different location make/data/cacerts/ in jdk17 compared to jdk-head).

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks for backporting!

@openjdk
Copy link

openjdk bot commented May 16, 2023

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

8304760: Add 2 Microsoft TLS roots

Reviewed-by: mdoerr

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 1 new commit pushed to the master branch:

  • e7bac42: 8295974: jni_FatalError and Xcheck:jni warnings should print the native stack when there are no Java frames

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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 16, 2023
@MBaesken
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented May 17, 2023

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

  • e55bea4: 8299544: Improve performance of CRC32C intrinsics (non-AVX-512) for small inputs
  • e7bac42: 8295974: jni_FatalError and Xcheck:jni warnings should print the native stack when there are no Java frames

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 17, 2023
@openjdk openjdk bot closed this May 17, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 17, 2023
@openjdk
Copy link

openjdk bot commented May 17, 2023

@MBaesken Pushed as commit f655ccd.

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