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

JDK-8264055: backout JDK-8248904 in order to resubmit with additional attribution. #3159

Closed
wants to merge 1 commit into from

Conversation

@andyherrick
Copy link

@andyherrick andyherrick commented Mar 23, 2021

We are backing out the fix to "JDK-8248904 Add support to jpackage for the Mac App Store " in order to resubmit with added contributor attribution for Erwin Morrhey
This is the backout.


Progress

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

Issue

  • JDK-8264055: backout JDK-8248904 in order to resubmit with additional attribution.

Reviewers

Download

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

To update a local copy of the PR:
$ git checkout pull/3159
$ git pull https://git.openjdk.java.net/jdk pull/3159/head

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 23, 2021

👋 Welcome back herrick! 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 Mar 23, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 23, 2021

@andyherrick 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 Mar 23, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 23, 2021

Webrevs

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Looks good, although i see the following wasn't backed out:

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/JavaApp.icns

If this is intentional, then no need to worry about it.

@andyherrick
Copy link
Author

@andyherrick andyherrick commented Mar 23, 2021

Looks good, although i see the following wasn't backed out:

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/JavaApp.icns

yes - look again - it was renamed back to java.icns (the 12'th or 22 files changed above)

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Mar 23, 2021

As long as there are no transient build/test failures, it will be fine. I was just comparing the results with what git revert 11c8c78c47f21fcd87a5969a859b5c4fced5e47d generated and noticed this difference.

@victordyakov
Copy link

@victordyakov victordyakov commented Mar 23, 2021

@sashamatveev please review

@victordyakov
Copy link

@victordyakov victordyakov commented Mar 23, 2021

@alexeysemenyukoracle please review

@openjdk
Copy link

@openjdk openjdk bot commented Mar 23, 2021

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

8264055: backout JDK-8248904 in order to resubmit with additional attribution.

Reviewed-by: kcr, asemenyuk

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

  • 2425462: 8263903: Use Cleaner instead of finalize to auto stop Timer thread
  • 35102cb: 8263992: Remove dead code NativeLookup::base_library_lookup
  • 91d86e6: 8263572: Output from jstack mixed mode is misaligned
  • 47ef038: 8263905: Remove finalize methods for SocketInput/OutputStream
  • 1c9817b: 8261479: CDS runtime code should check exceptions
  • 087c8bf: 8264041: Incorrect comments for ParallelCompactData::summarize_dense_prefix
  • c087f3e: 8263995: Incorrect double-checked locking in Types.arraySuperType()
  • d7268fa: 8251942: PrintStream specification is not clear which flush method is automatically invoked
  • 8fa34e4: 8241619: (fs) Files.newByteChannel(path, Set.of(CREATE_NEW, READ)) does not throw a FileAlreadyExistsException when the file exists
  • e9321cd: 8263964: Redundant check in ObjectStartArray::object_starts_in_range

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 label Mar 23, 2021
@andyherrick
Copy link
Author

@andyherrick andyherrick commented Mar 23, 2021

/integrate

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

@openjdk openjdk bot commented Mar 23, 2021

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

  • 2425462: 8263903: Use Cleaner instead of finalize to auto stop Timer thread
  • 35102cb: 8263992: Remove dead code NativeLookup::base_library_lookup
  • 91d86e6: 8263572: Output from jstack mixed mode is misaligned
  • 47ef038: 8263905: Remove finalize methods for SocketInput/OutputStream
  • 1c9817b: 8261479: CDS runtime code should check exceptions
  • 087c8bf: 8264041: Incorrect comments for ParallelCompactData::summarize_dense_prefix
  • c087f3e: 8263995: Incorrect double-checked locking in Types.arraySuperType()
  • d7268fa: 8251942: PrintStream specification is not clear which flush method is automatically invoked
  • 8fa34e4: 8241619: (fs) Files.newByteChannel(path, Set.of(CREATE_NEW, READ)) does not throw a FileAlreadyExistsException when the file exists
  • e9321cd: 8263964: Redundant check in ObjectStartArray::object_starts_in_range

Your commit was automatically rebased without conflicts.

Pushed as commit 15bcf6d.

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

@andyherrick andyherrick deleted the JDK-8264055 branch Mar 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants