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 #274

Closed
wants to merge 1 commit into from

Conversation

@omikhaltsova
Copy link
Contributor

@omikhaltsova omikhaltsova commented Oct 19, 2021

I'd like to backport JDK-8274840 to jdk13u for parity with jdk11u.
The original patch applied cleanly.
Tested with a simple test printing OS version on Windows 11 and 10:

public class Main {
    public static void main(String[] args) {
        System.out.println(System.getProperty("os.name"));
    }
}

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

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

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk13u-dev pull/274/head:pull/274
$ git checkout pull/274

Update a local copy of the PR:
$ git checkout pull/274
$ git pull https://git.openjdk.java.net/jdk13u-dev pull/274/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 274

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk13u-dev/pull/274.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 19, 2021

👋 Welcome back omikhaltcova! 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 changed the title Backport 97ea9dd2f24f9f1fb9b9345a4202a825ee28e014 8274840: Update OS detection code to recognize Windows 11 Oct 19, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 19, 2021

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

@openjdk
Copy link

@openjdk openjdk bot commented Oct 19, 2021

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

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:

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.

➡️ 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).

@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 19, 2021

Webrevs

@omikhaltsova
Copy link
Contributor Author

@omikhaltsova omikhaltsova commented Oct 20, 2021

/integrate

@openjdk openjdk bot added the sponsor label Oct 20, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 20, 2021

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

@yan-too
Copy link
Collaborator

@yan-too yan-too commented Oct 21, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Oct 21, 2021

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

Your commit was automatically rebased without conflicts.

@openjdk
Copy link

@openjdk openjdk bot commented Oct 21, 2021

@yan-too @omikhaltsova Pushed as commit 479e5e0.

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

@omikhaltsova omikhaltsova deleted the backport-97ea9dd2 branch Dec 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants