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

8297955: LDAP CertStore should use LdapName and not String for DNs #1975

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jun 21, 2023

I backport this for parity with 11.0.20-oracle from 17.
It includes JDK-8224768.

Clean except for Copyright, but I had to adapt the Syntax to Java 11.
In Java 11 static methods can not be in inner classes.


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

Issues

  • JDK-8297955: LDAP CertStore should use LdapName and not String for DNs (Bug - P4)
  • JDK-8224768: Test ActalisCA.java fails (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1975

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 21, 2023

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into pr/1972 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 96adf073565e9a65912392510df8575e49695734 8297955: LDAP CertStore should use LdapName and not String for DNs Jun 21, 2023
@openjdk
Copy link

openjdk bot commented Jun 21, 2023

This backport pull request has now been updated with issues from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jun 21, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 21, 2023

Webrevs

Copy link
Contributor

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

Changes look good.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1972 to master June 23, 2023 07:36
@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 goetz_backport_8297955
git fetch https://git.openjdk.org/jdk11u-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 Jun 23, 2023

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

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

8297955: LDAP CertStore should use LdapName and not String for DNs
8224768: Test ActalisCA.java fails

Reviewed-by: lucy

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 4 new commits pushed to the master branch:

  • 5506f90: 8231516: network QuickAckTest.java failed due to "SocketException: maximum number of DatagramSockets reached"
  • ffe80b2: 8237183: Bug ID missing for test in patch which fixed JDK-8230665
  • 50f876c: 8232101: (sctp) Add minimal sanity tests for SCTP
  • ef1e4fa: 8224729: Cleanups in sun/security/provider/certpath/ldap/LDAPCertStoreImpl.java

Please see this link for an up-to-date comparison between the source branch of this pull request and 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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 23, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Jun 25, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jun 25, 2023

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

  • 4a7557e: 8236045: [TESTBUG] MismatchedWhiteBox test fails with missing WhiteBox$WhiteBoxPermission.class
  • 513732d: 8260934: java/lang/StringBuilder/HugeCapacity.java fails without Compact Strings
  • 817254d: 8249699: java/io/ByteArrayOutputStream/MaxCapacity.java should use @requires instead of @ignore
  • 77837e3: 8251517: [TESTBUG] com/sun/net/httpserver/bugs/B6393710.java does not scale socket timeout
  • e30705e: 8247968: test/jdk/javax/crypto/SecretKeyFactory/security.properties has wrong header
  • 30f0493: 8239007: java/math/BigInteger/largeMemory/ tests should be disabled on 32-bit platforms
  • 114bb9a: 8239537: cgroup MetricsTester testMemorySubsystem fails sometimes when testing memory.kmem.tcp.usage_in_bytes
  • 5506f90: 8231516: network QuickAckTest.java failed due to "SocketException: maximum number of DatagramSockets reached"
  • ffe80b2: 8237183: Bug ID missing for test in patch which fixed JDK-8230665
  • 50f876c: 8232101: (sctp) Add minimal sanity tests for SCTP
  • ... and 1 more: https://git.openjdk.org/jdk11u-dev/compare/6e12eba9a9b29635c136984dc24e9d019dc07560...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 25, 2023

@GoeLin Pushed as commit 7f1047e.

💡 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_8297955 branch June 26, 2023 05:28
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