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

8319187: Add three eMudhra emSign roots #401

Closed

Conversation

jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Dec 11, 2023

Clean backport of the JDK 11u patch of
some more cacert additions (modulo path adjustments). Please review!

Testing:

  • GHA (still running). Includes cacerts testing these days.
  • cacerts tests locally on Linux x86_64. All pass (including the new tests).

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
  • JDK-8319187 needs maintainer approval

Issue

  • JDK-8319187: Add three eMudhra emSign roots (Enhancement - P2 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 401

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 11, 2023

👋 Welcome back sgehwolf! A progress list of the required criteria for merging this PR into pr/399 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 0bda467f6e29c866c661e88a76a9fe3efc0a0d19 8319187: Add three eMudhra emSign roots Dec 11, 2023
@openjdk
Copy link

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

mlbridge bot commented Dec 11, 2023

Webrevs

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/399 to master December 11, 2023 19:26
@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-8319187-add-emudhra-certs
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

@jerboaa jerboaa force-pushed the jdk-8319187-add-emudhra-certs branch from 57bc091 to d957001 Compare December 12, 2023 09:21
@openjdk
Copy link

openjdk bot commented Dec 12, 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.

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.

I see some contextual differences:

-@@ -586,6 +606,13 @@ public class CAInterop {
-                     return new CATestURLs("https://validpremiumecc.affirmtrust.com",
-                             "https://revokedpremiumecc.affirmtrust.com");
+@@ -532,6 +552,13 @@ private CATestURLs getTestURLs(String alias) {
+                     return new CATestURLs("https://juolukka.cover.telia.fi:10600",
+                             "https://juolukka.cover.telia.fi:10601");

It seems JDK-8268916 should go in first and make this a cleaner backport.

@jerboaa
Copy link
Contributor Author

jerboaa commented Dec 13, 2023

OK, I'll work on a backport of JDK-8268916, but it doesn't need to go in the same order as JDK 11. It's just context difference. How about we get this one in first and I'll follow up with the test addition in parallel? Seems counter-intuitive to require JDK-8268916 first. It's a test change only and unrelated to this patch.

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.

Alright, I'm ok with that as long as the files are the same once both patches are applied.

@openjdk
Copy link

openjdk bot commented Dec 13, 2023

⚠️ @jerboaa 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.

@jerboaa
Copy link
Contributor Author

jerboaa commented Dec 13, 2023

Thanks. Asked for approval.

@openjdk openjdk bot added the approval label Dec 13, 2023
@gnu-andrew
Copy link
Member

/approve yes

@openjdk
Copy link

openjdk bot commented Dec 13, 2023

@gnu-andrew
8319187: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Dec 13, 2023

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

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

8319187: Add three eMudhra emSign 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 ready Pull request is ready to be integrated and removed approval labels Dec 13, 2023
@jerboaa
Copy link
Contributor Author

jerboaa commented Dec 13, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Dec 13, 2023

Going to push as commit 31162fb.

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

openjdk bot commented Dec 13, 2023

@jerboaa Pushed as commit 31162fb.

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

@jerboaa jerboaa mentioned this pull request Dec 14, 2023
5 tasks
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