Skip to content

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 29, 2022

I backport this for parity with 11.0.16-oracle.

platform.m4: Resolved copyright.
jib-proviles.js: macos-aarch64 not listed. Skipped.


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/jdk11u-dev pull/958/head:pull/958
$ git checkout pull/958

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 958

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 29, 2022

👋 Welcome back goetz! 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 096e9e5d13183f947089b5c7923890591490a2ce 8266318: Switch to macos prefix for macOS bundles Mar 29, 2022
@openjdk
Copy link

openjdk bot commented Mar 29, 2022

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Mar 29, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 29, 2022

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix typo.

@GoeLin
Copy link
Member Author

GoeLin commented Mar 29, 2022

Thanks for spotting this! Fixed.

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@openjdk
Copy link

openjdk bot commented Mar 29, 2022

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

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

8266318: Switch to macos prefix for macOS bundles

Reviewed-by: mdoerr, vkempik

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

  • 7b84611: 8282231: x86-32: runtime call to SharedRuntime::ldiv corrupts registers
  • e6ec27e: 8227171: provide function names in native stack trace on aix with xlc16
  • 8de4b89: 8253797: [cgroups v2] Account for the fact that swap accounting is disabled on some systems
  • 8482b37: 8284756: [11u] Remove unused isUseContainerSupport in CgroupV1Subsystem
  • 1f20c8d: 8281274: deal with ActiveProcessorCount in os::Linux::print_container_info
  • bc28d8f: 8217233: Update build settings for AIX/xlc
  • 24fec25: 8203238: [TESTBUG] rewrite MemOptions shell test in Java
  • f5586d9: 8203239: [TESTBUG] remove vmTestbase/vm/gc/kind/parOld test
  • 3a6dbb4: 8208207: Test nsk/stress/jni/gclocker/gcl001 fails after co-location
  • 684fe80: 8220658: Improve the readability of container information in the error log
  • ... and 81 more: https://git.openjdk.java.net/jdk11u-dev/compare/588bdfa8cfd495ca21a1926f825d4e827bf9b5a7...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 Pull request is ready to be integrated label Mar 29, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Apr 29, 2022

Pre-submit failures
gc/TestNumWorkerOutput.java#id1 known CMS issue on x86_32, unrelated.
Linux x64: build dependencies, unrelated

@GoeLin
Copy link
Member Author

GoeLin commented Apr 29, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Apr 29, 2022

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

  • 50e83c5: 8242538: java/security/SecureRandom/ThreadSafe.java failed on windows
  • e11476c: 8233551: [TESTBUG] SelectEditTableCell.java fails on MacOS
  • d14462f: 8234382: Test tools/javac/processing/model/testgetallmembers/Main.java using too small heap
  • 43655b7: 8279520: SPNEGO has not passed channel binding info into the underlying mechanism
  • 580a991: 8213440: Lingering INCLUDE_ALL_GCS in test_oopStorage_parperf.cpp
  • 29509b8: 8211795: ArrayIndexOutOfBoundsException in PNGImageReader after JDK-6788458
  • b2ff90d: 8169004: Fix redundant @requires tags in tests
  • d896abb: 8281811: assert(_base == Tuple) failed: Not a Tuple after JDK-8280799
  • 665f856: 8283834: Unmappable character for US-ASCII encoding in TestPredicateInputBelowLoopPredicate
  • 22f8e21: 8280799: С2: assert(false) failed: cyclic dependency prevents range check elimination
  • ... and 118 more: https://git.openjdk.java.net/jdk11u-dev/compare/588bdfa8cfd495ca21a1926f825d4e827bf9b5a7...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 29, 2022
@openjdk openjdk bot closed this Apr 29, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 29, 2022
@openjdk
Copy link

openjdk bot commented Apr 29, 2022

@GoeLin Pushed as commit d279487.

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

@GoeLin GoeLin deleted the goetz_backport_8266318 branch April 29, 2022 10:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants