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

8269850: Most JDK releases report macOS version 12 as 10.16 instead of 12.0 #5633

Closed

Conversation

RogerRiggs
Copy link
Contributor

@RogerRiggs RogerRiggs commented Sep 22, 2021

The Mac OS specific code to determine the os.version property in java_props_macosx.c is updated
to replace the code extracting the version from the SystemVersion.plist by reading the version using t
he hidden link:
/System/Library/CoreServices/.SystemVersionPlatform.plist

Its contents are not dependent on the SYSTEM_VERSION_COMPAT environment variable.
With this change, 11.5 reports the 11.5.1 minor version and os.version 11.6 is correctly reported.
The change can be backported to other versions as needed.

(Opening a new PR, the PR branch #5619 was deleted by unintentionally).


Progress

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

Issue

  • JDK-8269850: Most JDK releases report macOS version 12 as 10.16 instead of 12.0

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5633

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

Using diff file

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

…f 12.0

Replaced the code extracting the version from the SystemVersion.plist
to extract the read version using the hidden link:
   /System/Library/CoreServices/.SystemVersionPlatform.plist
Its contents are not dependent on the SYSTEM_VERSION_COMPAT environment variable.
With this change, 11.5 reports the 11.5.1 minor version and
os.version 11.6 is correctly reported.
The change can be backported as needed.
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 22, 2021

👋 Welcome back rriggs! 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 Sep 22, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 22, 2021

@RogerRiggs The following label will be automatically applied to this pull request:

  • core-libs

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

@openjdk openjdk bot added the core-libs label Sep 22, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 22, 2021

Webrevs

Refactor avoid repetition of conversion of NSString to char *.
naotoj
naotoj approved these changes Sep 22, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 22, 2021

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

8269850: Most JDK releases report macOS version 12 as 10.16 instead of 12.0

Reviewed-by: naoto, clanger

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

  • 653a612: 8270156: Add "randomness" and "stress" keys to JTreg tests which use StressGCM, StressLCM and/or StressIGVN
  • 66ce09f: 8272703: StressSeed should be set via FLAG_SET_ERGO
  • c434528: 8273546: DecimalFormat documentation contains literal HTML character references
  • d098751: 8273916: Remove 'special' ranking
  • 4f3b626: 8271567: AArch64: AES Galois CounterMode (GCM) interleaved implementation using vector instructions
  • 8799856: 8274075: Fix miscellaneous typos in java.base
  • 8b833bb: 8274048: IGV: Replace usages of Collections.sort with List.sort call
  • a74c099: 8252842: Extend jmap to support parallel heap dump
  • 2166ed1: 8273894: ConcurrentModificationException raised every time ReferralsCache drops referral
  • 1c6fa11: 8273979: move some os time related functions to os_posix for POSIX platforms
  • ... and 50 more: https://git.openjdk.java.net/jdk/compare/b3b4b1cc218d4c02809eb7fd4d83d541acfbd9bd...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 Sep 22, 2021
Copy link
Contributor

@RealCLanger RealCLanger left a comment

Looks good to me. I tested with an Xcode 11.7 build on a MacOS 11.6 and there OsVersionTest fails without the fix and passes with it.

@RogerRiggs
Copy link
Contributor Author

@RogerRiggs RogerRiggs commented Sep 23, 2021

Thanks for testing with Xcode 11.7. and MacOS 11.6.

@RogerRiggs
Copy link
Contributor Author

@RogerRiggs RogerRiggs commented Sep 23, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Sep 23, 2021

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

  • 1b7f4b7: 8274169: HotSpot Style Guide has stale link to chromium style guide
  • 653a612: 8270156: Add "randomness" and "stress" keys to JTreg tests which use StressGCM, StressLCM and/or StressIGVN
  • 66ce09f: 8272703: StressSeed should be set via FLAG_SET_ERGO
  • c434528: 8273546: DecimalFormat documentation contains literal HTML character references
  • d098751: 8273916: Remove 'special' ranking
  • 4f3b626: 8271567: AArch64: AES Galois CounterMode (GCM) interleaved implementation using vector instructions
  • 8799856: 8274075: Fix miscellaneous typos in java.base
  • 8b833bb: 8274048: IGV: Replace usages of Collections.sort with List.sort call
  • a74c099: 8252842: Extend jmap to support parallel heap dump
  • 2166ed1: 8273894: ConcurrentModificationException raised every time ReferralsCache drops referral
  • ... and 51 more: https://git.openjdk.java.net/jdk/compare/b3b4b1cc218d4c02809eb7fd4d83d541acfbd9bd...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 23, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 23, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 23, 2021

@RogerRiggs Pushed as commit 3b1b8fc.

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

@RogerRiggs RogerRiggs deleted the 8269850-macos-version-property branch Nov 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs integrated
3 participants