JDK-8274840: Update OS detection code to recognize Windows 11 #5846

MBaesken · 2021-10-07T11:20:57Z

The OS detection code of the JDK/JVM should recognize the new Windows 11. For details see :

https://docs.microsoft.com/en-us/windows/release-health/windows11-release-information
OS build number is : 22000.194 for 21H2 (original release)

Please review the following small patch !
(patch comes originally from azeller (Arno Zeller) , I just added a comment and did some testing)

Thanks, Matthias

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8274840: Update OS detection code to recognize Windows 11

Reviewers

Christoph Langer (@RealCLanger - Reviewer)
David Holmes (@dholmes-ora - Reviewer)

Contributors

Arno Zeller <arno.zeller@sap.com>

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5846/head:pull/5846
$ git checkout pull/5846

Update a local copy of the PR:
$ git checkout pull/5846
$ git pull https://git.openjdk.java.net/jdk pull/5846/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5846

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5846.diff

bridgekeeper · 2021-10-07T11:21:11Z

👋 Welcome back mbaesken! 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 · 2021-10-07T11:24:05Z

@MBaesken The following labels will be automatically applied to this pull request:

core-libs
hotspot-runtime

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

mlbridge · 2021-10-07T11:27:21Z

Webrevs

00: Full (5daefe71)

RealCLanger

Looks good to me.

openjdk · 2021-10-07T11:43:13Z

@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:

8274840: Update OS detection code to recognize Windows 11

Co-authored-by: Arno Zeller <arno.zeller@sap.com>
Reviewed-by: clanger, dholmes

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

722d639: 8274838: runtime/cds/appcds/TestSerialGCWithCDS.java fails on Windows
340c715: 8273929: Remove GzipRandomAccess in heap dump test
8319836: 8274546: Shenandoah: Remove unused ShenandoahUpdateRootsTask copy
d5ccfa2: 8274755: Replace 'while' cycles with iterator with enhanced-for in jdk.jdi
29dcbb7: 8274716: JDWP Spec: the description for the Dispose command confuses suspend with resume.
5762ec2: 8274780: ChannelInputStream.readNBytes(int) incorrectly calls readAllBytes()
4e960fe: 8274497: Unnecessary Vector usage in AquaFileSystemModel
c833b4d: 8274329: Fix non-portable HotSpot code in MethodMatcher::parse_method_pattern
d57fb6f: 8274456: Remove jtreg tag manual=yesno java/awt/print/PrinterJob/PageDialogTest.java
734d1fb: 8274211: Test man page that options are documented
... and 6 more: https://git.openjdk.java.net/jdk/compare/b8af6a9bfb28aaf0fea0cfdaba13236dc8cbaa3a...master

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.

MBaesken · 2021-10-07T11:58:03Z

/contributor add Arno Zeller arno.zeller@sap.com

openjdk · 2021-10-07T11:59:42Z

@MBaesken
Contributor Arno Zeller <arno.zeller@sap.com> successfully added.

dholmes-ora

Functionally seems fine. One nit about comments.

Thanks,
David

dholmes-ora · 2021-10-07T13:23:48Z

src/java.base/windows/native/libjava/java_props_md.c

@@ -544,7 +546,14 @@ GetJavaProperties(JNIEnv* env)
            } else if (majorVersion == 10) {
                if (is_workstation) {
                    switch (minorVersion) {
-                    case  0: sprops.os_name = "Windows 10";           break;
+                    case  0:
+                        /* Windows 11 21H2 (original release) build number is 22000 */


Given the big comment block before the switch I don't see the need to repeat the information here. Same goes for the existing comments below for the server versions.

MBaesken · 2021-10-08T06:39:23Z

/integrate

openjdk · 2021-10-08T06:40:24Z

Going to push as commit 97ea9dd.
Since your change was applied there have been 22 commits pushed to the master branch:

8de7763: 8273152: Refactor CDS FileMapHeader loading code
920e707: 8274920: ProblemList 2 VectorAPI tests failing due to "assert(!vbox->is_Phi()) failed"
7de2cf8: 8273910: Redundant condition and assignment in java.net.URI
8ca0846: 8274407: (tz) Update Timezone Data to 2021c
4ab274a: 8274858: Remove unused dictionary_classes_do functions
03a8d34: 8273826: Correct Manifest file name and NPE checks
722d639: 8274838: runtime/cds/appcds/TestSerialGCWithCDS.java fails on Windows
340c715: 8273929: Remove GzipRandomAccess in heap dump test
8319836: 8274546: Shenandoah: Remove unused ShenandoahUpdateRootsTask copy
d5ccfa2: 8274755: Replace 'while' cycles with iterator with enhanced-for in jdk.jdi
... and 12 more: https://git.openjdk.java.net/jdk/compare/b8af6a9bfb28aaf0fea0cfdaba13236dc8cbaa3a...master

Your commit was automatically rebased without conflicts.

openjdk · 2021-10-08T06:40:39Z

@MBaesken Pushed as commit 97ea9dd.

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

MBaesken · 2021-10-08T06:43:33Z

Hi Christoph and David, thanks for the reviews !
Best regards, Matthias

JDK-8274840

5daefe7

openjdk bot added the rfr Pull request is ready for review label Oct 7, 2021

openjdk bot added hotspot-runtime hotspot-runtime-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Oct 7, 2021

RealCLanger approved these changes Oct 7, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Oct 7, 2021

dholmes-ora approved these changes Oct 7, 2021

View reviewed changes

openjdk bot closed this Oct 8, 2021

openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 8, 2021

JDK-8274840: Update OS detection code to recognize Windows 11 #5846

JDK-8274840: Update OS detection code to recognize Windows 11 #5846

MBaesken commented Oct 7, 2021 •

edited by openjdk bot

bridgekeeper bot commented Oct 7, 2021

openjdk bot commented Oct 7, 2021

mlbridge bot commented Oct 7, 2021

RealCLanger left a comment

openjdk bot commented Oct 7, 2021 •

edited

MBaesken commented Oct 7, 2021

openjdk bot commented Oct 7, 2021

dholmes-ora left a comment

dholmes-ora Oct 7, 2021

MBaesken commented Oct 8, 2021

openjdk bot commented Oct 8, 2021

openjdk bot commented Oct 8, 2021

MBaesken commented Oct 8, 2021

JDK-8274840: Update OS detection code to recognize Windows 11 #5846

JDK-8274840: Update OS detection code to recognize Windows 11 #5846

Conversation

MBaesken commented Oct 7, 2021 • edited by openjdk bot

Progress

Issue

Reviewers

Contributors

Reviewing

bridgekeeper bot commented Oct 7, 2021

openjdk bot commented Oct 7, 2021

mlbridge bot commented Oct 7, 2021

Webrevs

RealCLanger left a comment

Choose a reason for hiding this comment

openjdk bot commented Oct 7, 2021 • edited

MBaesken commented Oct 7, 2021

openjdk bot commented Oct 7, 2021

dholmes-ora left a comment

Choose a reason for hiding this comment

dholmes-ora Oct 7, 2021

Choose a reason for hiding this comment

MBaesken commented Oct 8, 2021

openjdk bot commented Oct 8, 2021

openjdk bot commented Oct 8, 2021

MBaesken commented Oct 8, 2021

MBaesken commented Oct 7, 2021 •

edited by openjdk bot

openjdk bot commented Oct 7, 2021 •

edited