Skip to content

8371924: --mac-app-store should be accepted option for app image signing#30346

Closed
alexeysemenyukoracle wants to merge 7 commits intoopenjdk:masterfrom
alexeysemenyukoracle:JDK-8371924
Closed

8371924: --mac-app-store should be accepted option for app image signing#30346
alexeysemenyukoracle wants to merge 7 commits intoopenjdk:masterfrom
alexeysemenyukoracle:JDK-8371924

Conversation

@alexeysemenyukoracle
Copy link
Copy Markdown
Member

@alexeysemenyukoracle alexeysemenyukoracle commented Mar 20, 2026

Support the use of "--mac-app-store" option when signing predefined app image.


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-8371924: --mac-app-store should be accepted option for app image signing (Enhancement - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/30346/head:pull/30346
$ git checkout pull/30346

Update a local copy of the PR:
$ git checkout pull/30346
$ git pull https://git.openjdk.org/jdk.git pull/30346/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 30346

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/30346.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link
Copy Markdown

bridgekeeper bot commented Mar 20, 2026

👋 Welcome back asemenyuk! 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
Copy link
Copy Markdown

openjdk bot commented Mar 20, 2026

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

8371924: --mac-app-store should be accepted option for app image signing

Reviewed-by: almatvee

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 42 new commits pushed to 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 core-libs core-libs-dev@openjdk.org label Mar 20, 2026
@openjdk
Copy link
Copy Markdown

openjdk bot commented Mar 20, 2026

@alexeysemenyukoracle 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.

@alexeysemenyukoracle alexeysemenyukoracle force-pushed the JDK-8371924 branch 2 times, most recently from 0221326 to b6aa63d Compare March 22, 2026 19:21
…entitlements validation of additional launchers in two-phase app image packaging/signing scenarios; add missing verifyMutable() calls; SigningAppImageTwoStepsTest: follow-up change
@alexeysemenyukoracle alexeysemenyukoracle marked this pull request as ready for review March 23, 2026 15:06
@alexeysemenyukoracle
Copy link
Copy Markdown
Member Author

@sashamatveev PTAL

@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 23, 2026
@mlbridge
Copy link
Copy Markdown

mlbridge bot commented Mar 23, 2026

Webrevs

Copy link
Copy Markdown
Member

@sashamatveev sashamatveev left a comment

Choose a reason for hiding this comment

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

If I remember correctly we used to read app store value from .jpackage.xml when doing predefined app image signing to figure out how we should sign it. What is good reason to sign predefined app image for app store if it was not generated for app store?

Comment on lines +272 to +278
if (MAC_APP_STORE.containsIn(options)) {
appStore = MAC_APP_STORE.getFrom(options);
} else if (PREDEFINED_APP_IMAGE.containsIn(options)) {
final var appImageFileOptions = appBuilder.externalApplication().orElseThrow().extra();
appStore = MAC_APP_STORE.getFrom(appImageFileOptions);
} else {
appStore = MAC_APP_STORE.getFrom(options);
appStore = false;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I do not see any difference between old and new code. Can you explain?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

The old code read the "app-store" property from the predefined image and ignored the value specified on the command line. The new code reads "app-store" property from the command line first. If not found, it reads it from the predefined image.


var testAL = new AdditionalLauncher("testAL");
testAL.applyTo(cmd);
cmd.executeAndAssertHelloAppImageCreated();
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why it is removed?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Because it runs jpackage without signing and duplicates line 70.

@alexeysemenyukoracle
Copy link
Copy Markdown
Member Author

What is good reason to sign predefined app image for app store if it was not generated for app store?

The app image signing command should sign any given app image. The app image can be one created by jpackage or a fully customized one. A missing flag in the ".jpackage.xml" file should not prevent a user from signing an app image for use with the App Store.

Copy link
Copy Markdown
Member

@sashamatveev sashamatveev left a comment

Choose a reason for hiding this comment

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

Looks good.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 24, 2026
@alexeysemenyukoracle
Copy link
Copy Markdown
Member Author

/integrate

@openjdk
Copy link
Copy Markdown

openjdk bot commented Mar 24, 2026

Going to push as commit e0fe86b.
Since your change was applied there have been 42 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 Mar 24, 2026
@openjdk openjdk bot closed this Mar 24, 2026
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 24, 2026
@openjdk
Copy link
Copy Markdown

openjdk bot commented Mar 24, 2026

@alexeysemenyukoracle Pushed as commit e0fe86b.

💡 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

core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants