Skip to content

Conversation

@yaqsun
Copy link
Contributor

@yaqsun yaqsun commented Jan 2, 2024

It is not reliable for a to modify this problem, so JDK-8276139 is submitted on the basis of JDK-8251155. JDK-8251155 and JDK-8276139 have been in 11u and later. so I backport JDK-8251155 and JDK-8276139 into one PR here.

Apply clean except for test path. And test have been locally verified to pass.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • JDK-8251155 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8276139 needs maintainer approval

Issues

  • JDK-8276139: TestJpsHostName.java not reliable, better to expand HostIdentifierCreate.java test (Bug - P4 - Approved)
  • JDK-8251155: HostIdentifier fails to canonicalize hostnames starting with digits (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 411

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 2, 2024

👋 Welcome back yaqsun! 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 openjdk bot changed the title Backport 2af9e5976fdf94afc7dbe5ad7827553818057bae 8276139: TestJpsHostName.java not reliable, better to expand HostIdentifierCreate.java test Jan 2, 2024
@openjdk
Copy link

openjdk bot commented Jan 2, 2024

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Jan 2, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 2, 2024

Webrevs

@phohensee
Copy link
Member

/issue add 8251155

@openjdk
Copy link

openjdk bot commented Jan 2, 2024

@phohensee Only the author (@yaqsun) is allowed to issue the /issue command.

@yaqsun
Copy link
Contributor Author

yaqsun commented Jan 3, 2024

/issue add 8251155

@openjdk
Copy link

openjdk bot commented Jan 3, 2024

@yaqsun
Adding additional issue to issue list: 8251155: HostIdentifier fails to canonicalize hostnames starting with digits.

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

Lgtm. Please check GHA failure, looks unrelated to me, but you may differ.

@openjdk
Copy link

openjdk bot commented Jan 3, 2024

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

@yaqsun
Copy link
Contributor Author

yaqsun commented Jan 9, 2024

/approval 8251155 request

@yaqsun
Copy link
Contributor Author

yaqsun commented Jan 9, 2024

/approval 8276139 request

@openjdk
Copy link

openjdk bot commented Jan 9, 2024

@yaqsun
8251155: The approval request has been created successfully.

@openjdk
Copy link

openjdk bot commented Jan 9, 2024

@yaqsun
8276139: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Jan 9, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented Feb 6, 2024

@yaqsun This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@jerboaa
Copy link
Contributor

jerboaa commented Feb 6, 2024

/approve yes

@openjdk
Copy link

openjdk bot commented Feb 6, 2024

@jerboaa
8276139: The approval request has been approved.
8251155: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Feb 6, 2024

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

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

8276139: TestJpsHostName.java not reliable, better to expand HostIdentifierCreate.java test
8251155: HostIdentifier fails to canonicalize hostnames starting with digits

Reviewed-by: phh

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 20 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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Feb 6, 2024
@yaqsun
Copy link
Contributor Author

yaqsun commented Feb 18, 2024

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Feb 18, 2024
@openjdk
Copy link

openjdk bot commented Feb 18, 2024

@yaqsun
Your change (at version d209079) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 19, 2024

Going to push as commit e926edc.
Since your change was applied there have been 20 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 Feb 19, 2024
@openjdk openjdk bot closed this Feb 19, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Feb 19, 2024
@openjdk
Copy link

openjdk bot commented Feb 19, 2024

@phohensee @yaqsun Pushed as commit e926edc.

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

@gnu-andrew
Copy link
Member

Why have two backports been bundled into one PR here? That doesn't seem to be the case in 11u and later.

@gnu-andrew
Copy link
Member

/approval 8251155 request

A reason should be given as to why the request should be approved. See https://wiki.openjdk.org/display/SKARA/Pull+Request+Commands#PullRequestCommands-/approval

@yaqsun yaqsun deleted the backport-8276139 branch May 28, 2024 01:35
@yaqsun
Copy link
Contributor Author

yaqsun commented Jun 12, 2024

Why have two backports been bundled into one PR here? That doesn't seem to be the case in 11u and later.

It is not reliable for a to modify this problem, so JDK-8276139 is submitted on the basis of JDK-8251155. JDK-8251155 and JDK-8276139 have been in 11u and later.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

4 participants