Skip to content

Commit

Permalink
8308592: Framework for CA interoperability testing
Browse files Browse the repository at this point in the history 
Reviewed-by: mullan
  • Loading branch information
@rhalade
rhalade committed Sep 19, 2023
1 parent a6d120d commit da57d2a
Show file tree
Hide file tree
Showing 17 changed files with 801 additions and 5,299 deletions.
217 changes: 0 additions & 217 deletions test/jdk/security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java
View file

This file was deleted.

Loading

7 comments on commit da57d2a

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@rhalade
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk21u

@openjdk
Copy link

@openjdk openjdk bot commented on da57d2a Sep 20, 2023

Choose a reason for hiding this comment

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

@rhalade the backport was successfully created on the branch rhalade-backport-da57d2a1 in my personal fork of openjdk/jdk21u. To create a pull request with this backport targeting openjdk/jdk21u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit da57d2a1 from the openjdk/jdk repository.

The commit being backported was authored by Rajan Halade on 19 Sep 2023 and was reviewed by Sean Mullan.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u:

$ git fetch https://github.com/openjdk-bots/jdk21u.git rhalade-backport-da57d2a1:rhalade-backport-da57d2a1
$ git checkout rhalade-backport-da57d2a1
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u.git rhalade-backport-da57d2a1

@gnu-andrew
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on da57d2a Sep 26, 2023

Choose a reason for hiding this comment

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

@gnu-andrew the backport was successfully created on the branch gnu-andrew-backport-da57d2a1 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit da57d2a1 from the openjdk/jdk repository.

The commit being backported was authored by Rajan Halade on 19 Sep 2023 and was reviewed by Sean Mullan.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git gnu-andrew-backport-da57d2a1:gnu-andrew-backport-da57d2a1
$ git checkout gnu-andrew-backport-da57d2a1
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git gnu-andrew-backport-da57d2a1

@gnu-andrew
Copy link
Member

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 da57d2a Sep 28, 2023

Choose a reason for hiding this comment

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

@gnu-andrew Could not automatically backport da57d2a1 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 gnu-andrew-backport-da57d2a1

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

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

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

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

Please sign in to comment.