Skip to content

Conversation

@sashamatveev
Copy link
Member

@sashamatveev sashamatveev commented Dec 23, 2025

  • Removed <key>plst</key>. It is not clear why we need it.
  • I did not found official specification for this file, but based on some research <key>plst</key> is not part of it. Other entries seems to be required.
  • NOTE: License dialog for DMG was deprecated since macOS 12. Also, there are no alternative for it.

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-8374215: [macos] Clean "lic_template.plist" (Bug - P4)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 28959

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@sashamatveev
Copy link
Member Author

@alexeysemenyukoracle Please review.

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 23, 2025

👋 Welcome back almatvee! 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

openjdk bot commented Dec 23, 2025

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk
Copy link

openjdk bot commented Dec 23, 2025

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

<key>Attributes</key>
<string>0x0000</string>
<key>Data</key>
<data>AAYFTm9yc2sERW5pZwlJa2tlIGVuaWcIU2tyaXYgdXQKQXJraXZlci4uLqNIdmlzIERlIGVyIGVuaWcgaSBiZXN0ZW1tZWxzZW5lIGkgZGVubmUgbGlzZW5zYXZ0YWxlbiwga2xpa2tlciBEZSBwjCAiRW5pZyIta25hcHBlbiBmb3IgjCBpbnN0YWxsZXJlIHByb2dyYW12YXJlbi4gSHZpcyBEZSBpa2tlIGVyIGVuaWcsIGtsaWtrZXIgRGUgcIwgIklra2UgZW5pZyIu</data>

Choose a reason for hiding this comment

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

I suppose this is a base64-encoded Norwegian translation of something. We don't support Norwegian l10n.

Supported l10n-s should be in .properties files and encoded as base64 at runtime.

Copy link
Member Author

Choose a reason for hiding this comment

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

I will drop all translations except de, ja, zh_CN and move them to .properties files.

@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 23, 2025
@mlbridge
Copy link

mlbridge bot commented Dec 23, 2025

Webrevs

@alexeysemenyukoracle
Copy link
Member

alexeysemenyukoracle commented Dec 23, 2025

NOTE: License dialog for DMG was deprecated since macOS 12. Also, there are no alternative for it.

Right, but hdiutil udifrez command is still working:

[02:08:24.166] Running /usr/bin/hdiutil
[02:08:24.194] Command [PID: 93201]:
    /usr/bin/hdiutil udifrez testCommon/output/CommonLicenseTest-1.0.dmg -xml /var/folders/xt/bm4_x23d1_s0kbvvls86_7z80000gr/T/jdk.jpackage6799898339358549904/config/CommonLicenseTest-license.plist
[02:08:24.194] Output:
    hdiutil: WARNING: udifrez is deprecated
    copying resource 'STR#' (5000)...
    copying resource 'STR#' (5001)...
    copying resource 'STR#' (5002)...
    copying resource 'STR#' (5003)...
    copying resource 'STR#' (5004)...
    copying resource 'STR#' (5005)...
    copying resource 'STR#' (5006)...
    copying resource 'STR#' (5007)...
    copying resource 'STR#' (5008)...
    copying resource 'STR#' (5009)...
    copying resource 'STR#' (5010)...
    copying resource 'STR#' (5011)...
    copying resource 'STR#' (5012)...
    copying resource 'STR#' (5013)...
    copying resource 'STR#' (5014)...
    copying resource 'STR#' (5015)...
    copying resource 'STR#' (5016)...
    copying resource 'TMPL' (128)...
    copying resource 'TEXT' (5000)...
    copying resource 'LPic' (5000)...
    copying resource 'styl' (5000)...
    copying resource 'plst' (0)...
[02:08:24.195] Returned: 0

[02:08:24.195] Result DMG installer for CommonLicenseTest: testCommon/output/CommonLicenseTest-1.0.dmg.
[02:08:24.196] Succeeded in building Mac DMG Package package
[02:08:24.319] TRACE: exec: Done. Exit code: 0

Should we spend time cleaning the "lic_template.plist" file and adding complexity by moving resources to l10n files, or merely remove support for a license file in DMG packaging? I'm on the fence.

@sashamatveev
Copy link
Member Author

Should we spend time cleaning the "lic_template.plist" file and adding complexity by moving resources to l10n files, or merely remove support for a license file in DMG packaging? I'm on the fence.

I think we should not remove it as long as it is supported by hdiutil in case if it is being used. For cleanup we should drop unsupported translations, but moving them to l10n files is not really necessary, since we will never change them.

I will prefer drop translations, but do not move them to l10n files.

@alexeysemenyukoracle
Copy link
Member

alexeysemenyukoracle commented Dec 23, 2025

but moving them to l10n files is not really necessary, since we will never change them.

Right, but this way they will be out of the scope for the localization team. This is not right. Let's get it fixed properly and never touch it again until the hdiutil udifrez command is entirely broken.

The string(s) for this file should be in a separate set of l10n files, don't add them to the MacResources.properties file because we have to load all l10n, not the one of the current locale.

@sashamatveev
Copy link
Member Author

Do you have suggestion if we should issue warning for DMG and --license-file that it was deprecated and we will drop it as soon as hdiutil drops it?

@alexeysemenyukoracle
Copy link
Member

I don't support complicating jpackage with the warning.

When hdiutil udifrez stops working, jpackage will start failing:

We don't need anything extra.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

core-libs [email protected] rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

2 participants