8340387: Update OS detection code to recognize Windows Server 2025 #21082
Conversation
|
👋 Welcome back mbaesken! A progress list of the required criteria for merging this PR into |
|
@MBaesken 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: 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 42 new commits pushed to the
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 |
openjdk
bot
changed the title
|
Hello Matthias, please give me a day or two to run this against our internal CI to make sure there are no unexpected issues. |
tier1, tier2, tier3 testing in our CI has completed successfully, so this looks OK. |
|
Thanks for the reviews ! /integrate |
|
Going to push as commit 34cddfb.
Your commit was automatically rebased without conflicts. |
openjdk
bot
removed
ready
|
@MBaesken Is this issue going to be backported to jdk17 (and jdk8) as well? |
Thanks for the reminder, I just started a backport to jdk17u-dev. Regarding jdk8 I don't know, no backport from me but maybe some jdk8 maintainers will do it. |
| @@ -1947,7 +1947,10 @@ void os::win32::print_windows_version(outputStream* st) { | |||
| // - 2016 GA 10/2016 build: 14393 | |||
| // - 2019 GA 11/2018 build: 17763 | |||
| // - 2022 GA 08/2021 build: 20348 | |||
| if (build_number > 20347) { | |||
| // - 2025 Preview build : 26040 | |||
There was a problem hiding this comment.
Just for the record, Microsoft released Windows Server 2025 on Nov 1st, 2025 and the official build number is 26100.
// - 2025 GA 11/2024 build: 26100
if (build_number > 26099) {
st->print("Server 2025");
Reference: https://learn.microsoft.com/en-us/windows-server/get-started/windows-server-release-info
There was a problem hiding this comment.
Thanks this is what I got this week too from our Microsoft experts.
I added the info to this JBS bug 8340387.
With the the check present, we detect also some previews which is not bad imho.
Thank you for responding and resolving this quickly. And as noted above, Windows Server 2025 (build 26100) was released last week. |
Windows Server 2025 will be releases in a few months.
The OS detection code of the JVM/JDK should recognize the new Windows server 2025 version.
(currently Windows server 2022 is printed , that is wrong)
The build numbers of some recent previews documented here
https://learn.microsoft.com/en-us/windows-server/get-started/whats-new-windows-server-2025
are 26080 and 26085 (final release version will most likely be a bit higher).
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/21082/head:pull/21082$ git checkout pull/21082Update a local copy of the PR:
$ git checkout pull/21082$ git pull https://git.openjdk.org/jdk.git pull/21082/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 21082View PR using the GUI difftool:
$ git pr show -t 21082Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/21082.diff
Webrev
Link to Webrev Comment