Skip to content

Commit

Permalink
8308592: Framework for CA interoperability testing
Browse files Browse the repository at this point in the history
Backport-of: da57d2a1eb409ddc64117865c7d24ed518421cab
  • Loading branch information
gnu-andrew committed Sep 28, 2023
1 parent 9fce30a commit cb535e2
Show file tree
Hide file tree
Showing 17 changed files with 801 additions and 5,299 deletions.

This file was deleted.

3 comments on commit cb535e2

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@RealCLanger
Copy link
Contributor

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on cb535e2 Oct 7, 2023

Choose a reason for hiding this comment

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

@RealCLanger Could not automatically backport cb535e2d to openjdk/jdk11u-dev due to conflicts in the following files:

  • test/jdk/security/infra/java/security/cert/CertPathValidator/certification/SSLCA.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b RealCLanger-backport-cb535e2d

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git cb535e2d52221bfc23e4c26a730399bceb573547

# Backport the commit
$ git cherry-pick --no-commit cb535e2d52221bfc23e4c26a730399bceb573547
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport cb535e2d52221bfc23e4c26a730399bceb573547'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport cb535e2d52221bfc23e4c26a730399bceb573547.

Please sign in to comment.