Skip to content

Conversation

@vidmik
Copy link
Member

@vidmik vidmik commented Apr 29, 2021

Apple rebranded the operating system as "macOS" back in 2016. The JDK bundles files are still use the legacy "osx" string. They should be modernized to use "macos" instead.


Progress

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

Issue

  • JDK-8266318: Switch to macos prefix for macOS bundles

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3801

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 29, 2021

👋 Welcome back mikael! 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 Pull request is ready for review label Apr 29, 2021
@openjdk
Copy link

openjdk bot commented Apr 29, 2021

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

  • build

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 build build-dev@openjdk.org label Apr 29, 2021
@mlbridge
Copy link

mlbridge bot commented Apr 29, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Apr 29, 2021

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

8266318: Switch to macos prefix for macOS bundles

Reviewed-by: prr, erikj, iris

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

  • 51b2188: 8266267: Remove unnecessary jumps in Intel Math Library StubRoutines
  • 2c381e0: 8262376: ReplaceCriticalClassesForSubgraphs.java fails if --with-build-jdk is used
  • 5ecef01: 8266217: ZGC: Improve the -Xlog:gc+init output for NUMA
  • 5d8c1cc: 8255410: Add ChaCha20 and Poly1305 support to SunPKCS11 provider
  • 46b4a14: 8266315: Problem list failing test java/awt/font/TextLayout/LigatureCaretTest.java

Please see this link for an up-to-date comparison between the source branch of this pull request and 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.

➡️ 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 Pull request is ready to be integrated label Apr 29, 2021
@vidmik
Copy link
Member Author

vidmik commented Apr 30, 2021

Phil, Iris, Erik - thank you for the reviews!

/integrate

@openjdk openjdk bot closed this Apr 30, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 30, 2021
@openjdk
Copy link

openjdk bot commented Apr 30, 2021

@vidmik Since your change was applied there have been 14 commits pushed to the master branch:

  • 0544a73: 8255227: java/net/httpclient/FlowAdapterPublisherTest.java intermittently failing with TestServer: start exception: java.io.IOException: Invalid preface
  • 48bb996: 8266220: keytool still prompt for store password on a password-less pkcs12 file if -storetype pkcs12 is specified
  • 87de5b7: 8266040: Lanai: Incorrect calculations of clipping boundaries
  • eb8db12: 8263396: Atomic::CmpxchgByteUsingInt::set_byte_in_int needs an explicit cast
  • 07ecd42: 8258602: JavaDoc field summary does not indicate final modifier
  • 276a1bf: 8236671: NullPointerException in JKS keystore
  • e9370a1: 8265761: Font with missed font family name is not properly printed on Windows
  • 3554dc2: 8264395: WB_EnqueueInitializerForCompilation fails with "method holder must be initialized" when called for uninitialized class
  • 4d77171: 8249903: jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java needs to be updated after 8146022 got closed
  • 51b2188: 8266267: Remove unnecessary jumps in Intel Math Library StubRoutines
  • ... and 4 more: https://git.openjdk.java.net/jdk/compare/42af7da94d9ed588a1c526202f6b77773e4e3f95...master

Your commit was automatically rebased without conflicts.

Pushed as commit 096e9e5.

💡 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

build build-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

4 participants