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

8286122: [macos]: App bundle cannot upload to Mac App Store due to info.plist embedded in java exe #565

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jul 20, 2022

I backport this for parity with 17.0.5-oracle.

The localization file "de" patched by the original change is not in 17.
It was added in "8283805: [REDO] JDK 19 L10n resource files update - msgdrop 10"
I had a look at backporting that change, too. I think the localization updates are
a nice to have for the LTS. But it is a big change and does not apply well. Each new/removed entry would
have to be checked. So I decided not to do it.
Instead, I inlcude the de file for jpackage in this change, along with the two
new Strings. This file matches the jpackage in 17 as there were no other addions to
the ja and zh files between 17 and 8283805.

I had to adapt the copyright in the ja and zh files.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8286122: [macos]: App bundle cannot upload to Mac App Store due to info.plist embedded in java exe

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev pull/565/head:pull/565
$ git checkout pull/565

Update a local copy of the PR:
$ git checkout pull/565
$ git pull https://git.openjdk.org/jdk17u-dev pull/565/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 565

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/565.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 20, 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 b523c88480ba5c8f9d78537c9de0abcbf1f867c0 8286122: [macos]: App bundle cannot upload to Mac App Store due to info.plist embedded in java exe Jul 20, 2022
@openjdk
Copy link

openjdk bot commented Jul 20, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jul 20, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 20, 2022

Webrevs

@openjdk-notifier
Copy link

@GoeLin Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

Copy link
Member

@MBaesken MBaesken left a comment

Choose a reason for hiding this comment

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

Looks okay to me thanks for backporting.
Just wondering why the german (_de) properties files contains english texts for the new entries like ERR_MacAppStoreRuntimeBinExists.
Shouldn't this be adjusted most (all?) of the other texts is in german so it looks a little strange to me and for the new properties we get the same like we would get with the english main properties file?

@openjdk
Copy link

openjdk bot commented Jul 20, 2022

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

8286122: [macos]: App bundle cannot upload to Mac App Store due to info.plist embedded in java exe

Reviewed-by: mbaesken

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:

  • 31853fe: Merge
  • c53d022: 8284370: Improve zlib usage
  • 567bc2e: 8272243: Improve DER parsing
  • 860464e: 8281866: Enhance MethodHandle invocations
  • 9dcec4d: 8285407: Improve Xalan supports
  • d95c921: 8283190: Improve MIDI processing
  • 8be0fc0: 8281859: Improve class compilation
  • a19a716: 8272249: Better properties of loaded Properties
  • b0059e1: 8277608: Address IP Addressing
  • bd77663: 8280233: Temporarily disable Unix domain sockets in Windows PipeImpl

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 Jul 20, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Jul 20, 2022

You are right. It seems the developer adds them in english to all the files, and then eventually they are translated by an expert.
Should I just translate the german one? I'll fail for ja and zh, though :)

@GoeLin
Copy link
Member Author

GoeLin commented Jul 21, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jul 21, 2022

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 21, 2022

@GoeLin Pushed as commit 6a4b622.

💡 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_8286122 branch July 21, 2022 10:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants