8371076: jpackage will wrongly overwrite the plist file in the embedded runtime when executed with the "--app-image" option #28089

alexeysemenyukoracle · 2025-10-31T16:51:45Z

Fix MacPackagingPipeline.
Fix AppImageSigner: this is the follow-up for MacPackagingPipeline fix. Without fixing AppImageSigner AppImagePackageTest.testEmpty test fails. It happened that the test passed because jpackage wrongly created the plist file for the embedded runtime in the case of the predefined app image. The test passed because of the bug in jpackage fixed in this PR.
Add test cases for predefined app image packaging to the CustomInfoPListTest test. They had been failing before MacPackagingPipeline was fixed.

Supplementary changes:

Get rid of duplicated createInputRuntimeImage() and createRuntimeBundle() functions.
Improve MacHelper.writeFaPListFragment() to work with a predefined app image.
Add optional tracing to the packaging pipeline (turned off by default, must edit static fields to enable in custom builds).
PListReader: add find methods that return an Optional instead of throwing an exception when the requested key is not found; update unit tests.

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

Warning

⚠️ Found leading lowercase letter in issue title for 8371076: jpackage will wrongly overwrite the plist file in the embedded runtime when executed with the "--app-image" option

Issue

JDK-8371076: jpackage will wrongly overwrite the plist file in the embedded runtime when executed with the "--app-image" option (Bug - P4)

Reviewers

Alexander Matveev (@sashamatveev - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 28089

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

Using diff file

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

Using Webrev

Link to Webrev Comment

…wing an exception when the requested key is not found; add toXmlConsumer(); update unit tests.

…follow-up change.

…Exception" from createInputRuntimeImage()

bridgekeeper · 2025-10-31T16:53:19Z

👋 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 · 2025-10-31T16:54:33Z

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

8371076: jpackage will wrongly overwrite the plist file in the embedded runtime when executed with the "--app-image" option

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

d226023: 8369994: Mixed mode jhsdb jstack cannot resolve symbol in function ending in call
54fe502: 8370732: Use WhiteBox.getWhiteBox().fullGC() to provoking gc for nsk/jvmti tests
2fc4cbe: 8370663: Incorrect synchronization in nsk/jvmti/RedefineClasses when expected events are not received
... and 69 more: https://git.openjdk.org/jdk/compare/20e55fafb39dd74a044d7fda8a2b3409cc00bf54...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 · 2025-10-31T16:55:19Z

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

…k with a predefined app image.

…nd.createInputRuntimeImage() and MacHelper.createRuntimeBundle()

openjdk · 2025-10-31T17:01:16Z

@alexeysemenyukoracle Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

…the embedded runtime when bundling predefined app image; AppImageSigner: should not attempt to sign embedded runtime bundle if it is not valid (missing). AppImagePackageTest.testEmpty test fails unless AppImageSigner is fixed.

openjdk · 2025-10-31T18:41:17Z

@alexeysemenyukoracle Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

mlbridge · 2025-10-31T19:04:54Z

Webrevs

alexeysemenyukoracle · 2025-10-31T19:13:16Z

@sashamatveev PTAL

sashamatveev · 2025-11-01T01:05:39Z

src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/PListReader.java

+        return findNode(keyName).filter(node -> {
+            switch (node.getNodeName()) {
+                case "true", "false" -> {
+                    return true;


Confused. Looks like this code will return true even if value is false. You can use return Boolean.parseBoolean(node.getNodeName()). No need for switch in this case.

Looks like this code will return true even if value is false

Correct. This code filters the node by its name. If the name is true or false, it accepts it and pass further, otherwise it returns false and the function returns an empty Optional.

sashamatveev

Looks good with minor comments.

sashamatveev · 2025-11-01T01:08:40Z

src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/Slot.java

+
+import java.util.Objects;
+
+public final class Slot<T> {


Can you add comment to explain why we need this class and how it is used?

sashamatveev

Looks good.

alexeysemenyukoracle · 2025-11-02T02:18:28Z

/integrate

openjdk · 2025-11-02T02:19:16Z

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

f7f4f90: 8370969: --launcher-as-service option is ignored when used with --app-image option
13b3d2f: 8368625: com/sun/net/httpserver/ServerStopTerminationTest.java fails intermittently
d226023: 8369994: Mixed mode jhsdb jstack cannot resolve symbol in function ending in call
... and 71 more: https://git.openjdk.org/jdk/compare/20e55fafb39dd74a044d7fda8a2b3409cc00bf54...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-11-02T02:19:24Z

@alexeysemenyukoracle Pushed as commit 7c900da.

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

alexeysemenyukoracle added 3 commits October 31, 2025 12:37

PListReader: add find methods that return an Optional instead of thro…

4cdbfca

…wing an exception when the requested key is not found; add toXmlConsumer(); update unit tests.

XmlUtils: rename mergeXmls() into concatXml(); WixLauncherAsService: …

9c2c3a9

…follow-up change.

JPackageCommand: fix setDefaultAppName(); remove redundant "throws IO…

3cc957c

…Exception" from createInputRuntimeImage()

openjdk bot added the core-libs core-libs-dev@openjdk.org label Oct 31, 2025

alexeysemenyukoracle added 4 commits October 31, 2025 13:00

PackagingPipeline: add debug capabilities

2b65003

MacHelper: add createRuntimeBundle(); make writeFaPListFragment() wor…

d21d3b2

…k with a predefined app image.

RuntimePackageTest, SigningRuntimeImagePackageTest: use JPackageComma…

7bc138b

…nd.createInputRuntimeImage() and MacHelper.createRuntimeBundle()

CustomInfoPListTest: better test coverage; shorten test case names

0c8ae58

alexeysemenyukoracle force-pushed the CustomInfoPListTest branch from 1375024 to 05e4409 Compare October 31, 2025 17:00

alexeysemenyukoracle force-pushed the CustomInfoPListTest branch from 05e4409 to 746a222 Compare October 31, 2025 18:39

openjdk bot added the rfr Pull request is ready for review label Oct 31, 2025

alexeysemenyukoracle added 2 commits October 31, 2025 17:49

Add Slot utility class

6449de9

CustomInfoPListTest: use Slot class

494adc5

sashamatveev reviewed Nov 1, 2025

View reviewed changes

Document Slot class

33cf187

sashamatveev approved these changes Nov 1, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 1, 2025

openjdk bot added the integrated Pull request has been integrated label Nov 2, 2025

openjdk bot closed this Nov 2, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 2, 2025

alexeysemenyukoracle mentioned this pull request Nov 4, 2025

8371076: jpackage will wrongly overwrite the plist file in the embedded runtime when executed with the "--app-image" option openjdk/jdk25u#356

Draft

4 tasks

8371076: jpackage will wrongly overwrite the plist file in the embedded runtime when executed with the "--app-image" option #28089

8371076: jpackage will wrongly overwrite the plist file in the embedded runtime when executed with the "--app-image" option #28089

Conversation

alexeysemenyukoracle commented Oct 31, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Warning

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Oct 31, 2025

Uh oh!

openjdk bot commented Oct 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Oct 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Oct 31, 2025

Uh oh!

openjdk bot commented Oct 31, 2025

Uh oh!

mlbridge bot commented Oct 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

alexeysemenyukoracle commented Oct 31, 2025

Uh oh!

sashamatveev Nov 1, 2025

Choose a reason for hiding this comment

Uh oh!

alexeysemenyukoracle Nov 1, 2025

Choose a reason for hiding this comment

Uh oh!

sashamatveev left a comment

Choose a reason for hiding this comment

Uh oh!

sashamatveev Nov 1, 2025

Choose a reason for hiding this comment

Uh oh!

sashamatveev left a comment

Choose a reason for hiding this comment

Uh oh!

alexeysemenyukoracle commented Nov 2, 2025

Uh oh!

openjdk bot commented Nov 2, 2025

Uh oh!

openjdk bot commented Nov 2, 2025

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

2 participants

alexeysemenyukoracle commented Oct 31, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Oct 31, 2025 •

edited

Loading

openjdk bot commented Oct 31, 2025 •

edited

Loading

mlbridge bot commented Oct 31, 2025 •

edited

Loading