hg: jdk/sandbox: 2 new changesets

[andy.herrick at oracle.com]

Changeset: f2d429260ad4
Author:    herrick
Date:      2019-03-28 13:47 -0400
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/f2d429260ad4

8221582: Rename jvm-args option to java-options
Reviewed-by: kbr, ssadetski

! src/demo/share/jpackage/JNLPConverter/src/jnlp/converter/JNLPConverter.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/Info.plist.template
! src/jdk.jpackage/macosx/native/libapplauncher/MacPlatform.mm
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/AddLauncherArguments.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/ValidOptions.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties
! src/jdk.jpackage/share/native/libapplauncher/Helpers.cpp
! src/jdk.jpackage/share/native/libapplauncher/Package.cpp
! src/jdk.jpackage/share/native/libapplauncher/Platform.cpp
! src/jdk.jpackage/share/native/libapplauncher/Platform.h
! test/jdk/tools/jpackage/createimage/JPackageCreateImageAddLauncherBase.java
- test/jdk/tools/jpackage/createimage/JPackageCreateImageJVMArgsBase.java
- test/jdk/tools/jpackage/createimage/JPackageCreateImageJVMArgsModuleTest.java
- test/jdk/tools/jpackage/createimage/JPackageCreateImageJVMArgsTest.java
+ test/jdk/tools/jpackage/createimage/JPackageCreateImageJavaOptionsBase.java
+ test/jdk/tools/jpackage/createimage/JPackageCreateImageJavaOptionsModuleTest.java
+ test/jdk/tools/jpackage/createimage/JPackageCreateImageJavaOptionsTest.java

Changeset: 7a683c461b80
Author:    herrick
Date:      2019-03-28 13:49 -0400
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/7a683c461b80

Merge