From 26e7ef78fbe005abe5657b97012f9fa2df3a6fdc Mon Sep 17 00:00:00 2001 From: Andy Herrick Date: Wed, 4 Nov 2020 20:27:11 +0000 Subject: [PATCH] 8252870: Finalize (remove "incubator" from) jpackage Reviewed-by: kcr, erikj, almatvee, asemenyuk, prr, ihse --- make/CompileJavaModules.gmk | 4 +- make/common/Modules.gmk | 6 +-- .../Gensrc.gmk | 2 +- .../Launcher.gmk | 2 +- .../Lib.gmk | 12 +++--- make/scripts/compare.sh | 2 +- src/java.base/share/classes/module-info.java | 2 +- .../jpackage/internal/DesktopIntegration.java | 22 +++++----- .../jpackage/internal/LibProvidersLookup.java | 10 ++--- .../jpackage/internal/LinuxAppBundler.java | 2 +- .../internal/LinuxAppImageBuilder.java | 8 ++-- .../jpackage/internal/LinuxDebBundler.java | 16 ++++---- .../internal/LinuxPackageBundler.java | 16 ++++---- .../jpackage/internal/LinuxRpmBundler.java | 14 +++---- .../jpackage/internal/PackageProperty.java | 2 +- .../resources/LinuxResources.properties | 0 .../resources/LinuxResources_ja.properties | 0 .../resources/LinuxResources_zh_CN.properties | 0 .../jpackage/internal/resources/java32.png | Bin .../internal/resources/template.control | 0 .../internal/resources/template.copyright | 0 .../internal/resources/template.desktop | 0 .../internal/resources/template.postinst | 0 .../internal/resources/template.postrm | 0 .../internal/resources/template.preinst | 0 .../internal/resources/template.prerm | 0 .../jpackage/internal/resources/template.spec | 0 .../jdk}/jpackage/internal/resources/utils.sh | 0 .../linux}/classes/module-info.java.extra | 8 ++-- .../linux/native/applauncher/Executor.cpp | 0 .../linux/native/applauncher/Executor.h | 0 .../native/applauncher/LinuxLauncher.cpp | 0 .../linux/native/applauncher/Package.cpp | 0 .../linux/native/applauncher/Package.h | 0 .../linux/native/common/LinuxSysInfo.cpp | 0 .../jpackage/internal/CFBundleVersion.java | 2 +- .../jdk}/jpackage/internal/MacAppBundler.java | 12 +++--- .../jpackage/internal/MacAppImageBuilder.java | 38 +++++++++--------- .../jpackage/internal/MacAppStoreBundler.java | 14 +++---- .../internal/MacBaseInstallerBundler.java | 10 ++--- .../jpackage/internal/MacCertificate.java | 2 +- .../jdk}/jpackage/internal/MacDmgBundler.java | 20 ++++----- .../jdk}/jpackage/internal/MacPkgBundler.java | 24 +++++------ .../jpackage/internal/resources/DMGsetup.scpt | 0 .../resources/Info-lite.plist.template | 0 .../resources/MacResources.properties | 0 .../resources/MacResources_ja.properties | 0 .../resources/MacResources_zh_CN.properties | 0 .../resources/Runtime-Info.plist.template | 0 .../internal/resources/background_dmg.tiff | Bin .../internal/resources/background_pkg.png | Bin .../jpackage/internal/resources/java.icns | Bin .../internal/resources/lic_template.plist | 0 .../internal/resources/postinstall.template | 0 .../internal/resources/preinstall.template | 0 .../macosx}/classes/module-info.java.extra | 9 +++-- .../macosx/native/applauncher/MacLauncher.cpp | 0 .../macosx/native/common/MacSysInfo.cpp | 0 .../internal/AbstractAppImageBuilder.java | 12 +++--- .../jpackage/internal/AbstractBundler.java | 2 +- .../internal/AddLauncherArguments.java | 6 +-- .../jpackage/internal/AppImageBundler.java | 10 ++--- .../jdk}/jpackage/internal/AppImageFile.java | 8 ++-- .../jpackage/internal/ApplicationLayout.java | 2 +- .../jdk}/jpackage/internal/Arguments.java | 10 ++--- .../jdk}/jpackage/internal/BasicBundlers.java | 2 +- .../jdk}/jpackage/internal/BundleParams.java | 4 +- .../jdk}/jpackage/internal/Bundler.java | 2 +- .../jpackage/internal/BundlerParamInfo.java | 2 +- .../jdk}/jpackage/internal/Bundlers.java | 2 +- .../jdk}/jpackage/internal/CLIHelp.java | 4 +- .../jdk}/jpackage/internal/CfgFile.java | 12 +++--- .../jpackage/internal/ConfigException.java | 2 +- .../jdk}/jpackage/internal/DeployParams.java | 2 +- .../jdk}/jpackage/internal/DottedVersion.java | 2 +- .../jdk}/jpackage/internal/Executor.java | 2 +- .../jpackage/internal/FileAssociation.java | 14 +++---- .../classes/jdk}/jpackage/internal/I18N.java | 10 ++--- .../jdk}/jpackage/internal/IOUtils.java | 2 +- .../jpackage/internal/JLinkBundlerHelper.java | 2 +- .../internal/JPackageToolProvider.java | 4 +- .../jdk}/jpackage/internal/LauncherData.java | 4 +- .../classes/jdk}/jpackage/internal/Log.java | 2 +- .../internal/OverridableResource.java | 8 ++-- .../jpackage/internal/PackagerException.java | 4 +- .../jdk}/jpackage/internal/PathGroup.java | 2 +- .../jdk}/jpackage/internal/Platform.java | 2 +- .../jpackage/internal/PlatformPackage.java | 2 +- .../jdk}/jpackage/internal/RetryExecutor.java | 2 +- .../jdk}/jpackage/internal/ScriptRunner.java | 8 ++-- .../internal/StandardBundlerParam.java | 4 +- .../jdk}/jpackage/internal/ToolValidator.java | 2 +- .../jdk}/jpackage/internal/ValidOptions.java | 4 +- .../resources/HelpResources.properties | 0 .../resources/HelpResources_ja.properties | 0 .../resources/HelpResources_zh_CN.properties | 0 .../resources/MainResources.properties | 0 .../resources/MainResources_ja.properties | 0 .../resources/MainResources_zh_CN.properties | 0 .../internal/resources/ResourceLocator.java | 2 +- .../jdk}/jpackage/main/CommandLine.java | 2 +- .../classes/jdk}/jpackage/main/Main.java | 12 +++--- .../share/classes/module-info.java | 14 +++---- .../share/man/jpackage.1 | 0 .../share/native/applauncher/AppLauncher.cpp | 0 .../share/native/applauncher/AppLauncher.h | 0 .../share/native/applauncher/CfgFile.cpp | 0 .../share/native/applauncher/CfgFile.h | 0 .../share/native/applauncher/JvmLauncher.cpp | 0 .../share/native/applauncher/JvmLauncher.h | 0 .../share/native/common/Dll.h | 0 .../share/native/common/ErrorHandling.cpp | 0 .../share/native/common/ErrorHandling.h | 0 .../share/native/common/FileUtils.cpp | 0 .../share/native/common/FileUtils.h | 0 .../share/native/common/Log.cpp | 0 .../share/native/common/Log.h | 0 .../share/native/common/SourceCodePos.h | 0 .../share/native/common/SysInfo.h | 0 .../share/native/common/Toolbox.h | 0 .../share/native/common/kludge_c++11.h | 0 .../share/native/common/tstrings.cpp | 0 .../share/native/common/tstrings.h | 0 .../unix/native/common/PlatformLogEvent.cpp | 0 .../unix/native/common/PlatformLogEvent.h | 0 .../unix/native/common/UnixDll.cpp | 0 .../unix/native/common/UnixFileUtils.cpp | 0 .../unix/native/common/UnixSysInfo.cpp | 0 .../unix/native/common/UnixSysInfo.h | 0 .../internal/ExecutableRebrander.java | 18 ++++----- .../jdk}/jpackage/internal/MsiVersion.java | 2 +- .../jdk}/jpackage/internal/WinAppBundler.java | 2 +- .../jdk}/jpackage/internal/WinExeBundler.java | 2 +- .../jdk}/jpackage/internal/WinMsiBundler.java | 22 +++++----- .../internal/WindowsAppImageBuilder.java | 10 ++--- .../jpackage/internal/WindowsDefender.java | 2 +- .../jpackage/internal/WindowsRegistry.java | 2 +- .../jdk}/jpackage/internal/WixPipeline.java | 2 +- .../jpackage/internal/WixSourcesBuilder.java | 14 +++---- .../jdk}/jpackage/internal/WixTool.java | 2 +- .../resources/MsiInstallerStrings_en.wxl | 0 .../resources/MsiInstallerStrings_ja.wxl | 0 .../resources/MsiInstallerStrings_zh_CN.wxl | 0 .../internal/resources/WinInstaller.template | 0 .../internal/resources/WinLauncher.template | 0 .../resources/WinResources.properties | 0 .../resources/WinResources_ja.properties | 0 .../resources/WinResources_zh_CN.properties | 0 .../jpackage/internal/resources/java48.ico | Bin .../jdk}/jpackage/internal/resources/main.wxs | 0 .../jpackage/internal/resources/overrides.wxi | 0 .../windows}/classes/module-info.java.extra | 9 ++--- .../native/applauncher/WinLauncher.cpp | 0 .../native/common/PlatformLogEvent.cpp | 0 .../windows/native/common/PlatformLogEvent.h | 0 .../windows/native/common/UniqueHandle.h | 0 .../windows/native/common/WinDll.cpp | 0 .../native/common/WinErrorHandling.cpp | 0 .../windows/native/common/WinErrorHandling.h | 0 .../windows/native/common/WinFileUtils.cpp | 0 .../windows/native/common/WinFileUtils.h | 0 .../windows/native/common/WinSysInfo.cpp | 0 .../windows/native/common/WinSysInfo.h | 0 .../windows/native/libjpackage/IconSwap.cpp | 0 .../windows/native/libjpackage/IconSwap.h | 0 .../windows/native/libjpackage/JniUtils.cpp | 0 .../windows/native/libjpackage/JniUtils.h | 0 .../native/libjpackage/ResourceEditor.cpp | 0 .../native/libjpackage/ResourceEditor.h | 0 .../native/libjpackage/VersionInfo.cpp | 0 .../windows/native/libjpackage/VersionInfo.h | 0 .../native/libjpackage/WindowsRegistry.cpp | 28 ++++++------- .../windows/native/libjpackage/jpackage.cpp | 20 ++++----- .../native/libwixhelper/libwixhelper.cpp | 0 .../windows/native/msiwrapper/Executor.cpp | 0 .../windows/native/msiwrapper/Executor.h | 0 .../windows/native/msiwrapper/MsiWrapper.cpp | 0 .../windows/native/msiwrapper/Resources.cpp | 0 .../windows/native/msiwrapper/Resources.h | 0 test/jdk/build/AbsPathsInImage.java | 4 +- .../jdk/jpackage/test/AdditionalLauncher.java | 2 +- .../jdk/jpackage/test/FileAssociations.java | 2 +- .../jdk/jpackage/test/JPackageCommand.java | 13 +----- .../jpackage/test/LauncherIconVerifier.java | 2 +- .../jdk/jpackage/test/LinuxHelper.java | 2 +- .../jdk/jpackage/test/PackageTest.java | 4 +- .../jdk/jpackage/test/PackageType.java | 12 +++--- .../helpers/jdk/jpackage/test/TKit.java | 2 +- .../jpackage/internal/AppImageFileTest.java | 2 +- .../internal/ApplicationLayoutTest.java | 2 +- .../internal/CompareDottedVersionTest.java | 2 +- .../jpackage/internal/DeployParamsTest.java | 2 +- .../jpackage/internal/DottedVersionTest.java | 2 +- .../internal/InvalidDottedVersionTest.java | 2 +- .../internal/OverridableResourceTest.java | 4 +- .../jpackage/internal/PathGroupTest.java | 2 +- .../internal/PlatformVersionTest.java | 6 +-- .../jpackage/internal/ToolValidatorTest.java | 2 +- test/jdk/tools/jpackage/junit/junit.java | 2 +- test/jdk/tools/jpackage/junit/run_junit.sh | 8 ++-- .../tools/jpackage/linux/AppCategoryTest.java | 2 +- .../tools/jpackage/linux/LicenseTypeTest.java | 2 +- .../jpackage/linux/LinuxBundleNameTest.java | 2 +- .../jpackage/linux/LinuxResourceTest.java | 2 +- .../tools/jpackage/linux/MaintainerTest.java | 2 +- .../tools/jpackage/linux/PackageDepsTest.java | 2 +- .../jdk/tools/jpackage/linux/ReleaseTest.java | 2 +- .../jpackage/linux/ShortcutHintTest.java | 4 +- .../linux/jdk/jpackage/tests/UsrTreeTest.java | 2 +- .../macosx/MacFileAssociationsTest.java | 2 +- .../jpackage/macosx/MacPropertiesTest.java | 2 +- .../jpackage/macosx/NameWithSpaceTest.java | 2 +- .../jpackage/macosx/SigningAppImageTest.java | 2 +- .../jpackage/macosx/SigningPackageTest.java | 2 +- .../jpackage/macosx/base/SigningCheck.java | 2 +- .../tools/jpackage/share/AddLauncherTest.java | 4 +- .../jpackage/share/AppImagePackageTest.java | 2 +- .../tools/jpackage/share/ArgumentsTest.java | 2 +- .../share/EmptyFolderPackageTest.java | 4 +- .../tools/jpackage/share/EmptyFolderTest.java | 4 +- .../jpackage/share/FileAssociationsTest.java | 4 +- test/jdk/tools/jpackage/share/IconTest.java | 2 +- .../tools/jpackage/share/InstallDirTest.java | 4 +- .../jdk/tools/jpackage/share/LicenseTest.java | 4 +- .../share/MultiLauncherTwoPhaseTest.java | 2 +- .../jpackage/share/RuntimePackageTest.java | 4 +- .../jpackage/share/SimplePackageTest.java | 2 +- .../jdk/jpackage/tests/AppVersionTest.java | 6 +-- .../share/jdk/jpackage/tests/BasicTest.java | 2 +- .../jdk/jpackage/tests/CookedRuntimeTest.java | 2 +- .../share/jdk/jpackage/tests/ErrorTest.java | 4 +- .../jdk/jpackage/tests/JLinkOptionsTest.java | 4 +- .../jpackage/tests/JavaOptionsEqualsTest.java | 4 +- .../jdk/jpackage/tests/JavaOptionsTest.java | 2 +- .../jdk/jpackage/tests/MainClassTest.java | 2 +- .../jdk/jpackage/tests/ModulePathTest.java | 2 +- .../jdk/jpackage/tests/ModulePathTest2.java | 2 +- .../jdk/jpackage/tests/ModulePathTest3.java | 6 +-- .../jpackage/tests/MultipleJarAppTest.java | 2 +- .../jdk/jpackage/tests/NonExistentTest.java | 2 +- .../jdk/jpackage/tests/UnicodeArgsTest.java | 2 +- .../jpackage/windows/WinConsoleTest.java | 2 +- .../jpackage/windows/WinDirChooserTest.java | 2 +- .../tools/jpackage/windows/WinL10nTest.java | 2 +- .../jpackage/windows/WinMenuGroupTest.java | 2 +- .../tools/jpackage/windows/WinMenuTest.java | 2 +- .../windows/WinPerUserInstallTest.java | 2 +- .../jpackage/windows/WinResourceTest.java | 2 +- .../tools/jpackage/windows/WinScriptTest.java | 4 +- .../jpackage/windows/WinShortcutTest.java | 2 +- .../jpackage/windows/WinUpgradeUUIDTest.java | 4 +- 251 files changed, 396 insertions(+), 405 deletions(-) rename make/modules/{jdk.incubator.jpackage => jdk.jpackage}/Gensrc.gmk (93%) rename make/modules/{jdk.incubator.jpackage => jdk.jpackage}/Launcher.gmk (95%) rename make/modules/{jdk.incubator.jpackage => jdk.jpackage}/Lib.gmk (91%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/DesktopIntegration.java (96%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/LibProvidersLookup.java (91%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/LinuxAppBundler.java (97%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/LinuxAppImageBuilder.java (94%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/LinuxDebBundler.java (97%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/LinuxPackageBundler.java (95%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/LinuxRpmBundler.java (96%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/PackageProperty.java (98%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/resources/LinuxResources.properties (100%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/resources/LinuxResources_ja.properties (100%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/resources/LinuxResources_zh_CN.properties (100%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/resources/java32.png (100%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/resources/template.control (100%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/resources/template.copyright (100%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/resources/template.desktop (100%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/resources/template.postinst (100%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/resources/template.postrm (100%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/resources/template.preinst (100%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/resources/template.prerm (100%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/resources/template.spec (100%) rename src/{jdk.incubator.jpackage/linux/classes/jdk/incubator => jdk.jpackage/linux/classes/jdk}/jpackage/internal/resources/utils.sh (100%) rename src/{jdk.incubator.jpackage/windows => jdk.jpackage/linux}/classes/module-info.java.extra (85%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/linux/native/applauncher/Executor.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/linux/native/applauncher/Executor.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/linux/native/applauncher/LinuxLauncher.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/linux/native/applauncher/Package.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/linux/native/applauncher/Package.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/linux/native/common/LinuxSysInfo.cpp (100%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/CFBundleVersion.java (98%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/MacAppBundler.java (92%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/MacAppImageBuilder.java (95%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/MacAppStoreBundler.java (94%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/MacBaseInstallerBundler.java (95%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/MacCertificate.java (99%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/MacDmgBundler.java (96%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/MacPkgBundler.java (96%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/resources/DMGsetup.scpt (100%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/resources/Info-lite.plist.template (100%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/resources/MacResources.properties (100%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/resources/MacResources_ja.properties (100%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/resources/MacResources_zh_CN.properties (100%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/resources/Runtime-Info.plist.template (100%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/resources/background_dmg.tiff (100%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/resources/background_pkg.png (100%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/resources/java.icns (100%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/resources/lic_template.plist (100%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/resources/postinstall.template (100%) rename src/{jdk.incubator.jpackage/macosx/classes/jdk/incubator => jdk.jpackage/macosx/classes/jdk}/jpackage/internal/resources/preinstall.template (100%) rename src/{jdk.incubator.jpackage/linux => jdk.jpackage/macosx}/classes/module-info.java.extra (85%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/macosx/native/applauncher/MacLauncher.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/macosx/native/common/MacSysInfo.cpp (100%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/AbstractAppImageBuilder.java (91%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/AbstractBundler.java (98%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/AddLauncherArguments.java (97%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/AppImageBundler.java (93%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/AppImageFile.java (97%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/ApplicationLayout.java (99%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/Arguments.java (98%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/BasicBundlers.java (98%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/BundleParams.java (95%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/Bundler.java (99%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/BundlerParamInfo.java (98%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/Bundlers.java (98%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/CLIHelp.java (97%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/CfgFile.java (92%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/ConfigException.java (97%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/DeployParams.java (99%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/DottedVersion.java (99%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/Executor.java (99%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/FileAssociation.java (88%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/I18N.java (84%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/IOUtils.java (99%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/JLinkBundlerHelper.java (99%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/JPackageToolProvider.java (93%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/LauncherData.java (99%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/Log.java (99%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/OverridableResource.java (97%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/PackagerException.java (94%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/PathGroup.java (99%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/Platform.java (98%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/PlatformPackage.java (97%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/RetryExecutor.java (98%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/ScriptRunner.java (92%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/StandardBundlerParam.java (99%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/ToolValidator.java (99%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/ValidOptions.java (98%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/resources/HelpResources.properties (100%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/resources/HelpResources_ja.properties (100%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/resources/HelpResources_zh_CN.properties (100%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/resources/MainResources.properties (100%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/resources/MainResources_ja.properties (100%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/resources/MainResources_zh_CN.properties (100%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/internal/resources/ResourceLocator.java (96%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/main/CommandLine.java (99%) rename src/{jdk.incubator.jpackage/share/classes/jdk/incubator => jdk.jpackage/share/classes/jdk}/jpackage/main/Main.java (92%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/classes/module-info.java (86%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/man/jpackage.1 (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/applauncher/AppLauncher.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/applauncher/AppLauncher.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/applauncher/CfgFile.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/applauncher/CfgFile.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/applauncher/JvmLauncher.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/applauncher/JvmLauncher.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/common/Dll.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/common/ErrorHandling.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/common/ErrorHandling.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/common/FileUtils.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/common/FileUtils.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/common/Log.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/common/Log.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/common/SourceCodePos.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/common/SysInfo.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/common/Toolbox.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/common/kludge_c++11.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/common/tstrings.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/share/native/common/tstrings.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/unix/native/common/PlatformLogEvent.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/unix/native/common/PlatformLogEvent.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/unix/native/common/UnixDll.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/unix/native/common/UnixFileUtils.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/unix/native/common/UnixSysInfo.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/unix/native/common/UnixSysInfo.h (100%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/ExecutableRebrander.java (92%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/MsiVersion.java (98%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/WinAppBundler.java (97%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/WinExeBundler.java (99%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/WinMsiBundler.java (96%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/WindowsAppImageBuilder.java (93%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/WindowsDefender.java (98%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/WindowsRegistry.java (99%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/WixPipeline.java (99%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/WixSourcesBuilder.java (98%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/WixTool.java (99%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/resources/MsiInstallerStrings_en.wxl (100%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/resources/MsiInstallerStrings_ja.wxl (100%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl (100%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/resources/WinInstaller.template (100%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/resources/WinLauncher.template (100%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/resources/WinResources.properties (100%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/resources/WinResources_ja.properties (100%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/resources/WinResources_zh_CN.properties (100%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/resources/java48.ico (100%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/resources/main.wxs (100%) rename src/{jdk.incubator.jpackage/windows/classes/jdk/incubator => jdk.jpackage/windows/classes/jdk}/jpackage/internal/resources/overrides.wxi (100%) rename src/{jdk.incubator.jpackage/macosx => jdk.jpackage/windows}/classes/module-info.java.extra (82%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/applauncher/WinLauncher.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/common/PlatformLogEvent.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/common/PlatformLogEvent.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/common/UniqueHandle.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/common/WinDll.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/common/WinErrorHandling.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/common/WinErrorHandling.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/common/WinFileUtils.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/common/WinFileUtils.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/common/WinSysInfo.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/common/WinSysInfo.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/libjpackage/IconSwap.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/libjpackage/IconSwap.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/libjpackage/JniUtils.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/libjpackage/JniUtils.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/libjpackage/ResourceEditor.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/libjpackage/ResourceEditor.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/libjpackage/VersionInfo.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/libjpackage/VersionInfo.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/libjpackage/WindowsRegistry.cpp (84%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/libjpackage/jpackage.cpp (84%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/libwixhelper/libwixhelper.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/msiwrapper/Executor.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/msiwrapper/Executor.h (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/msiwrapper/MsiWrapper.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/msiwrapper/Resources.cpp (100%) rename src/{jdk.incubator.jpackage => jdk.jpackage}/windows/native/msiwrapper/Resources.h (100%) rename test/jdk/tools/jpackage/junit/jdk/{incubator => }/jpackage/internal/AppImageFileTest.java (99%) rename test/jdk/tools/jpackage/junit/jdk/{incubator => }/jpackage/internal/ApplicationLayoutTest.java (98%) rename test/jdk/tools/jpackage/junit/jdk/{incubator => }/jpackage/internal/CompareDottedVersionTest.java (98%) rename test/jdk/tools/jpackage/junit/jdk/{incubator => }/jpackage/internal/DeployParamsTest.java (99%) rename test/jdk/tools/jpackage/junit/jdk/{incubator => }/jpackage/internal/DottedVersionTest.java (98%) rename test/jdk/tools/jpackage/junit/jdk/{incubator => }/jpackage/internal/InvalidDottedVersionTest.java (98%) rename test/jdk/tools/jpackage/junit/jdk/{incubator => }/jpackage/internal/OverridableResourceTest.java (98%) rename test/jdk/tools/jpackage/junit/jdk/{incubator => }/jpackage/internal/PathGroupTest.java (99%) rename test/jdk/tools/jpackage/junit/jdk/{incubator => }/jpackage/internal/PlatformVersionTest.java (96%) rename test/jdk/tools/jpackage/junit/jdk/{incubator => }/jpackage/internal/ToolValidatorTest.java (98%) diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk index 4bd3efff276..e8997e0da83 100644 --- a/make/CompileJavaModules.gmk +++ b/make/CompileJavaModules.gmk @@ -385,11 +385,11 @@ endif ################################################################################ -jdk.incubator.jpackage_COPY += .gif .png .txt .spec .script .prerm .preinst \ +jdk.jpackage_COPY += .gif .png .txt .spec .script .prerm .preinst \ .postrm .postinst .list .sh .desktop .copyright .control .plist .template \ .icns .scpt .wxs .wxl .wxi .ico .bmp .tiff -jdk.incubator.jpackage_CLEAN += .properties +jdk.jpackage_CLEAN += .properties ################################################################################ diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk index 62272edd34a..10aacff4726 100644 --- a/make/common/Modules.gmk +++ b/make/common/Modules.gmk @@ -125,7 +125,7 @@ endif JRE_TOOL_MODULES += \ jdk.jdwp.agent \ - jdk.incubator.jpackage \ + jdk.jpackage \ # ################################################################################ @@ -145,7 +145,7 @@ DOCS_MODULES += \ jdk.editpad \ jdk.hotspot.agent \ jdk.httpserver \ - jdk.incubator.jpackage \ + jdk.jpackage \ jdk.incubator.vector \ jdk.jartool \ jdk.javadoc \ @@ -228,7 +228,7 @@ endif # jpackage is only on windows, macosx, and linux ifeq ($(call isTargetOs, windows macosx linux), false) - MODULES_FILTER += jdk.incubator.jpackage + MODULES_FILTER += jdk.jpackage endif ################################################################################ diff --git a/make/modules/jdk.incubator.jpackage/Gensrc.gmk b/make/modules/jdk.jpackage/Gensrc.gmk similarity index 93% rename from make/modules/jdk.incubator.jpackage/Gensrc.gmk rename to make/modules/jdk.jpackage/Gensrc.gmk index 5948a80f120..6f3e8b08119 100644 --- a/make/modules/jdk.incubator.jpackage/Gensrc.gmk +++ b/make/modules/jdk.jpackage/Gensrc.gmk @@ -31,7 +31,7 @@ include GensrcCommonJdk.gmk ifeq ($(call isTargetOs, macosx), true) ENTITLEMENTS_SRC_FILE := $(TOPDIR)/make/data/macosxsigning/java.plist ENTITLEMENTS_TARGET_FILE := \ - $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/jdk/incubator/jpackage/internal/resources/entitlements.plist + $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/jdk/jpackage/internal/resources/entitlements.plist $(ENTITLEMENTS_TARGET_FILE): $(ENTITLEMENTS_SRC_FILE) $(call install-file) diff --git a/make/modules/jdk.incubator.jpackage/Launcher.gmk b/make/modules/jdk.jpackage/Launcher.gmk similarity index 95% rename from make/modules/jdk.incubator.jpackage/Launcher.gmk rename to make/modules/jdk.jpackage/Launcher.gmk index 7a25dae733c..8d553d5c107 100644 --- a/make/modules/jdk.incubator.jpackage/Launcher.gmk +++ b/make/modules/jdk.jpackage/Launcher.gmk @@ -26,5 +26,5 @@ include LauncherCommon.gmk $(eval $(call SetupBuildLauncher, jpackage, \ - MAIN_CLASS := jdk.incubator.jpackage.main.Main, \ + MAIN_CLASS := jdk.jpackage.main.Main, \ )) diff --git a/make/modules/jdk.incubator.jpackage/Lib.gmk b/make/modules/jdk.jpackage/Lib.gmk similarity index 91% rename from make/modules/jdk.incubator.jpackage/Lib.gmk rename to make/modules/jdk.jpackage/Lib.gmk index 7ffef99afe4..7dfb70be5a6 100644 --- a/make/modules/jdk.incubator.jpackage/Lib.gmk +++ b/make/modules/jdk.jpackage/Lib.gmk @@ -29,8 +29,8 @@ include LibCommon.gmk JPACKAGE_APPLAUNCHER_SRC := \ - $(call FindSrcDirsForComponent, jdk.incubator.jpackage, applauncher) \ - $(call FindSrcDirsForComponent, jdk.incubator.jpackage, common) + $(call FindSrcDirsForComponent, jdk.jpackage, applauncher) \ + $(call FindSrcDirsForComponent, jdk.jpackage, common) ifeq ($(call isTargetOs, windows), true) @@ -42,7 +42,7 @@ else endif -JPACKAGE_OUTPUT_DIR := $(JDK_OUTPUTDIR)/modules/$(MODULE)/jdk/incubator/jpackage/internal/resources +JPACKAGE_OUTPUT_DIR := $(JDK_OUTPUTDIR)/modules/$(MODULE)/jdk/jpackage/internal/resources JPACKAGE_CXXFLAGS_windows := -EHsc -DUNICODE -D_UNICODE # Output app launcher executable in resources dir, and symbols in the object dir @@ -73,7 +73,7 @@ ifeq ($(call isTargetOs, windows), true) $(eval $(call SetupJdkLibrary, BUILD_LIB_JPACKAGE, \ NAME := jpackage, \ OPTIMIZATION := LOW, \ - EXTRA_SRC := jdk.incubator.jpackage:common, \ + EXTRA_SRC := jdk.jpackage:common, \ CXXFLAGS := $(CXXFLAGS_JDKLIB) $(JPACKAGE_CXXFLAGS_windows), \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -99,8 +99,8 @@ ifeq ($(call isTargetOs, windows), true) TARGETS += $(BUILD_LIB_WIXHELPER) JPACKAGE_MSIWRAPPER_SRC := \ - $(call FindSrcDirsForComponent, jdk.incubator.jpackage, msiwrapper) \ - $(call FindSrcDirsForComponent, jdk.incubator.jpackage, common) + $(call FindSrcDirsForComponent, jdk.jpackage, msiwrapper) \ + $(call FindSrcDirsForComponent, jdk.jpackage, common) # Build exe installer wrapper for msi installer $(eval $(call SetupJdkExecutable, BUILD_JPACKAGE_MSIWRAPPER, \ diff --git a/make/scripts/compare.sh b/make/scripts/compare.sh index 25630199a21..5d0e846e755 100644 --- a/make/scripts/compare.sh +++ b/make/scripts/compare.sh @@ -696,7 +696,7 @@ compare_bin_file() { # pdb files. PDB_DIRS="$(ls -d \ {$OTHER,$THIS}/support/modules_{cmds,libs}/{*,*/*} \ - {$OTHER,$THIS}/support/native/jdk.incubator.jpackage/* \ + {$OTHER,$THIS}/support/native/jdk.jpackage/* \ )" export _NT_SYMBOL_PATH="$(echo $PDB_DIRS | tr ' ' ';')" fi diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java index 12ea481767e..9d0ae93b470 100644 --- a/src/java.base/share/classes/module-info.java +++ b/src/java.base/share/classes/module-info.java @@ -209,7 +209,7 @@ module java.base { jdk.jartool, jdk.jfr, jdk.jlink, - jdk.incubator.jpackage; + jdk.jpackage; exports jdk.internal.perf to java.management, jdk.management.agent, diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/DesktopIntegration.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.java similarity index 96% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/DesktopIntegration.java rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.java index 9396bfb93c3..9311d9dc282 100644 --- a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/DesktopIntegration.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.awt.image.BufferedImage; import java.io.BufferedReader; @@ -46,16 +46,16 @@ import java.util.stream.Stream; import javax.imageio.ImageIO; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import jdk.incubator.jpackage.internal.Arguments.CLIOptions; -import static jdk.incubator.jpackage.internal.LinuxAppImageBuilder.DEFAULT_ICON; -import static jdk.incubator.jpackage.internal.LinuxAppImageBuilder.ICON_PNG; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.DESCRIPTION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ICON; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; +import jdk.jpackage.internal.Arguments.CLIOptions; +import static jdk.jpackage.internal.LinuxAppImageBuilder.DEFAULT_ICON; +import static jdk.jpackage.internal.LinuxAppImageBuilder.ICON_PNG; +import static jdk.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION; +import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS; +import static jdk.jpackage.internal.StandardBundlerParam.ICON; +import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; /** * Helper to create files for desktop integration. diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LibProvidersLookup.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LibProvidersLookup.java similarity index 91% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LibProvidersLookup.java rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LibProvidersLookup.java index aa0b3bbf852..10df465a0fb 100644 --- a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LibProvidersLookup.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LibProvidersLookup.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Files; @@ -153,17 +153,17 @@ final public class LibProvidersLookup { // // Typical ldd output: // - // ldd: warning: you do not have execution permission for `/tmp/jdk.incubator.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libawt_headless.so' + // ldd: warning: you do not have execution permission for `/tmp/jdk.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libawt_headless.so' // linux-vdso.so.1 => (0x00007ffce6bfd000) - // libawt.so => /tmp/jdk.incubator.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libawt.so (0x00007f4e00c75000) + // libawt.so => /tmp/jdk.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libawt.so (0x00007f4e00c75000) // libjvm.so => not found - // libjava.so => /tmp/jdk.incubator.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libjava.so (0x00007f4e00c41000) + // libjava.so => /tmp/jdk.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libjava.so (0x00007f4e00c41000) // libm.so.6 => /lib64/libm.so.6 (0x00007f4e00834000) // libdl.so.2 => /lib64/libdl.so.2 (0x00007f4e00630000) // libc.so.6 => /lib64/libc.so.6 (0x00007f4e00262000) // libjvm.so => not found // libjvm.so => not found - // libverify.so => /tmp/jdk.incubator.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libverify.so (0x00007f4e00c2e000) + // libverify.so => /tmp/jdk.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libverify.so (0x00007f4e00c2e000) // /lib64/ld-linux-x86-64.so.2 (0x00007f4e00b36000) // libjvm.so => not found // diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxAppBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java similarity index 97% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxAppBundler.java rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java index 1978db0fd6e..9a308155f78 100644 --- a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxAppBundler.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; public class LinuxAppBundler extends AppImageBundler { public LinuxAppBundler() { diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxAppImageBuilder.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java similarity index 94% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxAppImageBuilder.java rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java index 0afca510b09..b5d602afe65 100644 --- a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxAppImageBuilder.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.io.InputStream; @@ -32,9 +32,9 @@ import java.nio.file.Path; import java.text.MessageFormat; import java.util.List; import java.util.Map; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ICON; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.ICON; +import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; public class LinuxAppImageBuilder extends AbstractAppImageBuilder { diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxDebBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java similarity index 97% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxDebBundler.java rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java index e79de26b4e1..3732193a20b 100644 --- a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxDebBundler.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.FileVisitResult; @@ -45,13 +45,13 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.RELEASE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VENDOR; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.LICENSE_FILE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.COPYRIGHT; +import static jdk.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.StandardBundlerParam.RELEASE; +import static jdk.jpackage.internal.StandardBundlerParam.VENDOR; +import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE; +import static jdk.jpackage.internal.StandardBundlerParam.COPYRIGHT; public class LinuxDebBundler extends LinuxPackageBundler { diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxPackageBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java similarity index 95% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxPackageBundler.java rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java index 622d93dab35..e2e03087717 100644 --- a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxPackageBundler.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackageBundler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.InvalidPathException; @@ -40,13 +40,13 @@ import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; -import static jdk.incubator.jpackage.internal.DesktopIntegration.*; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.RELEASE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VENDOR; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.DESCRIPTION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.INSTALL_DIR; +import static jdk.jpackage.internal.DesktopIntegration.*; +import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.StandardBundlerParam.RELEASE; +import static jdk.jpackage.internal.StandardBundlerParam.VENDOR; +import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION; +import static jdk.jpackage.internal.StandardBundlerParam.INSTALL_DIR; abstract class LinuxPackageBundler extends AbstractBundler { diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxRpmBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java similarity index 96% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxRpmBundler.java rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java index 4ddddf0ae91..ac33836579e 100644 --- a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxRpmBundler.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Path; @@ -37,12 +37,12 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.LICENSE_FILE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.RELEASE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.TEMP_ROOT; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.StandardBundlerParam.RELEASE; +import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT; +import static jdk.jpackage.internal.OverridableResource.createResource; /** * There are two command line options to configure license information for RPM diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/PackageProperty.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/PackageProperty.java similarity index 98% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/PackageProperty.java rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/PackageProperty.java index 8d2f2ffef88..b9f43b93742 100644 --- a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/PackageProperty.java +++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/PackageProperty.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.text.MessageFormat; diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources.properties rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources_ja.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources_ja.properties rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources_zh_CN.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources_zh_CN.properties rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/java32.png b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/java32.png similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/java32.png rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/java32.png diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.control b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.control similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.control rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.control diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.copyright b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.copyright similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.copyright rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.copyright diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.desktop b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.desktop similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.desktop rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.desktop diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.postinst b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.postinst similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.postinst rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.postinst diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.postrm b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.postrm similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.postrm rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.postrm diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.preinst b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.preinst similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.preinst rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.preinst diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.prerm b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.prerm similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.prerm rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.prerm diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.spec b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.spec similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/template.spec rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.spec diff --git a/src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/utils.sh b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/utils.sh similarity index 100% rename from src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/utils.sh rename to src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/utils.sh diff --git a/src/jdk.incubator.jpackage/windows/classes/module-info.java.extra b/src/jdk.jpackage/linux/classes/module-info.java.extra similarity index 85% rename from src/jdk.incubator.jpackage/windows/classes/module-info.java.extra rename to src/jdk.jpackage/linux/classes/module-info.java.extra index 6e34520b6d1..d32314b0429 100644 --- a/src/jdk.incubator.jpackage/windows/classes/module-info.java.extra +++ b/src/jdk.jpackage/linux/classes/module-info.java.extra @@ -23,8 +23,8 @@ * questions. */ -provides jdk.incubator.jpackage.internal.Bundler with - jdk.incubator.jpackage.internal.WinAppBundler, - jdk.incubator.jpackage.internal.WinExeBundler, - jdk.incubator.jpackage.internal.WinMsiBundler; +provides jdk.jpackage.internal.Bundler with + jdk.jpackage.internal.LinuxAppBundler, + jdk.jpackage.internal.LinuxDebBundler, + jdk.jpackage.internal.LinuxRpmBundler; diff --git a/src/jdk.incubator.jpackage/linux/native/applauncher/Executor.cpp b/src/jdk.jpackage/linux/native/applauncher/Executor.cpp similarity index 100% rename from src/jdk.incubator.jpackage/linux/native/applauncher/Executor.cpp rename to src/jdk.jpackage/linux/native/applauncher/Executor.cpp diff --git a/src/jdk.incubator.jpackage/linux/native/applauncher/Executor.h b/src/jdk.jpackage/linux/native/applauncher/Executor.h similarity index 100% rename from src/jdk.incubator.jpackage/linux/native/applauncher/Executor.h rename to src/jdk.jpackage/linux/native/applauncher/Executor.h diff --git a/src/jdk.incubator.jpackage/linux/native/applauncher/LinuxLauncher.cpp b/src/jdk.jpackage/linux/native/applauncher/LinuxLauncher.cpp similarity index 100% rename from src/jdk.incubator.jpackage/linux/native/applauncher/LinuxLauncher.cpp rename to src/jdk.jpackage/linux/native/applauncher/LinuxLauncher.cpp diff --git a/src/jdk.incubator.jpackage/linux/native/applauncher/Package.cpp b/src/jdk.jpackage/linux/native/applauncher/Package.cpp similarity index 100% rename from src/jdk.incubator.jpackage/linux/native/applauncher/Package.cpp rename to src/jdk.jpackage/linux/native/applauncher/Package.cpp diff --git a/src/jdk.incubator.jpackage/linux/native/applauncher/Package.h b/src/jdk.jpackage/linux/native/applauncher/Package.h similarity index 100% rename from src/jdk.incubator.jpackage/linux/native/applauncher/Package.h rename to src/jdk.jpackage/linux/native/applauncher/Package.h diff --git a/src/jdk.incubator.jpackage/linux/native/common/LinuxSysInfo.cpp b/src/jdk.jpackage/linux/native/common/LinuxSysInfo.cpp similarity index 100% rename from src/jdk.incubator.jpackage/linux/native/common/LinuxSysInfo.cpp rename to src/jdk.jpackage/linux/native/common/LinuxSysInfo.cpp diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/CFBundleVersion.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/CFBundleVersion.java similarity index 98% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/CFBundleVersion.java rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/CFBundleVersion.java index a144f0f29e3..61bedfb8e67 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/CFBundleVersion.java +++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/CFBundleVersion.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.math.BigInteger; diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java similarity index 92% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppBundler.java rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java index aba31acbd71..e7054c4c122 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppBundler.java +++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java @@ -23,17 +23,17 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.text.MessageFormat; import java.util.Map; import java.util.Optional; -import static jdk.incubator.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN; -import static jdk.incubator.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEY_USER; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.MAIN_CLASS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERBOSE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN; +import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEY_USER; +import static jdk.jpackage.internal.StandardBundlerParam.MAIN_CLASS; +import static jdk.jpackage.internal.StandardBundlerParam.VERBOSE; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; public class MacAppBundler extends AppImageBundler { public MacAppBundler() { diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppImageBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java similarity index 95% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppImageBuilder.java rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java index 3f51bc824ce..82ba22ac344 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppImageBuilder.java +++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.io.InputStream; @@ -49,28 +49,28 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathFactory; -import static jdk.incubator.jpackage.internal.MacAppBundler.BUNDLE_ID_SIGNING_PREFIX; -import static jdk.incubator.jpackage.internal.MacAppBundler.DEVELOPER_ID_APP_SIGNING_KEY; -import static jdk.incubator.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.COPYRIGHT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_CONTENT_TYPE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_DESCRIPTION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_EXTENSIONS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_ICON; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ICON; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.MAIN_CLASS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; +import static jdk.jpackage.internal.MacAppBundler.BUNDLE_ID_SIGNING_PREFIX; +import static jdk.jpackage.internal.MacAppBundler.DEVELOPER_ID_APP_SIGNING_KEY; +import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN; +import static jdk.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; +import static jdk.jpackage.internal.StandardBundlerParam.COPYRIGHT; +import static jdk.jpackage.internal.StandardBundlerParam.FA_CONTENT_TYPE; +import static jdk.jpackage.internal.StandardBundlerParam.FA_DESCRIPTION; +import static jdk.jpackage.internal.StandardBundlerParam.FA_EXTENSIONS; +import static jdk.jpackage.internal.StandardBundlerParam.FA_ICON; +import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS; +import static jdk.jpackage.internal.StandardBundlerParam.ICON; +import static jdk.jpackage.internal.StandardBundlerParam.MAIN_CLASS; +import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; public class MacAppImageBuilder extends AbstractAppImageBuilder { private static final ResourceBundle I18N = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.MacResources"); + "jdk.jpackage.internal.resources.MacResources"); private static final String TEMPLATE_BUNDLE_ICON = "java.icns"; private static final String OS_TYPE_CODE = "APPL"; diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppStoreBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppStoreBundler.java similarity index 94% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppStoreBundler.java rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppStoreBundler.java index 44e7ecf0581..8dcbdd8b765 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppStoreBundler.java +++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppStoreBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.nio.file.Files; import java.nio.file.Path; @@ -35,16 +35,16 @@ import java.util.Objects; import java.util.Optional; import java.util.ResourceBundle; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERBOSE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.MacAppBundler.DEVELOPER_ID_APP_SIGNING_KEY; -import static jdk.incubator.jpackage.internal.MacAppBundler.DEFAULT_ICNS_ICON; -import static jdk.incubator.jpackage.internal.MacAppBundler.BUNDLE_ID_SIGNING_PREFIX; +import static jdk.jpackage.internal.StandardBundlerParam.VERBOSE; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.MacAppBundler.DEVELOPER_ID_APP_SIGNING_KEY; +import static jdk.jpackage.internal.MacAppBundler.DEFAULT_ICNS_ICON; +import static jdk.jpackage.internal.MacAppBundler.BUNDLE_ID_SIGNING_PREFIX; public class MacAppStoreBundler extends MacBaseInstallerBundler { private static final ResourceBundle I18N = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.MacResources"); + "jdk.jpackage.internal.resources.MacResources"); private static final String TEMPLATE_BUNDLE_ICON_HIDPI = "java.icns"; diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacBaseInstallerBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java similarity index 95% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacBaseInstallerBundler.java rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java index 1d7c999ba2d..4d38cd3e167 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacBaseInstallerBundler.java +++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -36,10 +36,10 @@ import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.INSTALL_DIR; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.INSTALL_DIR; +import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; public abstract class MacBaseInstallerBundler extends AbstractBundler { diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacCertificate.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificate.java similarity index 99% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacCertificate.java rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificate.java index b1c0ec78bca..75dd82c8ff0 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacCertificate.java +++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacCertificate.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java similarity index 96% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java index 2973731010f..32b5c261097 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java +++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.BufferedReader; import java.io.File; @@ -37,20 +37,20 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; import java.util.ResourceBundle; -import static jdk.incubator.jpackage.internal.MacAppImageBuilder.ICON_ICNS; -import static jdk.incubator.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.MacAppImageBuilder.ICON_ICNS; +import static jdk.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER; +import static jdk.jpackage.internal.OverridableResource.createResource; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.LICENSE_FILE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.TEMP_ROOT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERBOSE; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; +import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE; +import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT; +import static jdk.jpackage.internal.StandardBundlerParam.VERBOSE; public class MacDmgBundler extends MacBaseInstallerBundler { private static final ResourceBundle I18N = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.MacResources"); + "jdk.jpackage.internal.resources.MacResources"); // Background image name in resources static final String DEFAULT_BACKGROUND_IMAGE = "background_dmg.tiff"; diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacPkgBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java similarity index 96% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacPkgBundler.java rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java index 5b5b8189234..27b74a10641 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacPkgBundler.java +++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.io.PrintWriter; @@ -40,21 +40,21 @@ import java.util.Objects; import java.util.Optional; import java.util.ResourceBundle; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.TEMP_ROOT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERBOSE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.LICENSE_FILE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; -import static jdk.incubator.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN; -import static jdk.incubator.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEY_USER; -import static jdk.incubator.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; +import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT; +import static jdk.jpackage.internal.StandardBundlerParam.VERBOSE; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEYCHAIN; +import static jdk.jpackage.internal.MacBaseInstallerBundler.SIGNING_KEY_USER; +import static jdk.jpackage.internal.MacAppImageBuilder.MAC_CF_BUNDLE_IDENTIFIER; +import static jdk.jpackage.internal.OverridableResource.createResource; public class MacPkgBundler extends MacBaseInstallerBundler { private static final ResourceBundle I18N = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.MacResources"); + "jdk.jpackage.internal.resources.MacResources"); private static final String DEFAULT_BACKGROUND_IMAGE = "background_pkg.png"; diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/DMGsetup.scpt b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/DMGsetup.scpt similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/DMGsetup.scpt rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/DMGsetup.scpt diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/Info-lite.plist.template b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/Info-lite.plist.template similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/Info-lite.plist.template rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/Info-lite.plist.template diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources.properties rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources_ja.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources_ja.properties rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources_zh_CN.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources_zh_CN.properties rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/Runtime-Info.plist.template b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/Runtime-Info.plist.template similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/Runtime-Info.plist.template rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/Runtime-Info.plist.template diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_dmg.tiff b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/background_dmg.tiff similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_dmg.tiff rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/background_dmg.tiff diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_pkg.png b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/background_pkg.png similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_pkg.png rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/background_pkg.png diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/java.icns b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/java.icns similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/java.icns rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/java.icns diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/lic_template.plist b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/lic_template.plist similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/lic_template.plist rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/lic_template.plist diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/postinstall.template b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/postinstall.template similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/postinstall.template rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/postinstall.template diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/preinstall.template b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/preinstall.template similarity index 100% rename from src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/preinstall.template rename to src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/preinstall.template diff --git a/src/jdk.incubator.jpackage/linux/classes/module-info.java.extra b/src/jdk.jpackage/macosx/classes/module-info.java.extra similarity index 85% rename from src/jdk.incubator.jpackage/linux/classes/module-info.java.extra rename to src/jdk.jpackage/macosx/classes/module-info.java.extra index 0c2987a8bf4..158209e9796 100644 --- a/src/jdk.incubator.jpackage/linux/classes/module-info.java.extra +++ b/src/jdk.jpackage/macosx/classes/module-info.java.extra @@ -23,8 +23,9 @@ * questions. */ -provides jdk.incubator.jpackage.internal.Bundler with - jdk.incubator.jpackage.internal.LinuxAppBundler, - jdk.incubator.jpackage.internal.LinuxDebBundler, - jdk.incubator.jpackage.internal.LinuxRpmBundler; +provides jdk.jpackage.internal.Bundler with + jdk.jpackage.internal.MacAppBundler, + jdk.jpackage.internal.MacAppStoreBundler, + jdk.jpackage.internal.MacDmgBundler, + jdk.jpackage.internal.MacPkgBundler; diff --git a/src/jdk.incubator.jpackage/macosx/native/applauncher/MacLauncher.cpp b/src/jdk.jpackage/macosx/native/applauncher/MacLauncher.cpp similarity index 100% rename from src/jdk.incubator.jpackage/macosx/native/applauncher/MacLauncher.cpp rename to src/jdk.jpackage/macosx/native/applauncher/MacLauncher.cpp diff --git a/src/jdk.incubator.jpackage/macosx/native/common/MacSysInfo.cpp b/src/jdk.jpackage/macosx/native/common/MacSysInfo.cpp similarity index 100% rename from src/jdk.incubator.jpackage/macosx/native/common/MacSysInfo.cpp rename to src/jdk.jpackage/macosx/native/common/MacSysInfo.cpp diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AbstractAppImageBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java similarity index 91% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AbstractAppImageBuilder.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java index a941c66d721..da73b9a6419 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AbstractAppImageBuilder.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java @@ -23,17 +23,17 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.io.InputStream; import java.nio.file.Path; import java.util.Map; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ICON; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.SOURCE_DIR; -import jdk.incubator.jpackage.internal.resources.ResourceLocator; +import static jdk.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.ICON; +import static jdk.jpackage.internal.StandardBundlerParam.SOURCE_DIR; +import jdk.jpackage.internal.resources.ResourceLocator; /* * AbstractAppImageBuilder diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AbstractBundler.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java similarity index 98% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AbstractBundler.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java index ef2ed7433ba..b615176fd15 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AbstractBundler.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Path; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AddLauncherArguments.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AddLauncherArguments.java similarity index 97% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AddLauncherArguments.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/AddLauncherArguments.java index ade19cd2c3a..bf2107f6210 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AddLauncherArguments.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AddLauncherArguments.java @@ -23,14 +23,14 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.nio.file.Path; import java.util.HashMap; import java.util.Map; import java.util.List; -import jdk.incubator.jpackage.internal.Arguments.CLIOptions; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA; +import jdk.jpackage.internal.Arguments.CLIOptions; +import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA; /* * AddLauncherArguments diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AppImageBundler.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageBundler.java similarity index 93% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AppImageBundler.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageBundler.java index 56c0633bb07..5ee569c94e4 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AppImageBundler.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Files; @@ -32,10 +32,10 @@ import java.text.MessageFormat; import java.util.Map; import java.util.Objects; import java.util.function.Function; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE; +import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE; +import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; class AppImageBundler extends AbstractBundler { diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AppImageFile.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java similarity index 97% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AppImageFile.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java index d51f40fa825..a2b4278e47c 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AppImageFile.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AppImageFile.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Files; @@ -43,9 +43,9 @@ import org.w3c.dom.Document; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; public class AppImageFile { diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ApplicationLayout.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayout.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ApplicationLayout.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayout.java index ef2e1eef136..c725afed3a1 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ApplicationLayout.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationLayout.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.nio.file.Path; import java.util.Map; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Arguments.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java similarity index 98% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Arguments.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java index 9efcbe8cc8f..ae44d28b8f7 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Arguments.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.io.Reader; @@ -57,7 +57,7 @@ import java.util.regex.Pattern; */ public class Arguments { private static final ResourceBundle I18N = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.MainResources"); + "jdk.jpackage.internal.resources.MainResources"); private static final String FA_EXTENSIONS = "extension"; private static final String FA_CONTENT_TYPE = "mime-type"; @@ -615,12 +615,12 @@ public class Arguments { } } - private jdk.incubator.jpackage.internal.Bundler getPlatformBundler() { + private jdk.jpackage.internal.Bundler getPlatformBundler() { boolean appImage = deployParams.isTargetAppImage(); String type = deployParams.getTargetFormat(); String bundleType = (appImage ? "IMAGE" : "INSTALLER"); - for (jdk.incubator.jpackage.internal.Bundler bundler : + for (jdk.jpackage.internal.Bundler bundler : Bundlers.createBundlersInstance().getBundlers(bundleType)) { if (type == null) { if (bundler.isDefault() @@ -651,7 +651,7 @@ public class Arguments { StandardBundlerParam.TEMP_ROOT.fetchFrom(params); // determine what bundler to run - jdk.incubator.jpackage.internal.Bundler bundler = getPlatformBundler(); + jdk.jpackage.internal.Bundler bundler = getPlatformBundler(); if (bundler == null) { throw new PackagerException("ERR_InvalidInstallerType", diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BasicBundlers.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BasicBundlers.java similarity index 98% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BasicBundlers.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/BasicBundlers.java index f6ad3cbe17a..7f444fe7337 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BasicBundlers.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BasicBundlers.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.Arrays; import java.util.Collection; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BundleParams.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundleParams.java similarity index 95% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BundleParams.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundleParams.java index de56acc110b..453d6963be2 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BundleParams.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundleParams.java @@ -23,11 +23,11 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.HashMap; import java.util.Map; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; public class BundleParams { diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Bundler.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundler.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Bundler.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundler.java index be702f711ea..59916fc3ca1 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Bundler.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.nio.file.Path; import java.util.Map; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BundlerParamInfo.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java similarity index 98% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BundlerParamInfo.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java index 0db8c8cc95b..4173980002b 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/BundlerParamInfo.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.Map; import java.util.function.BiFunction; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Bundlers.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundlers.java similarity index 98% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Bundlers.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundlers.java index 88150ce4f0e..955952d563d 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Bundlers.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Bundlers.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.Collection; import java.util.Iterator; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/CLIHelp.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CLIHelp.java similarity index 97% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/CLIHelp.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/CLIHelp.java index 6f803d549b8..d9ee8d81bfd 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/CLIHelp.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CLIHelp.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.ResourceBundle; import java.io.File; @@ -38,7 +38,7 @@ import java.text.MessageFormat; public class CLIHelp { private static final ResourceBundle I18N = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.HelpResources"); + "jdk.jpackage.internal.resources.HelpResources"); // generates --help for jpackage's CLI public static void showHelp(boolean noArgs) { diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/CfgFile.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java similarity index 92% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/CfgFile.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java index 99d3f77bbfa..0826e3970a4 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/CfgFile.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.io.File; @@ -32,11 +32,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Stream; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.JAVA_OPTIONS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ARGUMENTS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.StandardBundlerParam.LAUNCHER_DATA; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.JAVA_OPTIONS; +import static jdk.jpackage.internal.StandardBundlerParam.ARGUMENTS; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; /** * App launcher's config file. diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ConfigException.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ConfigException.java similarity index 97% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ConfigException.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/ConfigException.java index 8dba7bd383c..5a43fbe93fe 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ConfigException.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ConfigException.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; public class ConfigException extends Exception { private static final long serialVersionUID = 1L; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/DeployParams.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/DeployParams.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java index 2c54a089ce5..0783c327e11 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/DeployParams.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.File; import java.io.IOException; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/DottedVersion.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DottedVersion.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/DottedVersion.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/DottedVersion.java index 8ade9a28ace..652c90ae1e6 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/DottedVersion.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DottedVersion.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.math.BigInteger; import java.text.MessageFormat; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Executor.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Executor.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Executor.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/Executor.java index 0ada00dec68..320a63190b5 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Executor.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Executor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/FileAssociation.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociation.java similarity index 88% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/FileAssociation.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociation.java index b4b9be9f150..7f8ff7fa168 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/FileAssociation.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FileAssociation.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.nio.file.Path; import java.text.MessageFormat; @@ -33,12 +33,12 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_EXTENSIONS; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_CONTENT_TYPE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_ICON; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.FA_DESCRIPTION; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS; +import static jdk.jpackage.internal.StandardBundlerParam.FA_EXTENSIONS; +import static jdk.jpackage.internal.StandardBundlerParam.FA_CONTENT_TYPE; +import static jdk.jpackage.internal.StandardBundlerParam.FA_ICON; +import static jdk.jpackage.internal.StandardBundlerParam.FA_DESCRIPTION; final class FileAssociation { void verify() { diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/I18N.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/I18N.java similarity index 84% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/I18N.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/I18N.java index dac2e930c85..f349b71126e 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/I18N.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/I18N.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.ResourceBundle; @@ -36,20 +36,20 @@ class I18N { } private static final ResourceBundle SHARED = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.MainResources"); + "jdk.jpackage.internal.resources.MainResources"); private static final ResourceBundle PLATFORM; static { if (Platform.isLinux()) { PLATFORM = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.LinuxResources"); + "jdk.jpackage.internal.resources.LinuxResources"); } else if (Platform.isWindows()) { PLATFORM = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.WinResources"); + "jdk.jpackage.internal.resources.WinResources"); } else if (Platform.isMac()) { PLATFORM = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.MacResources"); + "jdk.jpackage.internal.resources.MacResources"); } else { throw new IllegalStateException("Unknwon platform"); } diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/IOUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/IOUtils.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/IOUtils.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/IOUtils.java index 27ae1f175b9..414ae2275ee 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/IOUtils.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/IOUtils.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/JLinkBundlerHelper.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/JLinkBundlerHelper.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java index cbd9eda8d43..343c469f931 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/JLinkBundlerHelper.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.File; import java.io.IOException; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/JPackageToolProvider.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JPackageToolProvider.java similarity index 93% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/JPackageToolProvider.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/JPackageToolProvider.java index e4d18a4656f..18f7f5df21a 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/JPackageToolProvider.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/JPackageToolProvider.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.PrintWriter; import java.util.spi.ToolProvider; @@ -43,7 +43,7 @@ public class JPackageToolProvider implements ToolProvider { public synchronized int run( PrintWriter out, PrintWriter err, String... args) { try { - return new jdk.incubator.jpackage.main.Main().execute(out, err, args); + return new jdk.jpackage.main.Main().execute(out, err, args); } catch (RuntimeException re) { Log.fatalError(re.getMessage()); Log.verbose(re); diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/LauncherData.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/LauncherData.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java index ef9d36854f3..2541ffdc20a 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/LauncherData.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.File; import java.io.IOException; @@ -46,7 +46,7 @@ import java.util.jar.JarFile; import java.util.jar.Manifest; import java.util.stream.Collectors; import java.util.stream.Stream; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE; +import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_RUNTIME_IMAGE; /** * Extracts data needed to run application from parameters. diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Log.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Log.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Log.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/Log.java index e1e6b1bff05..c20066075d2 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Log.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Log.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.PrintWriter; import java.text.SimpleDateFormat; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/OverridableResource.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OverridableResource.java similarity index 97% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/OverridableResource.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/OverridableResource.java index c29a8b63840..23ed0ee7477 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/OverridableResource.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OverridableResource.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -42,8 +42,8 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.RESOURCE_DIR; -import jdk.incubator.jpackage.internal.resources.ResourceLocator; +import static jdk.jpackage.internal.StandardBundlerParam.RESOURCE_DIR; +import jdk.jpackage.internal.resources.ResourceLocator; /** @@ -52,7 +52,7 @@ import jdk.incubator.jpackage.internal.resources.ResourceLocator; * jpackage parameter. * * Resource has default name and public name. Default name is the name of a file - * in {@code jdk.incubator.jpackage.internal.resources} package that provides the default + * in {@code jdk.jpackage.internal.resources} package that provides the default * value of the resource. * * Public name is a path relative to resource directory to a file with custom diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PackagerException.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagerException.java similarity index 94% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PackagerException.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagerException.java index e5414b23188..b5f514ae1ab 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PackagerException.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagerException.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.text.MessageFormat; import java.util.ResourceBundle; @@ -31,7 +31,7 @@ import java.util.ResourceBundle; public class PackagerException extends Exception { private static final long serialVersionUID = 1L; private static final ResourceBundle bundle = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.MainResources"); + "jdk.jpackage.internal.resources.MainResources"); public PackagerException(Throwable cause) { super(cause); diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PathGroup.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PathGroup.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PathGroup.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/PathGroup.java index d7e332f3fbf..2cb44db59f9 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PathGroup.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PathGroup.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Files; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Platform.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Platform.java similarity index 98% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Platform.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/Platform.java index 7b03b36fe4d..5849c1777ac 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Platform.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Platform.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.regex.Pattern; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PlatformPackage.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PlatformPackage.java similarity index 97% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PlatformPackage.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/PlatformPackage.java index 54aa2333df4..6102e24c015 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/PlatformPackage.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PlatformPackage.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.nio.file.Path; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/RetryExecutor.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/RetryExecutor.java similarity index 98% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/RetryExecutor.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/RetryExecutor.java index 2370389d52b..dfa75b217af 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/RetryExecutor.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/RetryExecutor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.util.function.Consumer; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ScriptRunner.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ScriptRunner.java similarity index 92% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ScriptRunner.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/ScriptRunner.java index 9d6f037b400..47fe75da4bc 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ScriptRunner.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ScriptRunner.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Files; @@ -31,9 +31,9 @@ import java.nio.file.Path; import java.util.Map; import java.util.Objects; import java.util.Optional; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; +import static jdk.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; /** * Runs custom script from resource directory. diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/StandardBundlerParam.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/StandardBundlerParam.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java index 173e5183f94..ec8ede14dc4 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/StandardBundlerParam.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.File; import java.io.IOException; @@ -235,7 +235,7 @@ class StandardBundlerParam extends BundlerParamInfo { Path.class, params -> { try { - return Files.createTempDirectory("jdk.incubator.jpackage"); + return Files.createTempDirectory("jdk.jpackage"); } catch (IOException ioe) { return null; } diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ToolValidator.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ToolValidator.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ToolValidator.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/ToolValidator.java index 497d46e19be..04519ca710a 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ToolValidator.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ToolValidator.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Path; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ValidOptions.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java similarity index 98% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ValidOptions.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java index de56d448473..5fb8a68fbe2 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ValidOptions.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.HashMap; -import jdk.incubator.jpackage.internal.Arguments.CLIOptions; +import jdk.jpackage.internal.Arguments.CLIOptions; /** * ValidOptions diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties similarity index 100% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources.properties rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources_ja.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties similarity index 100% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources_ja.properties rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources_zh_CN.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties similarity index 100% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources_zh_CN.properties rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties similarity index 100% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources.properties rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources_ja.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties similarity index 100% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources_ja.properties rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources_zh_CN.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties similarity index 100% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources_zh_CN.properties rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/ResourceLocator.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/ResourceLocator.java similarity index 96% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/ResourceLocator.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/ResourceLocator.java index c51d1daf425..dfb5da7f829 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/ResourceLocator.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/ResourceLocator.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal.resources; +package jdk.jpackage.internal.resources; /* * ResourceLocator diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/main/CommandLine.java b/src/jdk.jpackage/share/classes/jdk/jpackage/main/CommandLine.java similarity index 99% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/main/CommandLine.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/main/CommandLine.java index 08ebc23f8fa..e9ab994624b 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/main/CommandLine.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/main/CommandLine.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.main; +package jdk.jpackage.main; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/main/Main.java b/src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java similarity index 92% rename from src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/main/Main.java rename to src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java index 7cf25e872c6..1381902f52a 100644 --- a/src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/main/Main.java +++ b/src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java @@ -23,11 +23,11 @@ * questions. */ -package jdk.incubator.jpackage.main; +package jdk.jpackage.main; -import jdk.incubator.jpackage.internal.Arguments; -import jdk.incubator.jpackage.internal.Log; -import jdk.incubator.jpackage.internal.CLIHelp; +import jdk.jpackage.internal.Arguments; +import jdk.jpackage.internal.Log; +import jdk.jpackage.internal.CLIHelp; import java.io.PrintWriter; import java.util.ResourceBundle; import java.io.FileNotFoundException; @@ -37,7 +37,7 @@ import java.text.MessageFormat; public class Main { private static final ResourceBundle I18N = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.MainResources"); + "jdk.jpackage.internal.resources.MainResources"); /** * main(String... args) @@ -49,7 +49,7 @@ public class Main { // Create logger with default system.out and system.err Log.setLogger(null); - int status = new jdk.incubator.jpackage.main.Main().execute(args); + int status = new jdk.jpackage.main.Main().execute(args); System.exit(status); } diff --git a/src/jdk.incubator.jpackage/share/classes/module-info.java b/src/jdk.jpackage/share/classes/module-info.java similarity index 86% rename from src/jdk.incubator.jpackage/share/classes/module-info.java rename to src/jdk.jpackage/share/classes/module-info.java index 1b516403a71..475daa0bd56 100644 --- a/src/jdk.incubator.jpackage/share/classes/module-info.java +++ b/src/jdk.jpackage/share/classes/module-info.java @@ -43,20 +43,20 @@ * * * @moduleGraph - * @since 14 + * @since 16 */ -module jdk.incubator.jpackage { +module jdk.jpackage { requires jdk.jlink; requires java.desktop; - uses jdk.incubator.jpackage.internal.Bundler; - uses jdk.incubator.jpackage.internal.Bundlers; + uses jdk.jpackage.internal.Bundler; + uses jdk.jpackage.internal.Bundlers; - provides jdk.incubator.jpackage.internal.Bundlers with - jdk.incubator.jpackage.internal.BasicBundlers; + provides jdk.jpackage.internal.Bundlers with + jdk.jpackage.internal.BasicBundlers; provides java.util.spi.ToolProvider - with jdk.incubator.jpackage.internal.JPackageToolProvider; + with jdk.jpackage.internal.JPackageToolProvider; } diff --git a/src/jdk.incubator.jpackage/share/man/jpackage.1 b/src/jdk.jpackage/share/man/jpackage.1 similarity index 100% rename from src/jdk.incubator.jpackage/share/man/jpackage.1 rename to src/jdk.jpackage/share/man/jpackage.1 diff --git a/src/jdk.incubator.jpackage/share/native/applauncher/AppLauncher.cpp b/src/jdk.jpackage/share/native/applauncher/AppLauncher.cpp similarity index 100% rename from src/jdk.incubator.jpackage/share/native/applauncher/AppLauncher.cpp rename to src/jdk.jpackage/share/native/applauncher/AppLauncher.cpp diff --git a/src/jdk.incubator.jpackage/share/native/applauncher/AppLauncher.h b/src/jdk.jpackage/share/native/applauncher/AppLauncher.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/applauncher/AppLauncher.h rename to src/jdk.jpackage/share/native/applauncher/AppLauncher.h diff --git a/src/jdk.incubator.jpackage/share/native/applauncher/CfgFile.cpp b/src/jdk.jpackage/share/native/applauncher/CfgFile.cpp similarity index 100% rename from src/jdk.incubator.jpackage/share/native/applauncher/CfgFile.cpp rename to src/jdk.jpackage/share/native/applauncher/CfgFile.cpp diff --git a/src/jdk.incubator.jpackage/share/native/applauncher/CfgFile.h b/src/jdk.jpackage/share/native/applauncher/CfgFile.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/applauncher/CfgFile.h rename to src/jdk.jpackage/share/native/applauncher/CfgFile.h diff --git a/src/jdk.incubator.jpackage/share/native/applauncher/JvmLauncher.cpp b/src/jdk.jpackage/share/native/applauncher/JvmLauncher.cpp similarity index 100% rename from src/jdk.incubator.jpackage/share/native/applauncher/JvmLauncher.cpp rename to src/jdk.jpackage/share/native/applauncher/JvmLauncher.cpp diff --git a/src/jdk.incubator.jpackage/share/native/applauncher/JvmLauncher.h b/src/jdk.jpackage/share/native/applauncher/JvmLauncher.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/applauncher/JvmLauncher.h rename to src/jdk.jpackage/share/native/applauncher/JvmLauncher.h diff --git a/src/jdk.incubator.jpackage/share/native/common/Dll.h b/src/jdk.jpackage/share/native/common/Dll.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/Dll.h rename to src/jdk.jpackage/share/native/common/Dll.h diff --git a/src/jdk.incubator.jpackage/share/native/common/ErrorHandling.cpp b/src/jdk.jpackage/share/native/common/ErrorHandling.cpp similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/ErrorHandling.cpp rename to src/jdk.jpackage/share/native/common/ErrorHandling.cpp diff --git a/src/jdk.incubator.jpackage/share/native/common/ErrorHandling.h b/src/jdk.jpackage/share/native/common/ErrorHandling.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/ErrorHandling.h rename to src/jdk.jpackage/share/native/common/ErrorHandling.h diff --git a/src/jdk.incubator.jpackage/share/native/common/FileUtils.cpp b/src/jdk.jpackage/share/native/common/FileUtils.cpp similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/FileUtils.cpp rename to src/jdk.jpackage/share/native/common/FileUtils.cpp diff --git a/src/jdk.incubator.jpackage/share/native/common/FileUtils.h b/src/jdk.jpackage/share/native/common/FileUtils.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/FileUtils.h rename to src/jdk.jpackage/share/native/common/FileUtils.h diff --git a/src/jdk.incubator.jpackage/share/native/common/Log.cpp b/src/jdk.jpackage/share/native/common/Log.cpp similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/Log.cpp rename to src/jdk.jpackage/share/native/common/Log.cpp diff --git a/src/jdk.incubator.jpackage/share/native/common/Log.h b/src/jdk.jpackage/share/native/common/Log.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/Log.h rename to src/jdk.jpackage/share/native/common/Log.h diff --git a/src/jdk.incubator.jpackage/share/native/common/SourceCodePos.h b/src/jdk.jpackage/share/native/common/SourceCodePos.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/SourceCodePos.h rename to src/jdk.jpackage/share/native/common/SourceCodePos.h diff --git a/src/jdk.incubator.jpackage/share/native/common/SysInfo.h b/src/jdk.jpackage/share/native/common/SysInfo.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/SysInfo.h rename to src/jdk.jpackage/share/native/common/SysInfo.h diff --git a/src/jdk.incubator.jpackage/share/native/common/Toolbox.h b/src/jdk.jpackage/share/native/common/Toolbox.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/Toolbox.h rename to src/jdk.jpackage/share/native/common/Toolbox.h diff --git a/src/jdk.incubator.jpackage/share/native/common/kludge_c++11.h b/src/jdk.jpackage/share/native/common/kludge_c++11.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/kludge_c++11.h rename to src/jdk.jpackage/share/native/common/kludge_c++11.h diff --git a/src/jdk.incubator.jpackage/share/native/common/tstrings.cpp b/src/jdk.jpackage/share/native/common/tstrings.cpp similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/tstrings.cpp rename to src/jdk.jpackage/share/native/common/tstrings.cpp diff --git a/src/jdk.incubator.jpackage/share/native/common/tstrings.h b/src/jdk.jpackage/share/native/common/tstrings.h similarity index 100% rename from src/jdk.incubator.jpackage/share/native/common/tstrings.h rename to src/jdk.jpackage/share/native/common/tstrings.h diff --git a/src/jdk.incubator.jpackage/unix/native/common/PlatformLogEvent.cpp b/src/jdk.jpackage/unix/native/common/PlatformLogEvent.cpp similarity index 100% rename from src/jdk.incubator.jpackage/unix/native/common/PlatformLogEvent.cpp rename to src/jdk.jpackage/unix/native/common/PlatformLogEvent.cpp diff --git a/src/jdk.incubator.jpackage/unix/native/common/PlatformLogEvent.h b/src/jdk.jpackage/unix/native/common/PlatformLogEvent.h similarity index 100% rename from src/jdk.incubator.jpackage/unix/native/common/PlatformLogEvent.h rename to src/jdk.jpackage/unix/native/common/PlatformLogEvent.h diff --git a/src/jdk.incubator.jpackage/unix/native/common/UnixDll.cpp b/src/jdk.jpackage/unix/native/common/UnixDll.cpp similarity index 100% rename from src/jdk.incubator.jpackage/unix/native/common/UnixDll.cpp rename to src/jdk.jpackage/unix/native/common/UnixDll.cpp diff --git a/src/jdk.incubator.jpackage/unix/native/common/UnixFileUtils.cpp b/src/jdk.jpackage/unix/native/common/UnixFileUtils.cpp similarity index 100% rename from src/jdk.incubator.jpackage/unix/native/common/UnixFileUtils.cpp rename to src/jdk.jpackage/unix/native/common/UnixFileUtils.cpp diff --git a/src/jdk.incubator.jpackage/unix/native/common/UnixSysInfo.cpp b/src/jdk.jpackage/unix/native/common/UnixSysInfo.cpp similarity index 100% rename from src/jdk.incubator.jpackage/unix/native/common/UnixSysInfo.cpp rename to src/jdk.jpackage/unix/native/common/UnixSysInfo.cpp diff --git a/src/jdk.incubator.jpackage/unix/native/common/UnixSysInfo.h b/src/jdk.jpackage/unix/native/common/UnixSysInfo.h similarity index 100% rename from src/jdk.incubator.jpackage/unix/native/common/UnixSysInfo.h rename to src/jdk.jpackage/unix/native/common/UnixSysInfo.h diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/ExecutableRebrander.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/ExecutableRebrander.java similarity index 92% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/ExecutableRebrander.java rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/ExecutableRebrander.java index 53af7209d4d..cec106cdd24 100644 --- a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/ExecutableRebrander.java +++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/ExecutableRebrander.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -38,18 +38,18 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.ResourceBundle; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.COPYRIGHT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.DESCRIPTION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.TEMP_ROOT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VENDOR; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.COPYRIGHT; +import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION; +import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT; +import static jdk.jpackage.internal.StandardBundlerParam.VENDOR; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; final class ExecutableRebrander { private static final ResourceBundle I18N = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.WinResources"); + "jdk.jpackage.internal.resources.WinResources"); private static final String LAUNCHER_PROPERTIES_TEMPLATE = "WinLauncher.template"; diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/MsiVersion.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/MsiVersion.java similarity index 98% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/MsiVersion.java rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/MsiVersion.java index 6d8bba3aa30..90a56f38066 100644 --- a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/MsiVersion.java +++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/MsiVersion.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.math.BigInteger; diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinAppBundler.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java similarity index 97% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinAppBundler.java rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java index 58a9dddceb6..16ae11e1f4a 100644 --- a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinAppBundler.java +++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; public class WinAppBundler extends AppImageBundler { public WinAppBundler() { diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinExeBundler.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java similarity index 99% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinExeBundler.java rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java index b72cf6d1164..96971193957 100644 --- a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinExeBundler.java +++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.io.InputStream; diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinMsiBundler.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java similarity index 96% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinMsiBundler.java rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java index b01455e5acb..8ff2df9998c 100644 --- a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinMsiBundler.java +++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.io.InputStream; @@ -54,15 +54,15 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import static jdk.incubator.jpackage.internal.OverridableResource.createResource; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.DESCRIPTION; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.LICENSE_FILE; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.RESOURCE_DIR; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.TEMP_ROOT; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VENDOR; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.OverridableResource.createResource; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.CONFIG_ROOT; +import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION; +import static jdk.jpackage.internal.StandardBundlerParam.LICENSE_FILE; +import static jdk.jpackage.internal.StandardBundlerParam.RESOURCE_DIR; +import static jdk.jpackage.internal.StandardBundlerParam.TEMP_ROOT; +import static jdk.jpackage.internal.StandardBundlerParam.VENDOR; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; import org.w3c.dom.Document; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; @@ -84,7 +84,7 @@ import org.xml.sax.SAXException; * *

* main.wxs file is a copy of main.wxs resource from - * jdk.incubator.jpackage.internal.resources package. It is parametrized with the + * jdk.jpackage.internal.resources package. It is parametrized with the * following WiX variables: *

    *
  • JpAppName. Name of the application. Set to the value of --name command diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WindowsAppImageBuilder.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsAppImageBuilder.java similarity index 93% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WindowsAppImageBuilder.java rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsAppImageBuilder.java index cb34707d345..79db04d5b5b 100644 --- a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WindowsAppImageBuilder.java +++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsAppImageBuilder.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.io.InputStream; @@ -34,13 +34,13 @@ import java.util.List; import java.util.Map; import java.util.ResourceBundle; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ICON; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.ICON; +import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS; public class WindowsAppImageBuilder extends AbstractAppImageBuilder { private static final ResourceBundle I18N = ResourceBundle.getBundle( - "jdk.incubator.jpackage.internal.resources.WinResources"); + "jdk.jpackage.internal.resources.WinResources"); private static final String TEMPLATE_APP_ICON ="java48.ico"; diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WindowsDefender.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsDefender.java similarity index 98% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WindowsDefender.java rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsDefender.java index 8cc8ad45d77..9dc0e710b29 100644 --- a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WindowsDefender.java +++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsDefender.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.List; diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WindowsRegistry.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsRegistry.java similarity index 99% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WindowsRegistry.java rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsRegistry.java index f502dc03a2f..a62d9c3b687 100644 --- a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WindowsRegistry.java +++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsRegistry.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.ArrayList; import java.util.List; diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WixPipeline.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixPipeline.java similarity index 99% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WixPipeline.java rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixPipeline.java index 1cc88c63efb..eebfe052505 100644 --- a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WixPipeline.java +++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixPipeline.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Files; diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WixSourcesBuilder.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixSourcesBuilder.java similarity index 98% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WixSourcesBuilder.java rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixSourcesBuilder.java index 2193ef74054..e478cfa9c38 100644 --- a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WixSourcesBuilder.java +++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixSourcesBuilder.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -48,12 +48,12 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import jdk.incubator.jpackage.internal.IOUtils.XmlConsumer; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.INSTALL_DIR; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VENDOR; -import static jdk.incubator.jpackage.internal.StandardBundlerParam.VERSION; -import static jdk.incubator.jpackage.internal.WinMsiBundler.MSI_SYSTEM_WIDE; +import jdk.jpackage.internal.IOUtils.XmlConsumer; +import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME; +import static jdk.jpackage.internal.StandardBundlerParam.INSTALL_DIR; +import static jdk.jpackage.internal.StandardBundlerParam.VENDOR; +import static jdk.jpackage.internal.StandardBundlerParam.VERSION; +import static jdk.jpackage.internal.WinMsiBundler.MSI_SYSTEM_WIDE; /** * Creates application WiX source files. diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WixTool.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixTool.java similarity index 99% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WixTool.java rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixTool.java index cebe3936f8b..47edbd16c99 100644 --- a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WixTool.java +++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixTool.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.FileSystems; diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/MsiInstallerStrings_en.wxl b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_en.wxl similarity index 100% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/MsiInstallerStrings_en.wxl rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_en.wxl diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/MsiInstallerStrings_ja.wxl b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_ja.wxl similarity index 100% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/MsiInstallerStrings_ja.wxl rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_ja.wxl diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl similarity index 100% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinInstaller.template b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinInstaller.template similarity index 100% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinInstaller.template rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinInstaller.template diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinLauncher.template b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinLauncher.template similarity index 100% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinLauncher.template rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinLauncher.template diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinResources.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties similarity index 100% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinResources.properties rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinResources_ja.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties similarity index 100% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinResources_ja.properties rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinResources_zh_CN.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties similarity index 100% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinResources_zh_CN.properties rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/java48.ico b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/java48.ico similarity index 100% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/java48.ico rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/java48.ico diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/main.wxs b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/main.wxs similarity index 100% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/main.wxs rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/main.wxs diff --git a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/overrides.wxi b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/overrides.wxi similarity index 100% rename from src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/overrides.wxi rename to src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/overrides.wxi diff --git a/src/jdk.incubator.jpackage/macosx/classes/module-info.java.extra b/src/jdk.jpackage/windows/classes/module-info.java.extra similarity index 82% rename from src/jdk.incubator.jpackage/macosx/classes/module-info.java.extra rename to src/jdk.jpackage/windows/classes/module-info.java.extra index ea6da5da5a4..d9d3bde1e4d 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/module-info.java.extra +++ b/src/jdk.jpackage/windows/classes/module-info.java.extra @@ -23,9 +23,8 @@ * questions. */ -provides jdk.incubator.jpackage.internal.Bundler with - jdk.incubator.jpackage.internal.MacAppBundler, - jdk.incubator.jpackage.internal.MacAppStoreBundler, - jdk.incubator.jpackage.internal.MacDmgBundler, - jdk.incubator.jpackage.internal.MacPkgBundler; +provides jdk.jpackage.internal.Bundler with + jdk.jpackage.internal.WinAppBundler, + jdk.jpackage.internal.WinExeBundler, + jdk.jpackage.internal.WinMsiBundler; diff --git a/src/jdk.incubator.jpackage/windows/native/applauncher/WinLauncher.cpp b/src/jdk.jpackage/windows/native/applauncher/WinLauncher.cpp similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/applauncher/WinLauncher.cpp rename to src/jdk.jpackage/windows/native/applauncher/WinLauncher.cpp diff --git a/src/jdk.incubator.jpackage/windows/native/common/PlatformLogEvent.cpp b/src/jdk.jpackage/windows/native/common/PlatformLogEvent.cpp similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/common/PlatformLogEvent.cpp rename to src/jdk.jpackage/windows/native/common/PlatformLogEvent.cpp diff --git a/src/jdk.incubator.jpackage/windows/native/common/PlatformLogEvent.h b/src/jdk.jpackage/windows/native/common/PlatformLogEvent.h similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/common/PlatformLogEvent.h rename to src/jdk.jpackage/windows/native/common/PlatformLogEvent.h diff --git a/src/jdk.incubator.jpackage/windows/native/common/UniqueHandle.h b/src/jdk.jpackage/windows/native/common/UniqueHandle.h similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/common/UniqueHandle.h rename to src/jdk.jpackage/windows/native/common/UniqueHandle.h diff --git a/src/jdk.incubator.jpackage/windows/native/common/WinDll.cpp b/src/jdk.jpackage/windows/native/common/WinDll.cpp similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/common/WinDll.cpp rename to src/jdk.jpackage/windows/native/common/WinDll.cpp diff --git a/src/jdk.incubator.jpackage/windows/native/common/WinErrorHandling.cpp b/src/jdk.jpackage/windows/native/common/WinErrorHandling.cpp similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/common/WinErrorHandling.cpp rename to src/jdk.jpackage/windows/native/common/WinErrorHandling.cpp diff --git a/src/jdk.incubator.jpackage/windows/native/common/WinErrorHandling.h b/src/jdk.jpackage/windows/native/common/WinErrorHandling.h similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/common/WinErrorHandling.h rename to src/jdk.jpackage/windows/native/common/WinErrorHandling.h diff --git a/src/jdk.incubator.jpackage/windows/native/common/WinFileUtils.cpp b/src/jdk.jpackage/windows/native/common/WinFileUtils.cpp similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/common/WinFileUtils.cpp rename to src/jdk.jpackage/windows/native/common/WinFileUtils.cpp diff --git a/src/jdk.incubator.jpackage/windows/native/common/WinFileUtils.h b/src/jdk.jpackage/windows/native/common/WinFileUtils.h similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/common/WinFileUtils.h rename to src/jdk.jpackage/windows/native/common/WinFileUtils.h diff --git a/src/jdk.incubator.jpackage/windows/native/common/WinSysInfo.cpp b/src/jdk.jpackage/windows/native/common/WinSysInfo.cpp similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/common/WinSysInfo.cpp rename to src/jdk.jpackage/windows/native/common/WinSysInfo.cpp diff --git a/src/jdk.incubator.jpackage/windows/native/common/WinSysInfo.h b/src/jdk.jpackage/windows/native/common/WinSysInfo.h similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/common/WinSysInfo.h rename to src/jdk.jpackage/windows/native/common/WinSysInfo.h diff --git a/src/jdk.incubator.jpackage/windows/native/libjpackage/IconSwap.cpp b/src/jdk.jpackage/windows/native/libjpackage/IconSwap.cpp similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/libjpackage/IconSwap.cpp rename to src/jdk.jpackage/windows/native/libjpackage/IconSwap.cpp diff --git a/src/jdk.incubator.jpackage/windows/native/libjpackage/IconSwap.h b/src/jdk.jpackage/windows/native/libjpackage/IconSwap.h similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/libjpackage/IconSwap.h rename to src/jdk.jpackage/windows/native/libjpackage/IconSwap.h diff --git a/src/jdk.incubator.jpackage/windows/native/libjpackage/JniUtils.cpp b/src/jdk.jpackage/windows/native/libjpackage/JniUtils.cpp similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/libjpackage/JniUtils.cpp rename to src/jdk.jpackage/windows/native/libjpackage/JniUtils.cpp diff --git a/src/jdk.incubator.jpackage/windows/native/libjpackage/JniUtils.h b/src/jdk.jpackage/windows/native/libjpackage/JniUtils.h similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/libjpackage/JniUtils.h rename to src/jdk.jpackage/windows/native/libjpackage/JniUtils.h diff --git a/src/jdk.incubator.jpackage/windows/native/libjpackage/ResourceEditor.cpp b/src/jdk.jpackage/windows/native/libjpackage/ResourceEditor.cpp similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/libjpackage/ResourceEditor.cpp rename to src/jdk.jpackage/windows/native/libjpackage/ResourceEditor.cpp diff --git a/src/jdk.incubator.jpackage/windows/native/libjpackage/ResourceEditor.h b/src/jdk.jpackage/windows/native/libjpackage/ResourceEditor.h similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/libjpackage/ResourceEditor.h rename to src/jdk.jpackage/windows/native/libjpackage/ResourceEditor.h diff --git a/src/jdk.incubator.jpackage/windows/native/libjpackage/VersionInfo.cpp b/src/jdk.jpackage/windows/native/libjpackage/VersionInfo.cpp similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/libjpackage/VersionInfo.cpp rename to src/jdk.jpackage/windows/native/libjpackage/VersionInfo.cpp diff --git a/src/jdk.incubator.jpackage/windows/native/libjpackage/VersionInfo.h b/src/jdk.jpackage/windows/native/libjpackage/VersionInfo.h similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/libjpackage/VersionInfo.h rename to src/jdk.jpackage/windows/native/libjpackage/VersionInfo.h diff --git a/src/jdk.incubator.jpackage/windows/native/libjpackage/WindowsRegistry.cpp b/src/jdk.jpackage/windows/native/libjpackage/WindowsRegistry.cpp similarity index 84% rename from src/jdk.incubator.jpackage/windows/native/libjpackage/WindowsRegistry.cpp rename to src/jdk.jpackage/windows/native/libjpackage/WindowsRegistry.cpp index 80ba6ce0964..3ecefb1adca 100644 --- a/src/jdk.incubator.jpackage/windows/native/libjpackage/WindowsRegistry.cpp +++ b/src/jdk.jpackage/windows/native/libjpackage/WindowsRegistry.cpp @@ -71,23 +71,23 @@ std::wstring GetLongPath(const std::wstring& path) { #ifdef __cplusplus extern "C" { #endif -#undef jdk_incubator_jpackage_internal_WindowsRegistry_HKEY_LOCAL_MACHINE -#define jdk_incubator_jpackage_internal_WindowsRegistry_HKEY_LOCAL_MACHINE 1L +#undef jdk_jpackage_internal_WindowsRegistry_HKEY_LOCAL_MACHINE +#define jdk_jpackage_internal_WindowsRegistry_HKEY_LOCAL_MACHINE 1L /* - * Class: jdk_incubator_jpackage_internal_WindowsRegistry + * Class: jdk_jpackage_internal_WindowsRegistry * Method: readDwordValue * Signature: (ILjava/lang/String;Ljava/lang/String;I)I */ JNIEXPORT jint JNICALL - Java_jdk_incubator_jpackage_internal_WindowsRegistry_readDwordValue( + Java_jdk_jpackage_internal_WindowsRegistry_readDwordValue( JNIEnv *pEnv, jclass c, jint key, jstring jSubKey, jstring jValue, jint defaultValue) { jint jResult = defaultValue; JP_TRY; - if (key != jdk_incubator_jpackage_internal_WindowsRegistry_HKEY_LOCAL_MACHINE) { + if (key != jdk_jpackage_internal_WindowsRegistry_HKEY_LOCAL_MACHINE) { JP_THROW("Inavlid Windows registry key id"); } @@ -115,17 +115,17 @@ extern "C" { } /* - * Class: jdk_incubator_jpackage_internal_WindowsRegistry + * Class: jdk_jpackage_internal_WindowsRegistry * Method: openRegistryKey * Signature: (ILjava/lang/String;)J */ JNIEXPORT jlong JNICALL - Java_jdk_incubator_jpackage_internal_WindowsRegistry_openRegistryKey( + Java_jdk_jpackage_internal_WindowsRegistry_openRegistryKey( JNIEnv *pEnv, jclass c, jint key, jstring jSubKey) { JP_TRY; - if (key != jdk_incubator_jpackage_internal_WindowsRegistry_HKEY_LOCAL_MACHINE) { + if (key != jdk_jpackage_internal_WindowsRegistry_HKEY_LOCAL_MACHINE) { JP_THROW("Inavlid Windows registry key id"); } @@ -143,12 +143,12 @@ extern "C" { } /* - * Class: jdk_incubator_jpackage_internal_WindowsRegistry + * Class: jdk_jpackage_internal_WindowsRegistry * Method: enumRegistryValue * Signature: (JI)Ljava/lang/String; */ JNIEXPORT jstring JNICALL - Java_jdk_incubator_jpackage_internal_WindowsRegistry_enumRegistryValue( + Java_jdk_jpackage_internal_WindowsRegistry_enumRegistryValue( JNIEnv *pEnv, jclass c, jlong lKey, jint jIndex) { JP_TRY; @@ -175,24 +175,24 @@ extern "C" { } /* - * Class: jdk_incubator_jpackage_internal_WindowsRegistry + * Class: jdk_jpackage_internal_WindowsRegistry * Method: closeRegistryKey * Signature: (J)V */ JNIEXPORT void JNICALL - Java_jdk_incubator_jpackage_internal_WindowsRegistry_closeRegistryKey( + Java_jdk_jpackage_internal_WindowsRegistry_closeRegistryKey( JNIEnv *pEnc, jclass c, jlong lKey) { HKEY hKey = (HKEY)lKey; RegCloseKey(hKey); } /* - * Class: jdk_incubator_jpackage_internal_WindowsRegistry + * Class: jdk_jpackage_internal_WindowsRegistry * Method: comparePaths * Signature: (Ljava/lang/String;Ljava/lang/String;)Z */ JNIEXPORT jboolean JNICALL - Java_jdk_incubator_jpackage_internal_WindowsRegistry_comparePaths( + Java_jdk_jpackage_internal_WindowsRegistry_comparePaths( JNIEnv *pEnv, jclass c, jstring jPath1, jstring jPath2) { JP_TRY; diff --git a/src/jdk.incubator.jpackage/windows/native/libjpackage/jpackage.cpp b/src/jdk.jpackage/windows/native/libjpackage/jpackage.cpp similarity index 84% rename from src/jdk.incubator.jpackage/windows/native/libjpackage/jpackage.cpp rename to src/jdk.jpackage/windows/native/libjpackage/jpackage.cpp index 4e1a574d963..66e20b18aef 100644 --- a/src/jdk.incubator.jpackage/windows/native/libjpackage/jpackage.cpp +++ b/src/jdk.jpackage/windows/native/libjpackage/jpackage.cpp @@ -34,12 +34,12 @@ extern "C" { #endif /* - * Class: jdk_incubator_jpackage_internal_ExecutableRebrander + * Class: jdk_jpackage_internal_ExecutableRebrander * Method: lockResource * Signature: (Ljava/lang/String;)J */ JNIEXPORT jlong JNICALL - Java_jdk_incubator_jpackage_internal_ExecutableRebrander_lockResource( + Java_jdk_jpackage_internal_ExecutableRebrander_lockResource( JNIEnv *pEnv, jclass c, jstring jExecutable) { JP_TRY; @@ -55,12 +55,12 @@ extern "C" { } /* - * Class: jdk_incubator_jpackage_internal_ExecutableRebrander + * Class: jdk_jpackage_internal_ExecutableRebrander * Method: unlockResource * Signature: (J;)V */ JNIEXPORT void JNICALL - Java_jdk_incubator_jpackage_internal_ExecutableRebrander_unlockResource( + Java_jdk_jpackage_internal_ExecutableRebrander_unlockResource( JNIEnv *pEnv, jclass c, jlong jResourceLock) { JP_TRY; @@ -70,12 +70,12 @@ extern "C" { } /* - * Class: jdk_incubator_jpackage_internal_ExecutableRebrander + * Class: jdk_jpackage_internal_ExecutableRebrander * Method: iconSwap * Signature: (J;Ljava/lang/String;)I */ JNIEXPORT jint JNICALL - Java_jdk_incubator_jpackage_internal_ExecutableRebrander_iconSwap( + Java_jdk_jpackage_internal_ExecutableRebrander_iconSwap( JNIEnv *pEnv, jclass c, jlong jResourceLock, jstring jIconTarget) { JP_TRY; @@ -94,12 +94,12 @@ extern "C" { } /* - * Class: jdk_incubator_jpackage_internal_ExecutableRebrander + * Class: jdk_jpackage_internal_ExecutableRebrander * Method: versionSwap * Signature: (J;[Ljava/lang/String;)I */ JNIEXPORT jint JNICALL - Java_jdk_incubator_jpackage_internal_ExecutableRebrander_versionSwap( + Java_jdk_jpackage_internal_ExecutableRebrander_versionSwap( JNIEnv *pEnv, jclass c, jlong jResourceLock, jobjectArray jExecutableProperties) { @@ -129,11 +129,11 @@ extern "C" { } /* - * Class: jdk_incubator_jpackage_internal_WinExeBundler + * Class: jdk_jpackage_internal_WinExeBundler * Method: embedMSI * Signature: (J;Ljava/lang/String;)I */ - JNIEXPORT jint JNICALL Java_jdk_incubator_jpackage_internal_WinExeBundler_embedMSI( + JNIEXPORT jint JNICALL Java_jdk_jpackage_internal_WinExeBundler_embedMSI( JNIEnv *pEnv, jclass c, jlong jResourceLock, jstring jmsiPath) { JP_TRY; diff --git a/src/jdk.incubator.jpackage/windows/native/libwixhelper/libwixhelper.cpp b/src/jdk.jpackage/windows/native/libwixhelper/libwixhelper.cpp similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/libwixhelper/libwixhelper.cpp rename to src/jdk.jpackage/windows/native/libwixhelper/libwixhelper.cpp diff --git a/src/jdk.incubator.jpackage/windows/native/msiwrapper/Executor.cpp b/src/jdk.jpackage/windows/native/msiwrapper/Executor.cpp similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/msiwrapper/Executor.cpp rename to src/jdk.jpackage/windows/native/msiwrapper/Executor.cpp diff --git a/src/jdk.incubator.jpackage/windows/native/msiwrapper/Executor.h b/src/jdk.jpackage/windows/native/msiwrapper/Executor.h similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/msiwrapper/Executor.h rename to src/jdk.jpackage/windows/native/msiwrapper/Executor.h diff --git a/src/jdk.incubator.jpackage/windows/native/msiwrapper/MsiWrapper.cpp b/src/jdk.jpackage/windows/native/msiwrapper/MsiWrapper.cpp similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/msiwrapper/MsiWrapper.cpp rename to src/jdk.jpackage/windows/native/msiwrapper/MsiWrapper.cpp diff --git a/src/jdk.incubator.jpackage/windows/native/msiwrapper/Resources.cpp b/src/jdk.jpackage/windows/native/msiwrapper/Resources.cpp similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/msiwrapper/Resources.cpp rename to src/jdk.jpackage/windows/native/msiwrapper/Resources.cpp diff --git a/src/jdk.incubator.jpackage/windows/native/msiwrapper/Resources.h b/src/jdk.jpackage/windows/native/msiwrapper/Resources.h similarity index 100% rename from src/jdk.incubator.jpackage/windows/native/msiwrapper/Resources.h rename to src/jdk.jpackage/windows/native/msiwrapper/Resources.h diff --git a/test/jdk/build/AbsPathsInImage.java b/test/jdk/build/AbsPathsInImage.java index e33bd0a9b1d..c3fe885554e 100644 --- a/test/jdk/build/AbsPathsInImage.java +++ b/test/jdk/build/AbsPathsInImage.java @@ -168,12 +168,12 @@ public class AbsPathsInImage { private void scanFile(Path file, List searchPatterns) throws IOException { List matches = scanBytes(Files.readAllBytes(file), searchPatterns); - // For the same reason as the *.dll above, the jdk.incubator.jpackage module + // For the same reason as the *.dll above, the jdk.jpackage module // contains some unavoidable header references in the launcher which is // stored as a java resource inside the modules file. if (IS_WINDOWS && file.toString().endsWith("modules")) { matches = matches.stream() - .filter(f -> !f.matches(".*jdk\\.incubator\\.jpackage.*\\.h.*")) + .filter(f -> !f.matches(".*jdk\\.jpackage.*\\.h.*")) .collect(Collectors.toList()); } if (matches.size() > 0) { diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java index 6aaa1375d01..2e60facc8e4 100644 --- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java +++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java @@ -32,7 +32,7 @@ import java.util.Map; import java.util.Optional; import java.util.function.BiConsumer; import java.util.stream.Stream; -import jdk.incubator.jpackage.internal.ApplicationLayout; +import jdk.jpackage.internal.ApplicationLayout; import jdk.jpackage.test.Functional.ThrowingBiConsumer; public final class AdditionalLauncher { diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java index 732cbb9240f..ceb0dedcb6f 100644 --- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java +++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FileAssociations.java @@ -25,7 +25,7 @@ package jdk.jpackage.test; import java.nio.file.Path; import java.util.HashMap; import java.util.Map; -import jdk.incubator.jpackage.internal.IOUtils; +import jdk.jpackage.internal.IOUtils; final public class FileAssociations { diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java index b8f10693f82..a164a0728ca 100644 --- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java +++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java @@ -46,8 +46,8 @@ import java.util.function.Supplier; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; -import jdk.incubator.jpackage.internal.AppImageFile; -import jdk.incubator.jpackage.internal.ApplicationLayout; +import jdk.jpackage.internal.AppImageFile; +import jdk.jpackage.internal.ApplicationLayout; import jdk.jpackage.test.Functional.ThrowingConsumer; import jdk.jpackage.test.Functional.ThrowingFunction; import jdk.jpackage.test.Functional.ThrowingSupplier; @@ -835,15 +835,6 @@ public final class JPackageCommand extends CommandArguments { }).collect(Collectors.joining(" ")); } - public static Stream filterOutput(Stream jpackageOutput) { - // Skip "WARNING: Using incubator ..." first line of output - return jpackageOutput.skip(1); - } - - public static List filterOutput(List jpackageOutput) { - return filterOutput(jpackageOutput.stream()).collect(Collectors.toList()); - } - @Override protected boolean isMutable() { return !immutable; diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherIconVerifier.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherIconVerifier.java index 4ef62b28fc0..d907a046f22 100644 --- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherIconVerifier.java +++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherIconVerifier.java @@ -85,7 +85,7 @@ public final class LauncherIconVerifier { } return TKit.SRC_ROOT.resolve(Path.of(components[0], - "classes/jdk/incubator/jpackage/internal/resources", components[1])); + "classes/jdk/jpackage/internal/resources", components[1])); } private String launcherName; diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java index 787f4418f1d..c54ca886567 100644 --- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java +++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java @@ -38,7 +38,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; -import jdk.incubator.jpackage.internal.IOUtils; +import jdk.jpackage.internal.IOUtils; import jdk.jpackage.test.PackageTest.PackageHandlers; diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java index 0acb196c2ba..f81fb1c170c 100644 --- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java +++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java @@ -43,8 +43,8 @@ import java.util.function.Consumer; import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import jdk.incubator.jpackage.internal.AppImageFile; -import jdk.incubator.jpackage.internal.ApplicationLayout; +import jdk.jpackage.internal.AppImageFile; +import jdk.jpackage.internal.ApplicationLayout; import jdk.jpackage.test.Functional.ThrowingBiConsumer; import jdk.jpackage.test.Functional.ThrowingConsumer; import jdk.jpackage.test.Functional.ThrowingRunnable; diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java index 7f9eb811d6e..26a1b7786a4 100644 --- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java +++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java @@ -35,15 +35,15 @@ import java.util.stream.Stream; */ public enum PackageType { WIN_MSI(".msi", - TKit.isWindows() ? "jdk.incubator.jpackage.internal.WinMsiBundler" : null), + TKit.isWindows() ? "jdk.jpackage.internal.WinMsiBundler" : null), WIN_EXE(".exe", - TKit.isWindows() ? "jdk.incubator.jpackage.internal.WinMsiBundler" : null), + TKit.isWindows() ? "jdk.jpackage.internal.WinMsiBundler" : null), LINUX_DEB(".deb", - TKit.isLinux() ? "jdk.incubator.jpackage.internal.LinuxDebBundler" : null), + TKit.isLinux() ? "jdk.jpackage.internal.LinuxDebBundler" : null), LINUX_RPM(".rpm", - TKit.isLinux() ? "jdk.incubator.jpackage.internal.LinuxRpmBundler" : null), - MAC_DMG(".dmg", TKit.isOSX() ? "jdk.incubator.jpackage.internal.MacDmgBundler" : null), - MAC_PKG(".pkg", TKit.isOSX() ? "jdk.incubator.jpackage.internal.MacPkgBundler" : null), + TKit.isLinux() ? "jdk.jpackage.internal.LinuxRpmBundler" : null), + MAC_DMG(".dmg", TKit.isOSX() ? "jdk.jpackage.internal.MacDmgBundler" : null), + MAC_PKG(".pkg", TKit.isOSX() ? "jdk.jpackage.internal.MacPkgBundler" : null), IMAGE("app-image", null, null); PackageType(String packageName, String bundleSuffix, String bundlerClass) { diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java index d35539b3f50..4f97752305b 100644 --- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java +++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java @@ -81,7 +81,7 @@ final public class TKit { }).get(); public static final Path SRC_ROOT = Functional.identity(() -> { - return TEST_SRC_ROOT.resolve("../../../../src/jdk.incubator.jpackage").normalize().toAbsolutePath(); + return TEST_SRC_ROOT.resolve("../../../../src/jdk.jpackage").normalize().toAbsolutePath(); }).get(); public final static String ICON_SUFFIX = Functional.identity(() -> { diff --git a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/AppImageFileTest.java b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/AppImageFileTest.java similarity index 99% rename from test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/AppImageFileTest.java rename to test/jdk/tools/jpackage/junit/jdk/jpackage/internal/AppImageFileTest.java index 8168148ef6c..e2b8116d980 100644 --- a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/AppImageFileTest.java +++ b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/AppImageFileTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Files; diff --git a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/ApplicationLayoutTest.java b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/ApplicationLayoutTest.java similarity index 98% rename from test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/ApplicationLayoutTest.java rename to test/jdk/tools/jpackage/junit/jdk/jpackage/internal/ApplicationLayoutTest.java index 7ef0a4d15bd..0d8e4a1abfd 100644 --- a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/ApplicationLayoutTest.java +++ b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/ApplicationLayoutTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Files; diff --git a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/CompareDottedVersionTest.java b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/CompareDottedVersionTest.java similarity index 98% rename from test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/CompareDottedVersionTest.java rename to test/jdk/tools/jpackage/junit/jdk/jpackage/internal/CompareDottedVersionTest.java index 283bbe26fea..b8057d0e2b4 100644 --- a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/CompareDottedVersionTest.java +++ b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/CompareDottedVersionTest.java @@ -20,7 +20,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.ArrayList; import java.util.List; diff --git a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/DeployParamsTest.java b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/DeployParamsTest.java similarity index 99% rename from test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/DeployParamsTest.java rename to test/jdk/tools/jpackage/junit/jdk/jpackage/internal/DeployParamsTest.java index bfb3d359ef2..cf398a2d6b9 100644 --- a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/DeployParamsTest.java +++ b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/DeployParamsTest.java @@ -20,7 +20,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.nio.file.Path; import java.io.IOException; diff --git a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/DottedVersionTest.java b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/DottedVersionTest.java similarity index 98% rename from test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/DottedVersionTest.java rename to test/jdk/tools/jpackage/junit/jdk/jpackage/internal/DottedVersionTest.java index d6ace3d88b1..fedf153d5dd 100644 --- a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/DottedVersionTest.java +++ b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/DottedVersionTest.java @@ -20,7 +20,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.Collections; import java.util.List; diff --git a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/InvalidDottedVersionTest.java b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/InvalidDottedVersionTest.java similarity index 98% rename from test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/InvalidDottedVersionTest.java rename to test/jdk/tools/jpackage/junit/jdk/jpackage/internal/InvalidDottedVersionTest.java index 71054580332..674a4ac24ef 100644 --- a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/InvalidDottedVersionTest.java +++ b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/InvalidDottedVersionTest.java @@ -20,7 +20,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.util.List; import java.util.stream.Collectors; diff --git a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/OverridableResourceTest.java b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/OverridableResourceTest.java similarity index 98% rename from test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/OverridableResourceTest.java rename to test/jdk/tools/jpackage/junit/jdk/jpackage/internal/OverridableResourceTest.java index 5a9041796b2..a4825c64150 100644 --- a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/OverridableResourceTest.java +++ b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/OverridableResourceTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.io.InputStream; @@ -33,7 +33,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import jdk.incubator.jpackage.internal.resources.ResourceLocator; +import jdk.jpackage.internal.resources.ResourceLocator; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertArrayEquals; diff --git a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/PathGroupTest.java b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/PathGroupTest.java similarity index 99% rename from test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/PathGroupTest.java rename to test/jdk/tools/jpackage/junit/jdk/jpackage/internal/PathGroupTest.java index dbd0fd84b45..3a005d10234 100644 --- a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/PathGroupTest.java +++ b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/PathGroupTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.io.IOException; import java.nio.file.Files; diff --git a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/PlatformVersionTest.java b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/PlatformVersionTest.java similarity index 96% rename from test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/PlatformVersionTest.java rename to test/jdk/tools/jpackage/junit/jdk/jpackage/internal/PlatformVersionTest.java index 2780d69b8b8..355dc25a2fe 100644 --- a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/PlatformVersionTest.java +++ b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/PlatformVersionTest.java @@ -20,7 +20,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; @@ -109,9 +109,9 @@ public class PlatformVersionTest { private final boolean valid; private final static Function MAC_CFBUNDLE_VERSION_PARSER = findParser( - "jdk.incubator.jpackage.internal.CFBundleVersion"); + "jdk.jpackage.internal.CFBundleVersion"); private final static Function WIN_MSI_PRODUCT_VERSION_PARSER = findParser( - "jdk.incubator.jpackage.internal.MsiVersion"); + "jdk.jpackage.internal.MsiVersion"); private static Function findParser(String className) { try { diff --git a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/ToolValidatorTest.java b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/ToolValidatorTest.java similarity index 98% rename from test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/ToolValidatorTest.java rename to test/jdk/tools/jpackage/junit/jdk/jpackage/internal/ToolValidatorTest.java index adb579b929d..3d0e2b0bb78 100644 --- a/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/ToolValidatorTest.java +++ b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/ToolValidatorTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.incubator.jpackage.internal; +package jdk.jpackage.internal; import java.nio.file.Path; import static org.hamcrest.CoreMatchers.is; diff --git a/test/jdk/tools/jpackage/junit/junit.java b/test/jdk/tools/jpackage/junit/junit.java index ce9441baf49..1073a572078 100644 --- a/test/jdk/tools/jpackage/junit/junit.java +++ b/test/jdk/tools/jpackage/junit/junit.java @@ -27,6 +27,6 @@ * @test * @summary jpackage unit tests * @library ${jtreg.home}/lib/junit.jar - * @modules jdk.incubator.jpackage + * @modules jdk.jpackage * @run shell run_junit.sh */ diff --git a/test/jdk/tools/jpackage/junit/run_junit.sh b/test/jdk/tools/jpackage/junit/run_junit.sh index 46c588a7077..496ac71a974 100644 --- a/test/jdk/tools/jpackage/junit/run_junit.sh +++ b/test/jdk/tools/jpackage/junit/run_junit.sh @@ -17,10 +17,10 @@ for s in $(find "${TESTSRC}" -name "*.java" | grep -v junit.java); do done common_args=(\ - --add-modules jdk.incubator.jpackage \ - --patch-module jdk.incubator.jpackage="${TESTSRC}${PS}${TESTCLASSES}" \ - --add-reads jdk.incubator.jpackage=ALL-UNNAMED \ - --add-exports jdk.incubator.jpackage/jdk.incubator.jpackage.internal=ALL-UNNAMED \ + --add-modules jdk.jpackage \ + --patch-module jdk.jpackage="${TESTSRC}${PS}${TESTCLASSES}" \ + --add-reads jdk.jpackage=ALL-UNNAMED \ + --add-exports jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED \ -classpath "${TESTCLASSPATH}" \ ) diff --git a/test/jdk/tools/jpackage/linux/AppCategoryTest.java b/test/jdk/tools/jpackage/linux/AppCategoryTest.java index a4471cebfc9..978beff0c75 100644 --- a/test/jdk/tools/jpackage/linux/AppCategoryTest.java +++ b/test/jdk/tools/jpackage/linux/AppCategoryTest.java @@ -47,7 +47,7 @@ import jdk.jpackage.test.PackageType; * @key jpackagePlatformPackage * @build jdk.jpackage.test.* * @requires (os.family == "linux") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @run main/othervm/timeout=360 -Xmx512m AppCategoryTest */ public class AppCategoryTest { diff --git a/test/jdk/tools/jpackage/linux/LicenseTypeTest.java b/test/jdk/tools/jpackage/linux/LicenseTypeTest.java index 811288c33fa..7462c3d1766 100644 --- a/test/jdk/tools/jpackage/linux/LicenseTypeTest.java +++ b/test/jdk/tools/jpackage/linux/LicenseTypeTest.java @@ -42,7 +42,7 @@ import jdk.jpackage.test.PackageType; * @key jpackagePlatformPackage * @build jdk.jpackage.test.* * @requires (os.family == "linux") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @run main/othervm/timeout=360 -Xmx512m LicenseTypeTest */ public class LicenseTypeTest { diff --git a/test/jdk/tools/jpackage/linux/LinuxBundleNameTest.java b/test/jdk/tools/jpackage/linux/LinuxBundleNameTest.java index 5e3cf3a6421..be502d10a60 100644 --- a/test/jdk/tools/jpackage/linux/LinuxBundleNameTest.java +++ b/test/jdk/tools/jpackage/linux/LinuxBundleNameTest.java @@ -47,7 +47,7 @@ import jdk.jpackage.test.PackageType; * @key jpackagePlatformPackage * @build jdk.jpackage.test.* * @requires (os.family == "linux") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @run main/othervm/timeout=360 -Xmx512m LinuxBundleNameTest */ public class LinuxBundleNameTest { diff --git a/test/jdk/tools/jpackage/linux/LinuxResourceTest.java b/test/jdk/tools/jpackage/linux/LinuxResourceTest.java index 30f6e0b1203..9f4e4cfad2f 100644 --- a/test/jdk/tools/jpackage/linux/LinuxResourceTest.java +++ b/test/jdk/tools/jpackage/linux/LinuxResourceTest.java @@ -36,7 +36,7 @@ import java.util.List; * @library ../helpers * @build jdk.jpackage.test.* * @requires (os.family == "linux") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile LinuxResourceTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=LinuxResourceTest diff --git a/test/jdk/tools/jpackage/linux/MaintainerTest.java b/test/jdk/tools/jpackage/linux/MaintainerTest.java index 51ffb359385..82f433a6341 100644 --- a/test/jdk/tools/jpackage/linux/MaintainerTest.java +++ b/test/jdk/tools/jpackage/linux/MaintainerTest.java @@ -43,7 +43,7 @@ import jdk.jpackage.test.TKit; * @key jpackagePlatformPackage * @build jdk.jpackage.test.* * @requires (os.family == "linux") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @run main/othervm/timeout=360 -Xmx512m MaintainerTest */ public class MaintainerTest { diff --git a/test/jdk/tools/jpackage/linux/PackageDepsTest.java b/test/jdk/tools/jpackage/linux/PackageDepsTest.java index 03066b49c12..457d8f01592 100644 --- a/test/jdk/tools/jpackage/linux/PackageDepsTest.java +++ b/test/jdk/tools/jpackage/linux/PackageDepsTest.java @@ -50,7 +50,7 @@ import jdk.jpackage.test.Annotations.Test; * @key jpackagePlatformPackage * @build jdk.jpackage.test.* * @requires (os.family == "linux") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile PackageDepsTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=PackageDepsTest diff --git a/test/jdk/tools/jpackage/linux/ReleaseTest.java b/test/jdk/tools/jpackage/linux/ReleaseTest.java index c9197874c94..ed79cd6e184 100644 --- a/test/jdk/tools/jpackage/linux/ReleaseTest.java +++ b/test/jdk/tools/jpackage/linux/ReleaseTest.java @@ -46,7 +46,7 @@ import jdk.jpackage.test.TKit; * @key jpackagePlatformPackage * @build jdk.jpackage.test.* * @requires (os.family == "linux") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @run main/othervm/timeout=360 -Xmx512m ReleaseTest */ public class ReleaseTest { diff --git a/test/jdk/tools/jpackage/linux/ShortcutHintTest.java b/test/jdk/tools/jpackage/linux/ShortcutHintTest.java index 3715d98fc96..812a1941333 100644 --- a/test/jdk/tools/jpackage/linux/ShortcutHintTest.java +++ b/test/jdk/tools/jpackage/linux/ShortcutHintTest.java @@ -58,7 +58,7 @@ import jdk.jpackage.test.Annotations.Test; * @requires jpackage.test.SQETest == null * @build jdk.jpackage.test.* * @requires (os.family == "linux") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile ShortcutHintTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=ShortcutHintTest @@ -72,7 +72,7 @@ import jdk.jpackage.test.Annotations.Test; * @build jdk.jpackage.test.* * @requires (os.family == "linux") * @requires jpackage.test.SQETest != null - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile ShortcutHintTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=ShortcutHintTest.testBasic diff --git a/test/jdk/tools/jpackage/linux/jdk/jpackage/tests/UsrTreeTest.java b/test/jdk/tools/jpackage/linux/jdk/jpackage/tests/UsrTreeTest.java index 7a349175f0e..13237cc5aa3 100644 --- a/test/jdk/tools/jpackage/linux/jdk/jpackage/tests/UsrTreeTest.java +++ b/test/jdk/tools/jpackage/linux/jdk/jpackage/tests/UsrTreeTest.java @@ -45,7 +45,7 @@ import jdk.jpackage.test.Annotations.Test; * @requires jpackage.test.SQETest == null * @requires (os.family == "linux") * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile UsrTreeTest.java * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main * --jpt-run=UsrTreeTest diff --git a/test/jdk/tools/jpackage/macosx/MacFileAssociationsTest.java b/test/jdk/tools/jpackage/macosx/MacFileAssociationsTest.java index b2d3a7ea9a2..eb21419c3b3 100644 --- a/test/jdk/tools/jpackage/macosx/MacFileAssociationsTest.java +++ b/test/jdk/tools/jpackage/macosx/MacFileAssociationsTest.java @@ -41,7 +41,7 @@ import jdk.jpackage.test.MacHelper.PListWrapper; * @summary jpackage with --file-associations and mac specific file association args * @library ../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @requires (os.family == "mac") * @run main/othervm -Xmx512m MacFileAssociationsTest */ diff --git a/test/jdk/tools/jpackage/macosx/MacPropertiesTest.java b/test/jdk/tools/jpackage/macosx/MacPropertiesTest.java index 3051a44d7a3..9d4324e2222 100644 --- a/test/jdk/tools/jpackage/macosx/MacPropertiesTest.java +++ b/test/jdk/tools/jpackage/macosx/MacPropertiesTest.java @@ -38,7 +38,7 @@ import jdk.jpackage.test.Annotations.Parameter; * @library ../helpers * @build jdk.jpackage.test.* * @requires (os.family == "mac") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile MacPropertiesTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=MacPropertiesTest diff --git a/test/jdk/tools/jpackage/macosx/NameWithSpaceTest.java b/test/jdk/tools/jpackage/macosx/NameWithSpaceTest.java index 3168bb24090..ac505e5ca81 100644 --- a/test/jdk/tools/jpackage/macosx/NameWithSpaceTest.java +++ b/test/jdk/tools/jpackage/macosx/NameWithSpaceTest.java @@ -40,7 +40,7 @@ import jdk.jpackage.test.Annotations.Test; * @summary jpackage test with name containing spaces * @library ../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile NameWithSpaceTest.java * @requires (os.family == "mac") * @key jpackagePlatformPackage diff --git a/test/jdk/tools/jpackage/macosx/SigningAppImageTest.java b/test/jdk/tools/jpackage/macosx/SigningAppImageTest.java index ae07d38a5fd..b0f5f6e028f 100644 --- a/test/jdk/tools/jpackage/macosx/SigningAppImageTest.java +++ b/test/jdk/tools/jpackage/macosx/SigningAppImageTest.java @@ -49,7 +49,7 @@ import jdk.jpackage.test.TKit; * @build SigningCheck * @build jtreg.SkippedException * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @requires (os.family == "mac") * @run main/othervm -Xmx512m SigningAppImageTest */ diff --git a/test/jdk/tools/jpackage/macosx/SigningPackageTest.java b/test/jdk/tools/jpackage/macosx/SigningPackageTest.java index af7981a291b..660a828a121 100644 --- a/test/jdk/tools/jpackage/macosx/SigningPackageTest.java +++ b/test/jdk/tools/jpackage/macosx/SigningPackageTest.java @@ -54,7 +54,7 @@ import jdk.jpackage.test.TKit; * @build SigningCheck * @build jtreg.SkippedException * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @requires (os.family == "mac") * @run main/othervm -Xmx512m SigningPackageTest */ diff --git a/test/jdk/tools/jpackage/macosx/base/SigningCheck.java b/test/jdk/tools/jpackage/macosx/base/SigningCheck.java index 2f247b07263..3d0b4a44e34 100644 --- a/test/jdk/tools/jpackage/macosx/base/SigningCheck.java +++ b/test/jdk/tools/jpackage/macosx/base/SigningCheck.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; import jdk.jpackage.test.TKit; import jdk.jpackage.test.Executor; -import jdk.incubator.jpackage.internal.MacCertificate; +import jdk.jpackage.internal.MacCertificate; public class SigningCheck { diff --git a/test/jdk/tools/jpackage/share/AddLauncherTest.java b/test/jdk/tools/jpackage/share/AddLauncherTest.java index 2c0edc9d26c..9bd45549eef 100644 --- a/test/jdk/tools/jpackage/share/AddLauncherTest.java +++ b/test/jdk/tools/jpackage/share/AddLauncherTest.java @@ -50,7 +50,7 @@ import jdk.jpackage.test.CfgFile; * @requires (jpackage.test.SQETest != null) * @library ../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile AddLauncherTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=AddLauncherTest.test @@ -63,7 +63,7 @@ import jdk.jpackage.test.CfgFile; * @requires (jpackage.test.SQETest == null) * @library ../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile AddLauncherTest.java * @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main * --jpt-run=AddLauncherTest diff --git a/test/jdk/tools/jpackage/share/AppImagePackageTest.java b/test/jdk/tools/jpackage/share/AppImagePackageTest.java index 2ee998af447..9065494e0e9 100644 --- a/test/jdk/tools/jpackage/share/AppImagePackageTest.java +++ b/test/jdk/tools/jpackage/share/AppImagePackageTest.java @@ -45,7 +45,7 @@ import jdk.jpackage.test.Annotations.Test; * @library ../helpers * @requires (jpackage.test.SQETest == null) * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile AppImagePackageTest.java * @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main * --jpt-run=AppImagePackageTest diff --git a/test/jdk/tools/jpackage/share/ArgumentsTest.java b/test/jdk/tools/jpackage/share/ArgumentsTest.java index 1cc6f715317..8cb8fc93658 100644 --- a/test/jdk/tools/jpackage/share/ArgumentsTest.java +++ b/test/jdk/tools/jpackage/share/ArgumentsTest.java @@ -49,7 +49,7 @@ import jdk.jpackage.test.Annotations.Parameter; * @summary jpackage create image with --arguments test * @library ../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile ArgumentsTest.java * @run main/othervm -Xmx512m jdk.jpackage.test.Main * --jpt-run=ArgumentsTest diff --git a/test/jdk/tools/jpackage/share/EmptyFolderPackageTest.java b/test/jdk/tools/jpackage/share/EmptyFolderPackageTest.java index 89ef1ba7a38..90b53a478dc 100644 --- a/test/jdk/tools/jpackage/share/EmptyFolderPackageTest.java +++ b/test/jdk/tools/jpackage/share/EmptyFolderPackageTest.java @@ -22,7 +22,7 @@ */ import java.nio.file.Path; -import jdk.incubator.jpackage.internal.ApplicationLayout; +import jdk.jpackage.internal.ApplicationLayout; import jdk.jpackage.test.PackageTest; import jdk.jpackage.test.PackageType; import jdk.jpackage.test.TKit; @@ -39,7 +39,7 @@ import jdk.jpackage.test.TKit; * @key jpackagePlatformPackage * @build EmptyFolderBase * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @run main/othervm/timeout=720 -Xmx512m EmptyFolderPackageTest */ public class EmptyFolderPackageTest { diff --git a/test/jdk/tools/jpackage/share/EmptyFolderTest.java b/test/jdk/tools/jpackage/share/EmptyFolderTest.java index aefaeadbddc..873f08c3fbe 100644 --- a/test/jdk/tools/jpackage/share/EmptyFolderTest.java +++ b/test/jdk/tools/jpackage/share/EmptyFolderTest.java @@ -24,7 +24,7 @@ import java.nio.file.Path; import jdk.jpackage.test.JPackageCommand; import jdk.jpackage.test.TKit; -import jdk.incubator.jpackage.internal.ApplicationLayout; +import jdk.jpackage.internal.ApplicationLayout; /** * Tests generation of app image with input folder containing empty folders. @@ -37,7 +37,7 @@ import jdk.incubator.jpackage.internal.ApplicationLayout; * @library /test/lib * @build EmptyFolderBase * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @run main/othervm -Xmx512m EmptyFolderTest */ public class EmptyFolderTest { diff --git a/test/jdk/tools/jpackage/share/FileAssociationsTest.java b/test/jdk/tools/jpackage/share/FileAssociationsTest.java index fcad5e7d15d..52dd20f9297 100644 --- a/test/jdk/tools/jpackage/share/FileAssociationsTest.java +++ b/test/jdk/tools/jpackage/share/FileAssociationsTest.java @@ -61,7 +61,7 @@ import jdk.jpackage.test.Annotations.Parameter; * @key jpackagePlatformPackage * @requires jpackage.test.SQETest == null * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile FileAssociationsTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=FileAssociationsTest @@ -74,7 +74,7 @@ import jdk.jpackage.test.Annotations.Parameter; * @key jpackagePlatformPackage * @requires jpackage.test.SQETest != null * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile FileAssociationsTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=FileAssociationsTest.test diff --git a/test/jdk/tools/jpackage/share/IconTest.java b/test/jdk/tools/jpackage/share/IconTest.java index eeb138ef5f2..cf86be917d2 100644 --- a/test/jdk/tools/jpackage/share/IconTest.java +++ b/test/jdk/tools/jpackage/share/IconTest.java @@ -51,7 +51,7 @@ import jdk.jpackage.test.Annotations.Test; * @summary jpackage create image and package with custom icons for the main and additional launcher * @library ../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile IconTest.java * @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main * --jpt-run=IconTest diff --git a/test/jdk/tools/jpackage/share/InstallDirTest.java b/test/jdk/tools/jpackage/share/InstallDirTest.java index e49132d25b5..1f969149c68 100644 --- a/test/jdk/tools/jpackage/share/InstallDirTest.java +++ b/test/jdk/tools/jpackage/share/InstallDirTest.java @@ -58,7 +58,7 @@ import jdk.jpackage.test.Annotations.Parameter; * @key jpackagePlatformPackage * @build jdk.jpackage.test.* * @compile InstallDirTest.java - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main * --jpt-run=InstallDirTest.testCommon */ @@ -70,7 +70,7 @@ import jdk.jpackage.test.Annotations.Parameter; * @key jpackagePlatformPackage * @build jdk.jpackage.test.* * @compile InstallDirTest.java - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @requires (os.family == "linux") * @requires (jpackage.test.SQETest == null) * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main diff --git a/test/jdk/tools/jpackage/share/LicenseTest.java b/test/jdk/tools/jpackage/share/LicenseTest.java index ed8c86c99c7..97e9cd1bfdd 100644 --- a/test/jdk/tools/jpackage/share/LicenseTest.java +++ b/test/jdk/tools/jpackage/share/LicenseTest.java @@ -67,7 +67,7 @@ import jdk.jpackage.test.TKit; * @key jpackagePlatformPackage * @build jdk.jpackage.test.* * @compile LicenseTest.java - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=LicenseTest.testCommon */ @@ -81,7 +81,7 @@ import jdk.jpackage.test.TKit; * @compile LicenseTest.java * @requires (os.family == "linux") * @requires (jpackage.test.SQETest == null) - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @run main/othervm/timeout=1440 -Xmx512m jdk.jpackage.test.Main * --jpt-run=LicenseTest.testCustomDebianCopyright * --jpt-run=LicenseTest.testCustomDebianCopyrightSubst diff --git a/test/jdk/tools/jpackage/share/MultiLauncherTwoPhaseTest.java b/test/jdk/tools/jpackage/share/MultiLauncherTwoPhaseTest.java index 423ea5b9608..5df3609e3ba 100644 --- a/test/jdk/tools/jpackage/share/MultiLauncherTwoPhaseTest.java +++ b/test/jdk/tools/jpackage/share/MultiLauncherTwoPhaseTest.java @@ -47,7 +47,7 @@ import jdk.jpackage.test.JPackageCommand; * @library /test/lib * @key jpackagePlatformPackage * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile MultiLauncherTwoPhaseTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=MultiLauncherTwoPhaseTest diff --git a/test/jdk/tools/jpackage/share/RuntimePackageTest.java b/test/jdk/tools/jpackage/share/RuntimePackageTest.java index 94ecb12c846..9c4c24e3dcb 100644 --- a/test/jdk/tools/jpackage/share/RuntimePackageTest.java +++ b/test/jdk/tools/jpackage/share/RuntimePackageTest.java @@ -56,7 +56,7 @@ import jdk.jpackage.test.Annotations.Test; * @comment Temporary disable for OSX until functionality implemented * @requires (os.family != "mac") * @requires (jpackage.test.SQETest == null) - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile RuntimePackageTest.java * @run main/othervm/timeout=1400 -Xmx512m jdk.jpackage.test.Main * --jpt-run=RuntimePackageTest @@ -71,7 +71,7 @@ import jdk.jpackage.test.Annotations.Test; * @comment Temporary disable for OSX until functionality implemented * @requires (os.family != "mac") * @requires (jpackage.test.SQETest != null) - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile RuntimePackageTest.java * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main * --jpt-run=RuntimePackageTest.test diff --git a/test/jdk/tools/jpackage/share/SimplePackageTest.java b/test/jdk/tools/jpackage/share/SimplePackageTest.java index aaf2c7e2caf..d2e8da31c03 100644 --- a/test/jdk/tools/jpackage/share/SimplePackageTest.java +++ b/test/jdk/tools/jpackage/share/SimplePackageTest.java @@ -43,7 +43,7 @@ import jdk.jpackage.test.Annotations.Test; * @library ../helpers * @key jpackagePlatformPackage * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile SimplePackageTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=SimplePackageTest diff --git a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/AppVersionTest.java b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/AppVersionTest.java index 89ae306d7a7..f137fabf3d6 100644 --- a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/AppVersionTest.java +++ b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/AppVersionTest.java @@ -30,13 +30,13 @@ import java.util.List; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import jdk.incubator.jpackage.internal.AppImageFile; +import jdk.jpackage.internal.AppImageFile; import jdk.jpackage.test.Annotations.Parameters; import jdk.jpackage.test.Annotations.Test; import jdk.jpackage.test.JPackageCommand; import jdk.jpackage.test.PackageTest; import jdk.jpackage.test.TKit; -import jdk.incubator.jpackage.internal.AppImageFile; +import jdk.jpackage.internal.AppImageFile; import org.w3c.dom.Document; /* @@ -44,7 +44,7 @@ import org.w3c.dom.Document; * @summary jpackage application version testing * @library ../../../../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile AppVersionTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=jdk.jpackage.tests.AppVersionTest diff --git a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/BasicTest.java b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/BasicTest.java index 33f476a5ddd..c93c51ab24b 100644 --- a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/BasicTest.java +++ b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/BasicTest.java @@ -48,7 +48,7 @@ import jdk.jpackage.test.Annotations.Parameter; * @summary jpackage basic testing * @library ../../../../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile BasicTest.java * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main * --jpt-run=jdk.jpackage.tests.BasicTest diff --git a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/CookedRuntimeTest.java b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/CookedRuntimeTest.java index 382836f07a9..f61fff69fe6 100644 --- a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/CookedRuntimeTest.java +++ b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/CookedRuntimeTest.java @@ -44,7 +44,7 @@ import jdk.jpackage.test.TKit; * @summary test '--runtime-image' option of jpackage * @library ../../../../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile CookedRuntimeTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=jdk.jpackage.tests.CookedRuntimeTest diff --git a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/ErrorTest.java b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/ErrorTest.java index ba78f7caf07..95f7ff9a12d 100644 --- a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/ErrorTest.java +++ b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/ErrorTest.java @@ -35,7 +35,7 @@ import jdk.jpackage.test.TKit; * @summary jpackage application version testing * @library ../../../../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile ErrorTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=jdk.jpackage.tests.ErrorTest @@ -47,7 +47,7 @@ import jdk.jpackage.test.TKit; * @summary jpackage application version testing * @library ../../../../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile ErrorTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=jdk.jpackage.tests.ErrorTest diff --git a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/JLinkOptionsTest.java b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/JLinkOptionsTest.java index 50f22fe634f..5f97df482bf 100644 --- a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/JLinkOptionsTest.java +++ b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/JLinkOptionsTest.java @@ -35,7 +35,7 @@ import jdk.jpackage.test.TKit; * @summary jpackage application version testing * @library ../../../../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile JLinkOptionsTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=jdk.jpackage.tests.JLinkOptionsTest @@ -92,7 +92,7 @@ public final class JLinkOptionsTest { // should have whatever it needs new String[]{"java.base", "com.other"}, // should not have whatever it doesn't need - new String[]{"jdk.incubator.jpackage"}, + new String[]{"jdk.jpackage"}, }, // bind-services and limit-options diff --git a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/JavaOptionsEqualsTest.java b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/JavaOptionsEqualsTest.java index 9858ce928b5..c63892a2ca0 100644 --- a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/JavaOptionsEqualsTest.java +++ b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/JavaOptionsEqualsTest.java @@ -37,7 +37,7 @@ import jdk.jpackage.test.TKit; * @summary jpackage create image with --java-options test * @library ../../../../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile JavaOptionsEqualsTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=jdk.jpackage.tests.JavaOptionsEqualsTest @@ -49,7 +49,7 @@ import jdk.jpackage.test.TKit; * @summary jpackage create image with --java-options test * @library ../../../../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile JavaOptionsEqualsTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=jdk.jpackage.tests.JavaOptionsEqualsTest diff --git a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/JavaOptionsTest.java b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/JavaOptionsTest.java index 069ec10f3c1..ab2f7a3d15d 100644 --- a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/JavaOptionsTest.java +++ b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/JavaOptionsTest.java @@ -37,7 +37,7 @@ import jdk.jpackage.test.TKit; * @summary jpackage create image with --java-options test * @library ../../../../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile JavaOptionsTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=jdk.jpackage.tests.JavaOptionsTest diff --git a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/MainClassTest.java b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/MainClassTest.java index bf0a6e34c06..c39b9d6ff6e 100644 --- a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/MainClassTest.java +++ b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/MainClassTest.java @@ -53,7 +53,7 @@ import static jdk.jpackage.tests.MainClassTest.Script.MainClassType.*; * @summary test different settings of main class name for jpackage * @library ../../../../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile MainClassTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=jdk.jpackage.tests.MainClassTest diff --git a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest.java b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest.java index 77fa37ead72..1c5ead2ad65 100644 --- a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest.java +++ b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest.java @@ -46,7 +46,7 @@ import jdk.jpackage.test.Annotations.Test; * @summary jpackage with --module-path testing * @library ../../../../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile ModulePathTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=jdk.jpackage.tests.ModulePathTest diff --git a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest2.java b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest2.java index ef1bc9d4b1a..7bfe998014c 100644 --- a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest2.java +++ b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest2.java @@ -38,7 +38,7 @@ import jdk.jpackage.test.TKit; * @summary jpackage with --module-path testing * @library ../../../../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile ModulePathTest2.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=jdk.jpackage.tests.ModulePathTest2 diff --git a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest3.java b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest3.java index d916fe5c7de..c7c33fa8617 100644 --- a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest3.java +++ b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest3.java @@ -32,7 +32,7 @@ import java.util.List; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathFactory; -import jdk.incubator.jpackage.internal.AppImageFile; +import jdk.jpackage.internal.AppImageFile; import jdk.jpackage.test.HelloApp; import jdk.jpackage.test.JavaAppDesc; import jdk.jpackage.test.Annotations.Test; @@ -51,7 +51,7 @@ import org.w3c.dom.Document; * @summary jpackage for app's module linked in external runtime * @library ../../../../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile ModulePathTest3.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=jdk.jpackage.tests.ModulePathTest3 @@ -62,7 +62,7 @@ import org.w3c.dom.Document; * @summary jpackage for app's module linked in external runtime * @library ../../../../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile ModulePathTest3.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=jdk.jpackage.tests.ModulePathTest3 diff --git a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/MultipleJarAppTest.java b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/MultipleJarAppTest.java index ae0901b239c..3ce9f62d8d2 100644 --- a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/MultipleJarAppTest.java +++ b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/MultipleJarAppTest.java @@ -35,7 +35,7 @@ import jdk.jpackage.test.JPackageCommand; * @summary jpackage application packed in multiple jars * @library ../../../../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile MultipleJarAppTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=jdk.jpackage.tests.MultipleJarAppTest diff --git a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/NonExistentTest.java b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/NonExistentTest.java index 34844fbf882..3790c9002ca 100644 --- a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/NonExistentTest.java +++ b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/NonExistentTest.java @@ -35,7 +35,7 @@ import jdk.jpackage.test.TKit; * @summary jpackage application version testing * @library ../../../../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile NonExistentTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=jdk.jpackage.tests.NonExistentTest diff --git a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/UnicodeArgsTest.java b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/UnicodeArgsTest.java index cd37e7ae6e3..10e2e38ec5c 100644 --- a/test/jdk/tools/jpackage/share/jdk/jpackage/tests/UnicodeArgsTest.java +++ b/test/jdk/tools/jpackage/share/jdk/jpackage/tests/UnicodeArgsTest.java @@ -35,7 +35,7 @@ import jdk.jpackage.test.JPackageCommand; * @summary test how app launcher handles unicode command line arguments * @library ../../../../helpers * @build jdk.jpackage.test.* - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile UnicodeArgsTest.java * @requires (os.family == "windows") * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main diff --git a/test/jdk/tools/jpackage/windows/WinConsoleTest.java b/test/jdk/tools/jpackage/windows/WinConsoleTest.java index 806b6bad26c..7a4e9ccfa5a 100644 --- a/test/jdk/tools/jpackage/windows/WinConsoleTest.java +++ b/test/jdk/tools/jpackage/windows/WinConsoleTest.java @@ -37,7 +37,7 @@ import jdk.jpackage.test.Annotations.Parameter; * @library ../helpers * @build jdk.jpackage.test.* * @requires (os.family == "windows") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile WinConsoleTest.java * * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main diff --git a/test/jdk/tools/jpackage/windows/WinDirChooserTest.java b/test/jdk/tools/jpackage/windows/WinDirChooserTest.java index 5b994f4cf68..f64a5b2c6e7 100644 --- a/test/jdk/tools/jpackage/windows/WinDirChooserTest.java +++ b/test/jdk/tools/jpackage/windows/WinDirChooserTest.java @@ -40,7 +40,7 @@ import jdk.jpackage.test.PackageType; * @key jpackagePlatformPackage * @build jdk.jpackage.test.* * @requires (os.family == "windows") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @run main/othervm/timeout=360 -Xmx512m WinDirChooserTest */ diff --git a/test/jdk/tools/jpackage/windows/WinL10nTest.java b/test/jdk/tools/jpackage/windows/WinL10nTest.java index 72496b9b6d5..4171da208a4 100644 --- a/test/jdk/tools/jpackage/windows/WinL10nTest.java +++ b/test/jdk/tools/jpackage/windows/WinL10nTest.java @@ -42,7 +42,7 @@ import jdk.jpackage.test.Executor; * @requires (jpackage.test.SQETest == null) * @build jdk.jpackage.test.* * @requires (os.family == "windows") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile WinL10nTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinL10nTest diff --git a/test/jdk/tools/jpackage/windows/WinMenuGroupTest.java b/test/jdk/tools/jpackage/windows/WinMenuGroupTest.java index 13691f94424..b8b748a6ca1 100644 --- a/test/jdk/tools/jpackage/windows/WinMenuGroupTest.java +++ b/test/jdk/tools/jpackage/windows/WinMenuGroupTest.java @@ -43,7 +43,7 @@ import jdk.jpackage.test.Annotations.Test; * @key jpackagePlatformPackage * @build jdk.jpackage.test.* * @requires (os.family == "windows") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile WinMenuGroupTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinMenuGroupTest diff --git a/test/jdk/tools/jpackage/windows/WinMenuTest.java b/test/jdk/tools/jpackage/windows/WinMenuTest.java index 15a3bf8734a..e39a16465fe 100644 --- a/test/jdk/tools/jpackage/windows/WinMenuTest.java +++ b/test/jdk/tools/jpackage/windows/WinMenuTest.java @@ -40,7 +40,7 @@ import jdk.jpackage.test.Annotations.Test; * @key jpackagePlatformPackage * @build jdk.jpackage.test.* * @requires (os.family == "windows") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile WinMenuTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinMenuTest diff --git a/test/jdk/tools/jpackage/windows/WinPerUserInstallTest.java b/test/jdk/tools/jpackage/windows/WinPerUserInstallTest.java index 6667ba401de..2020c27975b 100644 --- a/test/jdk/tools/jpackage/windows/WinPerUserInstallTest.java +++ b/test/jdk/tools/jpackage/windows/WinPerUserInstallTest.java @@ -41,7 +41,7 @@ import jdk.jpackage.test.Annotations.Test; * @key jpackagePlatformPackage * @build jdk.jpackage.test.* * @requires (os.family == "windows") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile WinPerUserInstallTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinPerUserInstallTest diff --git a/test/jdk/tools/jpackage/windows/WinResourceTest.java b/test/jdk/tools/jpackage/windows/WinResourceTest.java index 8200241a468..c7610aafa33 100644 --- a/test/jdk/tools/jpackage/windows/WinResourceTest.java +++ b/test/jdk/tools/jpackage/windows/WinResourceTest.java @@ -42,7 +42,7 @@ import java.util.List; * @library ../helpers * @build jdk.jpackage.test.* * @requires (os.family == "windows") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile WinResourceTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinResourceTest diff --git a/test/jdk/tools/jpackage/windows/WinScriptTest.java b/test/jdk/tools/jpackage/windows/WinScriptTest.java index d807977375d..3a2f095152b 100644 --- a/test/jdk/tools/jpackage/windows/WinScriptTest.java +++ b/test/jdk/tools/jpackage/windows/WinScriptTest.java @@ -25,7 +25,7 @@ import java.io.IOException; import java.nio.file.Path; import java.util.List; import java.util.ArrayList; -import jdk.incubator.jpackage.internal.IOUtils; +import jdk.jpackage.internal.IOUtils; import jdk.jpackage.test.TKit; import jdk.jpackage.test.PackageTest; import jdk.jpackage.test.PackageType; @@ -40,7 +40,7 @@ import jdk.jpackage.test.JPackageCommand; * @library ../helpers * @build jdk.jpackage.test.* * @requires (os.family == "windows") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile WinScriptTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinScriptTest diff --git a/test/jdk/tools/jpackage/windows/WinShortcutTest.java b/test/jdk/tools/jpackage/windows/WinShortcutTest.java index dbd2447b857..f50f07a8905 100644 --- a/test/jdk/tools/jpackage/windows/WinShortcutTest.java +++ b/test/jdk/tools/jpackage/windows/WinShortcutTest.java @@ -41,7 +41,7 @@ import jdk.jpackage.test.Annotations.Test; * @key jpackagePlatformPackage * @build jdk.jpackage.test.* * @requires (os.family == "windows") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile WinShortcutTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinShortcutTest diff --git a/test/jdk/tools/jpackage/windows/WinUpgradeUUIDTest.java b/test/jdk/tools/jpackage/windows/WinUpgradeUUIDTest.java index f1effb3f07b..0c233b0e652 100644 --- a/test/jdk/tools/jpackage/windows/WinUpgradeUUIDTest.java +++ b/test/jdk/tools/jpackage/windows/WinUpgradeUUIDTest.java @@ -51,7 +51,7 @@ import jdk.jpackage.test.TKit; * @requires (jpackage.test.SQETest != null) * @build jdk.jpackage.test.* * @requires (os.family == "windows") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile WinUpgradeUUIDTest.java * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinUpgradeUUIDTest.test @@ -65,7 +65,7 @@ import jdk.jpackage.test.TKit; * @requires (jpackage.test.SQETest == null) * @build jdk.jpackage.test.* * @requires (os.family == "windows") - * @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal + * @modules jdk.jpackage/jdk.jpackage.internal * @compile WinUpgradeUUIDTest.java * @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinUpgradeUUIDTest