8252870: Finalize (remove "incubator" from) jpackage

Reviewed-by: kcr, erikj, almatvee, asemenyuk, prr, ihse

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
 
 ################################################################################
 

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
 
 ################################################################################

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)

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, \
 ))

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, \

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

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,

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.

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
     //

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() {

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 {
 

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 {
 

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 {
 

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

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;
 

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;
 

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;
 

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() {

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";

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";
 

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 {
 

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;

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";

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";
 

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;
 

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

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;

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

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 {

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 {
 

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;

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",

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;

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 {
 

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;

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;

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;

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) {

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.

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;

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;

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;

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;

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() {

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");
         }

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;

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;

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);

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.

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;

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

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);

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;

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;
 

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;
 

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;

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.

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<T> extends BundlerParamInfo<T> {
                     Path.class,
                     params -> {
                         try {
-                            return Files.createTempDirectory("jdk.incubator.jpackage");
+                            return Files.createTempDirectory("jdk.jpackage");
                         } catch (IOException ioe) {
                             return null;
                         }

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;

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

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