Skip to content

Conversation

@dimitryc
Copy link
Contributor

@dimitryc dimitryc commented May 21, 2025

Backport for parity with Oracle.

Almost clean backport after adjusting paths. The only conflict is in copyright years (in java_props_md.c), applied manually.

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

Issue

  • JDK-8340387: Update OS detection code to recognize Windows Server 2025 (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 655

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 21, 2025

👋 Welcome back dcherepanov! 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 May 21, 2025

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

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

8340387: Update OS detection code to recognize Windows Server 2025

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

@openjdk openjdk bot changed the title Backport 34cddfbedd20d5804cab8044fbc402564e98eb9c 8340387: Update OS detection code to recognize Windows Server 2025 May 21, 2025
@openjdk
Copy link

openjdk bot commented May 21, 2025

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 May 21, 2025
@mlbridge
Copy link

mlbridge bot commented May 21, 2025

Webrevs

@openjdk
Copy link

openjdk bot commented May 22, 2025

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

@dimitryc
Copy link
Contributor Author

Thanks for the review!

/approval request Backport for parity with Oracle. The patch improves OS detection.

@openjdk
Copy link

openjdk bot commented May 29, 2025

@dimitryc
8340387: The approval request has been created successfully.

@openjdk openjdk bot added approval Requires approval; will be removed when approval is received ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels May 29, 2025
@dimitryc
Copy link
Contributor Author

dimitryc commented Jun 2, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Jun 2, 2025

Going to push as commit 6f0f298.
Since your change was applied there have been 6 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 Jun 2, 2025
@openjdk openjdk bot closed this Jun 2, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 2, 2025
@openjdk
Copy link

openjdk bot commented Jun 2, 2025

@dimitryc Pushed as commit 6f0f298.

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

2 participants