src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Arguments.java

*** 168,177 ****
--- 168,182 ----
          ARGUMENTS ("arguments", OptionCategories.PROPERTY, () -> {
              List<String> arguments = getArgumentList(popArg());
              setOptionValue("arguments", arguments);
          }),
  
+         JLINK_OPTIONS ("jlink-options", OptionCategories.PROPERTY, () -> {
+             List<String> options = getArgumentList(popArg());
+             setOptionValue("jlink-options", options);
+         }),
+ 
          ICON ("icon", OptionCategories.PROPERTY),
  
          COPYRIGHT ("copyright", OptionCategories.PROPERTY),
  
          LICENSE_FILE ("license-file", OptionCategories.PROPERTY),
*** 262,271 ****
--- 267,277 ----
          ADD_MODULES ("add-modules", OptionCategories.MODULAR),
  
          MODULE_PATH ("module-path", "p", OptionCategories.MODULAR),
  
          BIND_SERVICES ("bind-services", OptionCategories.PROPERTY, () -> {
+             showDeprecation("bind-services");
              setOptionValue("bind-services", true);
          }),
  
          MAC_SIGN ("mac-sign", "s", OptionCategories.PLATFORM_MAC, () -> {
              setOptionValue("mac-sign", true);
*** 577,587 ****
              if (allOptions.contains(CLIOptions.BIND_SERVICES)) {
                  throw new PackagerException("ERR_MutuallyExclusiveOptions",
                          CLIOptions.PREDEFINED_RUNTIME_IMAGE.getIdWithPrefix(),
                          CLIOptions.BIND_SERVICES.getIdWithPrefix());
              }
! 
          }
          if (hasMainJar && hasMainModule) {
              throw new PackagerException("ERR_BothMainJarAndModule");
          }
          if (imageOnly && !hasMainJar && !hasMainModule) {
--- 583,597 ----
              if (allOptions.contains(CLIOptions.BIND_SERVICES)) {
                  throw new PackagerException("ERR_MutuallyExclusiveOptions",
                          CLIOptions.PREDEFINED_RUNTIME_IMAGE.getIdWithPrefix(),
                          CLIOptions.BIND_SERVICES.getIdWithPrefix());
              }
!             if (allOptions.contains(CLIOptions.JLINK_OPTIONS)) {
!                 throw new PackagerException("ERR_MutuallyExclusiveOptions",
!                         CLIOptions.PREDEFINED_RUNTIME_IMAGE.getIdWithPrefix(),
!                         CLIOptions.JLINK_OPTIONS.getIdWithPrefix());
!             }
          }
          if (hasMainJar && hasMainModule) {
              throw new PackagerException("ERR_BothMainJarAndModule");
          }
          if (imageOnly && !hasMainJar && !hasMainModule) {
*** 763,774 ****
          for (int i = 0; i < codeLen; i++) {
              int code = in.codePointAt(i);
              if (code == '"' || code == '\'') {
                  // If quote is escaped make sure to copy it
                  if (i > 0 && in.codePointAt(i - 1) == '\\') {
!                     sb.deleteCharAt(sb.length() - 1);
!                     sb.appendCodePoint(code);
                      continue;
                  }
                  if (quoteChar != -1) {
                      if (code == quoteChar) {
                          // close quote, skip char
--- 773,783 ----
          for (int i = 0; i < codeLen; i++) {
              int code = in.codePointAt(i);
              if (code == '"' || code == '\'') {
                  // If quote is escaped make sure to copy it
                  if (i > 0 && in.codePointAt(i - 1) == '\\') {
!                     sb.deleteCharAt(sb.length() - 1); sb.appendCodePoint(code);
                      continue;
                  }
                  if (quoteChar != -1) {
                      if (code == quoteChar) {
                          // close quote, skip char
*** 807,812 ****
--- 816,825 ----
              }
          } catch (IOException ignore) {}
          return null;
      }
  
+     private static void showDeprecation(String option) {
+         Log.error(MessageFormat.format(I18N.getString("warning.deprecation"),
+                 option));
+     }
  }