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

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

Closed
wants to merge 1 commit into from

Conversation

@MBaesken
Copy link
Member

@MBaesken MBaesken commented Oct 7, 2021

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

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

@bridgekeeper bridgekeeper bot commented Oct 7, 2021

👋 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 openjdk bot added the rfr label Oct 7, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 7, 2021

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

@mlbridge mlbridge bot commented Oct 7, 2021

Webrevs

Copy link
Contributor

@RealCLanger RealCLanger left a comment

Looks good to me.

@openjdk
Copy link

@openjdk openjdk bot commented Oct 7, 2021

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

@openjdk openjdk bot added the ready label Oct 7, 2021
@MBaesken
Copy link
Member Author

@MBaesken MBaesken commented Oct 7, 2021

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

@openjdk
Copy link

@openjdk openjdk bot commented Oct 7, 2021

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

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Functionally seems fine. One nit about comments.

Thanks,
David

@@ -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 */
Copy link
Member

@dholmes-ora dholmes-ora Oct 7, 2021

Choose a reason for hiding this comment

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

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

@MBaesken MBaesken commented Oct 8, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Oct 8, 2021

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 openjdk bot closed this Oct 8, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 8, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 8, 2021

@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
Copy link
Member Author

@MBaesken MBaesken commented Oct 8, 2021

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

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