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

Closed

Conversation

RogerRiggs
Copy link
Contributor

@RogerRiggs RogerRiggs commented Sep 21, 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 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 to other versions as needed.


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/5619/head:pull/5619
$ git checkout pull/5619

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5619

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5619.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 21, 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 21, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 21, 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 21, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 21, 2021

Webrevs

bplb
bplb approved these changes Sep 21, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 21, 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: bpb

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

  • 161fdb4: 8273935: (zipfs) Files.getFileAttributeView() throws UOE instead of returning null when view not supported
  • 0fc47e9: 8266666: Implementation for snippets
  • 6d91a3e: 8269039: Disable SHA-1 Signed JARs
  • 42d5d2a: 8274056: JavaAccessibilityUtilities leaks JNI objects
  • 57df0db: 8270873: JFR: Catch DirectoryIteratorException when scanning for .jfr files
  • 111d5e1: 8273915: Create 'nosafepoint' rank
  • 7acec3f: 8236505: Mark jdk/editpad/EditPadTest.java as @headful
  • afd218d: 8274053: [BACKOUT] JDK-8270842: G1: Only young regions need to redirty outside references in remset.
  • a5108a6: 8273646: Add openssl from path variable also in to Default System Openssl Path in OpensslArtifactFetcher
  • 65ed0a7: 8273655: content-types.properties files are missing some common types
  • ... and 12 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 21, 2021
@RogerRiggs RogerRiggs closed this Sep 22, 2021
@RogerRiggs RogerRiggs deleted the 8269850-macos-version-property branch Sep 22, 2021
@RogerRiggs RogerRiggs restored the 8269850-macos-version-property branch Sep 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs ready rfr
2 participants