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

8251188: Update LDAP tests not to use wildcard addresses #585

Closed
wants to merge 1 commit into from

Conversation

mrserb
Copy link
Member

@mrserb mrserb commented Sep 30, 2024

Hi all,

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

The commit being backported was authored by Aleksei Efimov on 25 Sep 2020 and was reviewed by Daniel Fuchs.

The patch is not clean:

  • The change in ProblemList.txt was dropped, since the test is not present there.
  • The @library tag is changed from @library /test/lib to @library /lib/testlibrary.
  • @modules tags were deleted.
  • The usages of var were replaced by the actual types.
  • Some context is different since the next cleanup was not backported to the 8u: openjdk/jdk@aba017f

Thanks!


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

Issue

  • JDK-8251188: Update LDAP tests not to use wildcard addresses (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 585

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 30, 2024

👋 Welcome back serb! 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 Sep 30, 2024

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

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

8251188: Update LDAP tests not to use wildcard addresses

Reviewed-by: yan, mbalao, 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 2 new commits pushed to the master branch:

  • 13e86fb: Merge
  • 39221f8: 8337664: Distrust TLS server certificates issued after Oct 2024 and anchored by Entrust Root CAs

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
Copy link

openjdk bot commented Sep 30, 2024

⚠️ @mrserb a branch with the same name as the source branch for this pull request (master) is present in the target repository. If you eventually integrate this pull request then the branch master in your personal fork will diverge once you sync your personal fork with the upstream repository.

To avoid this situation, create a new branch for your changes and reset the master branch. You can do this by running the following commands in a local repository for your personal fork. Note: you do not have to name the new branch NEW-BRANCH-NAME.

$ git checkout -b NEW-BRANCH-NAME
$ git branch -f master f2d72b71880b739d006cd6fadc92018bcc705c15
$ git push -f origin master

Then proceed to create a new pull request with NEW-BRANCH-NAME as the source branch and close this one.

@mrserb mrserb changed the title 8251188: Update LDAP tests not to use wildcard addresses Backport a75edc29c6ce41116cc99530aa1710efb62c6d5a Sep 30, 2024
@openjdk openjdk bot changed the title Backport a75edc29c6ce41116cc99530aa1710efb62c6d5a 8251188: Update LDAP tests not to use wildcard addresses Sep 30, 2024
@openjdk
Copy link

openjdk bot commented Sep 30, 2024

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

@openjdk openjdk bot added the backport label Sep 30, 2024
@mrserb mrserb marked this pull request as ready for review September 30, 2024 18:27
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 30, 2024
@mlbridge
Copy link

mlbridge bot commented Sep 30, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Oct 1, 2024

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

@openjdk openjdk bot added the approval label Oct 1, 2024
Copy link
Contributor

@martinuy martinuy 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 to me. I observed no regressions in jdk/com/sun/jndi/ldap.

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.

Changes look good to me. We certainly shouldn't be backporting a cleanup change like JDK-8214694.

@gnu-andrew
Copy link
Member

/approve yes

@openjdk
Copy link

openjdk bot commented Oct 2, 2024

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

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Oct 2, 2024
@mrserb
Copy link
Member Author

mrserb commented Oct 3, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Oct 3, 2024

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

  • b4264bc: 8340815: Add SECURITY.md file
  • 13e86fb: Merge
  • 39221f8: 8337664: Distrust TLS server certificates issued after Oct 2024 and anchored by Entrust Root CAs

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 3, 2024

@mrserb Pushed as commit 61a4127.

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

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.

5 participants