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

Closed
wants to merge 1 commit into from

Conversation

jerboaa
Copy link
Contributor

@jerboaa jerboaa commented May 25, 2023

Clean backport modulo path changes to adjust to the OpenJDK 8u layout. I'd like to get this into 8u382 for symmetry with Oracle JDK 8u381.

Testing:

  • sun/security/lib/cacerts/VerifyCACerts.java and security/infra/java/security/cert/CertPathValidator/certification passed.

Progress

  • 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/jdk8u-dev.git pull/320/head:pull/320
$ git checkout pull/320

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 320

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 25, 2023

👋 Welcome back sgehwolf! A progress list of the required criteria for merging this PR into pr/319 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 f655ccd1c74bb18000ef2789d26952055c2deba1 8304760: Add 2 Microsoft TLS roots May 25, 2023
@openjdk
Copy link

openjdk bot commented May 25, 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 25, 2023
@mlbridge
Copy link

mlbridge bot commented May 25, 2023

Webrevs

@jerboaa
Copy link
Contributor Author

jerboaa commented May 25, 2023

This is a clean backport as the only changes have been path adjustments to match the 8u layout.

/clean

@openjdk openjdk bot added the clean label May 25, 2023
@openjdk
Copy link

openjdk bot commented May 25, 2023

@jerboaa This backport pull request is now marked as clean

@openjdk openjdk bot mentioned this pull request May 25, 2023
4 tasks
Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Confirmed clean and looks good to me. Approved for 8u.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/319 to master May 25, 2023 17:05
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout jdk-8304760-add-ms-cacerts
git fetch https://git.openjdk.org/jdk8u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented May 25, 2023

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

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

8304760: Add 2 Microsoft TLS roots

Reviewed-by: andrew

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 25, 2023
@jerboaa jerboaa force-pushed the jdk-8304760-add-ms-cacerts branch from c8173f6 to ccf66ea Compare May 25, 2023 17:32
@openjdk
Copy link

openjdk bot commented May 25, 2023

@jerboaa Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@jerboaa
Copy link
Contributor Author

jerboaa commented May 26, 2023

The one x64 test failure seems unrelated to this PR.

@jerboaa
Copy link
Contributor Author

jerboaa commented May 26, 2023

/integrate

@openjdk
Copy link

openjdk bot commented May 26, 2023

Going to push as commit f5c2c39.

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

openjdk bot commented May 26, 2023

@jerboaa Pushed as commit f5c2c39.

💡 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