jdk/test/tools/lib/tests/JImageGenerator.java

*** 104,117 ****
  
      private static final String OUTPUT_OPTION = "--output";
      private static final String POST_PROCESS_OPTION = "--post-process-path";
      private static final String MAIN_CLASS_OPTION = "--main-class";
      private static final String CLASS_PATH_OPTION = "--class-path";
!     private static final String MODULE_PATH_OPTION = "--modulepath";
!     private static final String ADD_MODS_OPTION = "--addmods";
!     private static final String LIMIT_MODS_OPTION = "--limitmods";
!     private static final String PLUGINS_MODULE_PATH = "--plugin-module-path";
  
      private static final String CMDS_OPTION = "--cmds";
      private static final String CONFIG_OPTION = "--config";
      private static final String HASH_MODULES_OPTION = "--hash-modules";
      private static final String LIBS_OPTION = "--libs";
--- 104,117 ----
  
      private static final String OUTPUT_OPTION = "--output";
      private static final String POST_PROCESS_OPTION = "--post-process-path";
      private static final String MAIN_CLASS_OPTION = "--main-class";
      private static final String CLASS_PATH_OPTION = "--class-path";
!     private static final String MODULE_PATH_OPTION = "--module-path";
!     private static final String ADD_MODULES_OPTION = "--add-modules";
!     private static final String LIMIT_MODULES_OPTION = "--limit-modules";
!     private static final String PLUGIN_MODULE_PATH = "--plugin-module-path";
  
      private static final String CMDS_OPTION = "--cmds";
      private static final String CONFIG_OPTION = "--config";
      private static final String HASH_MODULES_OPTION = "--hash-modules";
      private static final String LIBS_OPTION = "--libs";
*** 532,542 ****
              if (dir != null) {
                  options.add("--dir");
                  options.add(dir.toString());
              }
              if (!pluginModulePath.isEmpty()) {
!                 options.add(PLUGINS_MODULE_PATH);
                  options.add(toPath(pluginModulePath));
              }
              options.addAll(this.options);
              options.add(image.toString());
              return options.toArray(new String[options.size()]);
--- 532,542 ----
              if (dir != null) {
                  options.add("--dir");
                  options.add(dir.toString());
              }
              if (!pluginModulePath.isEmpty()) {
!                 options.add(PLUGIN_MODULE_PATH);
                  options.add(toPath(pluginModulePath));
              }
              options.addAll(this.options);
              options.add(image.toString());
              return options.toArray(new String[options.size()]);
*** 630,644 ****
              if (output != null) {
                  options.add(OUTPUT_OPTION);
                  options.add(output.toString());
              }
              if (!addMods.isEmpty()) {
!                 options.add(ADD_MODS_OPTION);
                  options.add(addMods.stream().collect(Collectors.joining(",")));
              }
              if (!limitMods.isEmpty()) {
!                 options.add(LIMIT_MODS_OPTION);
                  options.add(limitMods.stream().collect(Collectors.joining(",")));
              }
              if (!jars.isEmpty() || !jmods.isEmpty()) {
                  options.add(MODULE_PATH_OPTION);
                  options.add(modulePath());
--- 630,644 ----
              if (output != null) {
                  options.add(OUTPUT_OPTION);
                  options.add(output.toString());
              }
              if (!addMods.isEmpty()) {
!                 options.add(ADD_MODULES_OPTION);
                  options.add(addMods.stream().collect(Collectors.joining(",")));
              }
              if (!limitMods.isEmpty()) {
!                 options.add(LIMIT_MODULES_OPTION);
                  options.add(limitMods.stream().collect(Collectors.joining(",")));
              }
              if (!jars.isEmpty() || !jmods.isEmpty()) {
                  options.add(MODULE_PATH_OPTION);
                  options.add(modulePath());
*** 646,656 ****
              if (modulePath != null) {
                  options.add(MODULE_PATH_OPTION);
                  options.add(modulePath);
              }
              if (!pluginModulePath.isEmpty()) {
!                 options.add(PLUGINS_MODULE_PATH);
                  options.add(toPath(pluginModulePath));
              }
              options.addAll(this.options);
              return options.toArray(new String[options.size()]);
          }
--- 646,656 ----
              if (modulePath != null) {
                  options.add(MODULE_PATH_OPTION);
                  options.add(modulePath);
              }
              if (!pluginModulePath.isEmpty()) {
!                 options.add(PLUGIN_MODULE_PATH);
                  options.add(toPath(pluginModulePath));
              }
              options.addAll(this.options);
              return options.toArray(new String[options.size()]);
          }