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

8274840: Update OS detection code to recognize Windows 11 #93

Closed
wants to merge 2 commits into from

Conversation

rgithubli
Copy link
Contributor

@rgithubli rgithubli commented Jul 29, 2022

This pull request contains a backport of commit openjdk/jdk@97ea9dd

The original author is Matthias Baesken and co-authored by Arno Zeller. It was reviewed by clanger, dholmes.

The backport was clean after updating filepath.

Verified on win11: when doing java -XshowSettings:properties -version, can see os.name = Windows 11


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

Issue

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 93

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 29, 2022

👋 Welcome back rgithubli! A progress list of the required criteria for merging this PR into pr/91 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 97ea9dd2f24f9f1fb9b9345a4202a825ee28e014 8274840: Update OS detection code to recognize Windows 11 Jul 29, 2022
@openjdk
Copy link

openjdk bot commented Jul 29, 2022

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

@openjdk openjdk bot added the backport label Jul 29, 2022
@rgithubli rgithubli marked this pull request as ready for review July 29, 2022 23:28
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 29, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 29, 2022

Webrevs

Copy link
Member

@eastig eastig left a comment

Choose a reason for hiding this comment

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

Confirm it is clean.

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.

/clean

Lgtm.

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 30, 2022

@rgithubli 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 Aug 30, 2022

Don't close this yet, bot.

@rgithubli
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 30, 2022

@rgithubli This pull request has not yet been marked as ready for integration.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/91 to master August 30, 2022 09:13
@openjdk-notifier
Copy link

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout win-bp-8274840
git fetch https://git.openjdk.org/jdk8u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Aug 30, 2022

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

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

8274840: Update OS detection code to recognize Windows 11

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

  • 266918d: 8071530: Update OS detection code to reflect Windows 10 version change
  • 0d5ea9d: 8292688: Support Security properties in security.testlibrary.Proc
  • 026a6c5: 7131823: bug in GIFImageReader
  • d102764: 8139668: Generate README-build.html from markdown
  • de32daa: 8173339: AArch64: Fix minimum stack size computations
  • 2223058: 8049228: Improve multithreaded scalability of InetAddress cache
  • d0ad242: 8285497: Add system property for Java SE specification maintenance version
  • e3251a2: 8232950: SUNPKCS11 Provider incorrectly check key length for PSS Signatures.
  • 41c7d2d: 8039955: [TESTBUG] jdk/lambda/LambdaTranslationTest1 - java.lang.AssertionError: expected [d:1234.000000] but found [d:1234,000000]
  • a4d4973: 8254318: Remove .hgtags
  • ... and 15 more: https://git.openjdk.org/jdk8u-dev/compare/f7f6d9d07fa3f166fe0155f80c61730c1c788ac5...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.

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 the ready Pull request is ready to be integrated label Aug 30, 2022
@jerboaa
Copy link
Contributor

jerboaa commented Aug 30, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 30, 2022

@jerboaa The change author (@rgithubli) must issue an integrate command before the integration can be sponsored.

@jerboaa
Copy link
Contributor

jerboaa commented Aug 30, 2022

@rgithubli I think we need to do the /integrate and /sponsor handshake again. It wasn't labelled ready when you initially issued /integrate...

@rgithubli
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 30, 2022
@openjdk
Copy link

openjdk bot commented Aug 30, 2022

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

@jerboaa
Copy link
Contributor

jerboaa commented Aug 30, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 30, 2022

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

  • 266918d: 8071530: Update OS detection code to reflect Windows 10 version change
  • 0d5ea9d: 8292688: Support Security properties in security.testlibrary.Proc
  • 026a6c5: 7131823: bug in GIFImageReader
  • d102764: 8139668: Generate README-build.html from markdown
  • de32daa: 8173339: AArch64: Fix minimum stack size computations
  • 2223058: 8049228: Improve multithreaded scalability of InetAddress cache
  • d0ad242: 8285497: Add system property for Java SE specification maintenance version
  • e3251a2: 8232950: SUNPKCS11 Provider incorrectly check key length for PSS Signatures.
  • 41c7d2d: 8039955: [TESTBUG] jdk/lambda/LambdaTranslationTest1 - java.lang.AssertionError: expected [d:1234.000000] but found [d:1234,000000]
  • a4d4973: 8254318: Remove .hgtags
  • ... and 15 more: https://git.openjdk.org/jdk8u-dev/compare/f7f6d9d07fa3f166fe0155f80c61730c1c788ac5...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 30, 2022
@openjdk openjdk bot closed this Aug 30, 2022
@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 Aug 30, 2022
@openjdk
Copy link

openjdk bot commented Aug 30, 2022

@jerboaa @rgithubli Pushed as commit bd946fa.

💡 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 integrated Pull request has been integrated
4 participants