Skip to content

8349501: Relocate supporting classes in security/testlibrary to test/lib/jdk tree #1721

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

Closed
wants to merge 2 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Apr 29, 2025

I backport this for parity with 21.0.8-oracle. I had to resolve a row of simple conflicts. The first commit contains all the clean parts.

test/jdk/java/security/Provider/ChangeProviders.java
Trivial resolve because "https://bugs.openjdk.org/browse/JDK-8175874: Update Security.insertProviderAt to specify behavior when requested position is out of range." missing.
Specification change with CSR, don't backport.

All Copyright because "https://bugs.openjdk.org/browse/JDK-8338411: Implement JEP 486: Permanently Disable the Security Manager" touched these files.
test/jdk/sun/security/pkcs11/ec/ReadCertificates.java
test/jdk/sun/security/pkcs11/ec/ReadPKCS12.java
test/jdk/sun/security/pkcs11/ec/TestECDH.java
test/jdk/sun/security/pkcs11/ec/TestECDH2.java
test/jdk/sun/security/pkcs11/ec/TestECDSA.java
test/jdk/sun/security/pkcs11/ec/TestECDSA2.java
test/jdk/sun/security/pkcs11/rsa/TestCACerts.java
test/jdk/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java

test/jdk/sun/security/provider/certpath/PKIXCertComparator/Order.java
Test added by "https://bugs.openjdk.org/browse/JDK-8317431: Implement simpler Comparator when building certification paths" (jdk23). Enhancement, not a
candidate for backport. Omitted.

test/jdk/sun/security/ssl/Stapling/StatusResponseManager.java
test/jdk/sun/security/ssl/Stapling/java.base/sun/security/ssl/StatusResponseManagerTests.java
Trivial resolves because P4 bug "https://bugs.openjdk.org/browse/JDK-8339403: sun.security.ssl.StatusResponseManager.get swallows interrupt status" (jdk24) is not in 21.
Candidate for backport? Seems to be just a defensive change.

test/lib/jdk/test/lib/security/CertificateBuilder.java
Also "https://bugs.openjdk.org/browse/JDK-8317431: Implement simpler Comparator when building certification paths". Resolved Copyright.


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-8349501 needs maintainer approval

Issue

  • JDK-8349501: Relocate supporting classes in security/testlibrary to test/lib/jdk tree (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1721

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 29, 2025

👋 Welcome back goetz! 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
Copy link

openjdk bot commented Apr 29, 2025

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

8349501: Relocate supporting classes in security/testlibrary to test/lib/jdk tree

Reviewed-by: rschmelter

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 5 new commits pushed to 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.

@GoeLin GoeLin changed the title Goetz backport 8349501 backport b737f7fb3004e4e9c95fba95c6fcda70073ae00e Apr 29, 2025
@openjdk openjdk bot changed the title backport b737f7fb3004e4e9c95fba95c6fcda70073ae00e 8349501: Relocate supporting classes in security/testlibrary to test/lib/jdk tree Apr 29, 2025
@openjdk
Copy link

openjdk bot commented Apr 29, 2025

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 Apr 29, 2025
@mlbridge
Copy link

mlbridge bot commented Apr 29, 2025

Webrevs

Copy link
Contributor

@schmelter-sap schmelter-sap left a comment

Choose a reason for hiding this comment

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

Looks good.

@openjdk
Copy link

openjdk bot commented Apr 30, 2025

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

@GoeLin
Copy link
Member Author

GoeLin commented May 1, 2025

Thanks for the review!

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels May 1, 2025
@GoeLin
Copy link
Member Author

GoeLin commented May 5, 2025

/integrate

@openjdk
Copy link

openjdk bot commented May 5, 2025

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 5, 2025

@GoeLin Pushed as commit fdd0cb5.

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

@GoeLin GoeLin deleted the goetz_backport_8349501 branch May 5, 2025 13:10
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
Development

Successfully merging this pull request may close these issues.

2 participants