git: openjdk/jdk: master: 2 new changesets

Wed May 21 14:39:52 UTC 2025

Changeset: 21c12822
Branch: master
Author:    Alexey Semenyuk <asemenyuk at openjdk.org>
Date:      2025-05-21 14:37:14 +0000
URL:       https://git.openjdk.org/jdk/commit/21c1282207614e57138b37a7adca4ccf11cf5bef

8333664: Decouple command line parsing and package building in jpackage

Reviewed-by: almatvee

! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java
- src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxApplicationLayout.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxApplicationLayoutMixin.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebPackageBuilder.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxFromParams.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxLaunchersAsServices.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageArch.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBuilder.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackagingPipeline.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmPackageBuilder.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxApplication.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxDebPackage.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxDebPackageMixin.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxLauncher.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxLauncherMixin.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxPackage.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxPackageMixin.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxRpmPackage.java
+ src/jdk.jpackage/linux/classes/jdk/jpackage/internal/model/LinuxRpmPackageMixin.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageInfoPListFile.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigner.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigningConfigBuilder.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/Codesign.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/CodesignConfig.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/Keychain.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageFileExtras.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationBuilder.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationLayout.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationLayoutMixin.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
- src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificate.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificateUtils.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackageBuilder.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackager.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFileAssociationBuilder.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromParams.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacLaunchersAsServices.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackageBuilder.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackageBuilder.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackager.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityImpl.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/TempKeychain.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/AppImageSigningConfig.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplication.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplicationMixin.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacDmgPackage.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacDmgPackageMixin.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacFileAssociation.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacFileAssociationMixin.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacLauncher.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPackage.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPackageMixin.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPkgPackage.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPkgPackageMixin.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/PkgSigningConfig.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/SigningIdentity.java
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/adjust-component-plist.xsl
+ src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/util/PListWriter.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageBundler.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageDesc.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationImageUtils.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayout.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayoutUtils.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnv.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvBuilder.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/BuildEnvFromParams.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/CompositeProxyTunnel.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociation.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationGroup.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociationScaner.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromParams.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/I18N.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/InstallableFile.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkRuntimeBuilder.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherAsService.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherBuilder.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromParams.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherStartupInfoBuilder.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/OverridableResource.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageBuilder.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackageFile.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagerBuilder.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/PlatformPackage.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/RuntimeBuilderBuilder.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/ScriptRunner.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/AppImageLayout.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/AppImagePackageType.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Application.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationLaunchers.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationLayout.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationLayoutMixin.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ApplicationWriter.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ConfigException.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/CustomLauncherIcon.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/DefaultLauncherIcon.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/FileAssociation.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/I18N.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Launcher.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherIcon.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherJarStartupInfo.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherJarStartupInfoMixin.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfo.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherModularStartupInfoMixin.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/LauncherStartupInfo.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Package.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackageType.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackageWriter.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackagerException.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeBuilder.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/RuntimeLayout.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/StandardPackageType.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/package-info.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/BinaryMatrix.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/DirectedEdge.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/FixedDAG.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/TaskPipelineBuilder.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/pipeline/TaskSpecBuilder.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CollectionUtils.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CompositeProxy.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/LocalizedExceptionBuilder.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/PathGroup.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/PathUtils.java
+ src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/StringBundle.java
! src/jdk.jpackage/share/classes/module-info.java
! src/jdk.jpackage/unix/classes/jdk/jpackage/internal/PackageScripts.java
! src/jdk.jpackage/unix/classes/jdk/jpackage/internal/ShellCustomAction.java
! src/jdk.jpackage/unix/classes/jdk/jpackage/internal/ShellCustomActionFactory.java
! src/jdk.jpackage/unix/classes/jdk/jpackage/internal/UnixLaunchersAsServices.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/ExecutableRebrander.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/OSVersionCondition.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExePackageBuilder.java
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinFromParams.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackageBuilder.java
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinPackagingPipeline.java
- src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsAppImageBuilder.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixAppImageFragmentBuilder.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixFragmentBuilder.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixLauncherAsService.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixSourceConverter.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixUiFragmentBuilder.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/MsiVersion.java
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinApplication.java
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinApplicationMixin.java
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinExePackage.java
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinExePackageMixin.java
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinLauncher.java
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinLauncherMixin.java
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinMsiPackage.java
+ src/jdk.jpackage/windows/classes/jdk/jpackage/internal/model/WinMsiPackageMixin.java
+ test/jdk/tools/jpackage/clean_stashed_files.sh
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java
+ test/jdk/tools/jpackage/helpers/jdk/jpackage/test/ConfigFilesStasher.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageUserScript.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
! test/jdk/tools/jpackage/junit/TEST.properties
! test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
- test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/ApplicationLayoutTest.java
! test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/OverridableResourceTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/model/AppImageLayoutTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/model/ApplicationLayoutTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/BinaryMatrixTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/DirectedEdgeTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/FixedDAGTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/pipeline/TaskPipelineBuilderTest.java
+ test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/CompositeProxyTest.java
! test/jdk/tools/jpackage/share/PostImageScriptTest.java
! test/jdk/tools/jpackage/share/RuntimeImageTest.java

Changeset: 254713ab
Branch: master
Author:    Hannes Wallnöfer <hannesw at openjdk.org>
Date:      2025-05-21 14:37:30 +0000
URL:       https://git.openjdk.org/jdk/commit/254713ab598f186fd31484a48a6dfebaeb752920

8338833: Error on reference not found for a snippet target

Reviewed-by: prappo

! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
! test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java