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

8253702: BigSur version number reported as 10.16, should be 11.nn #118

Closed
wants to merge 1 commit into from

Conversation

omikhaltsova
Copy link

@omikhaltsova omikhaltsova commented Oct 20, 2021

I'd like to backport JDK-8253702 to jdk15u for parity with jdk11u.
The original patch applied cleanly.
Tested with a simple test printing OS version on macOS Big Sur:

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

Progress

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

Issue

  • JDK-8253702: BigSur version number reported as 10.16, should be 11.nn

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 118

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 20, 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 66757750a2adf0739d0f5bf98a3f50a123b7adcf 8253702: BigSur version number reported as 10.16, should be 11.nn Oct 20, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 20, 2021

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

@openjdk
Copy link

@openjdk openjdk bot commented Oct 20, 2021

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

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

8253702: BigSur version number reported as 10.16, should be 11.nn

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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).

@openjdk openjdk bot added ready rfr labels Oct 20, 2021
@omikhaltsova
Copy link
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 fff94f8) is now ready to be sponsored by a Committer.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 20, 2021

Webrevs

@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 827da5a.
Since your change was applied there have been 3 commits pushed to the master branch:

  • 28c13cf: 8225083: Remove Google certificate that is expiring in December 2021
  • ad7bcf6: 8225082: Remove IdenTrust certificate that is expiring in September 2021
  • 5075dec: 8274840: Update OS detection code to recognize Windows 11

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 21, 2021
@openjdk openjdk bot added integrated and removed ready rfr sponsor labels Oct 21, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 21, 2021

@yan-too @omikhaltsova Pushed as commit 827da5a.

💡 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 clean integrated
2 participants