hg: jdk/sandbox: 4 new changesets

[andy.herrick at oracle.com]

Changeset: 1d6f8a7c6d5a
Author:    herrick
Date:      2019-02-12 11:54 -0500
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/1d6f8a7c6d5a

8217687: jpackage --help improvements
Reviewed-by: almatvee

! src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractImageBundler.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.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/classes/jdk/jpackage/internal/resources/MainResources.properties
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties
- test/jdk/tools/jpackage/createimage/JPackageCreateImageForceTest.java
+ test/jdk/tools/jpackage/createimage/JPackageCreateImageOverwriteTest.java
! test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerBase.java
! test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerBundleNameBase.java
! test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerFileAssociationsBase.java
! test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerInstallDirBase.java
! test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerLicenseBase.java
! test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerLicenseTypeBase.java
! test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerPackageDepsBase.java
! test/jdk/tools/jpackage/createinstaller/macosx/base/JPackageCreateInstallerBase.java
! test/jdk/tools/jpackage/createinstaller/macosx/base/JPackageCreateInstallerFileAssociationsBase.java
! test/jdk/tools/jpackage/createinstaller/macosx/base/JPackageCreateInstallerInstallDirBase.java
! test/jdk/tools/jpackage/createinstaller/macosx/base/JPackageCreateInstallerLicenseBase.java
! test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerBase.java
! test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerFileAssociationsBase.java
! test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerLicenseBase.java
! test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinDirChooserBase.java
! test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinMenuBase.java
! test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinMenuGroupBase.java
! test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinPerUserInstallBase.java
! test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinRegistryNameBase.java
! test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinShortcutBase.java

Changeset: d10b861e8d62
Author:    herrick
Date:      2019-02-12 11:58 -0500
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/d10b861e8d62

8214564: --win-upgrade-uuid does not work as expected
Submitten-by: almatvee
Reviewed-by: herrick, ihse

! src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/template.jre.wxs
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/template.wxs
- test/jdk/tools/jpackage/createimage/JPackageCreateImageBuildRootTest.java.rej
+ test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinUpgradeUUIDBase.java
+ test/jdk/tools/jpackage/createinstaller/windows/exe/JPackageCreateInstallerWinUpgradeUUIDTest.java
! test/jdk/tools/jpackage/createinstaller/windows/exe/install.bat
! test/jdk/tools/jpackage/createinstaller/windows/exe/uninstall.bat
+ test/jdk/tools/jpackage/createinstaller/windows/msi/JPackageCreateInstallerWinUpgradeUUIDTest.java
! test/jdk/tools/jpackage/createinstaller/windows/msi/install.bat
! test/jdk/tools/jpackage/createinstaller/windows/msi/uninstall.bat
! test/jdk/tools/jpackage/helpers/JPackagePath.java

Changeset: 2d71241be958
Author:    herrick
Date:      2019-02-13 13:22 -0500
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/2d71241be958

Merge

! make/CompileDemos.gmk
! make/CompileJavaModules.gmk
! make/common/Modules.gmk
! make/common/NativeCompilation.gmk
- src/hotspot/share/code/relocInfo_ext.cpp
- src/hotspot/share/code/relocInfo_ext.hpp
- src/hotspot/share/gc/g1/collectionSetChooser.cpp
- src/hotspot/share/gc/g1/collectionSetChooser.hpp
- src/java.desktop/windows/native/libawt/windows/awt_Robot.h
- test/hotspot/jtreg/serviceability/dcmd/framework/TEST.properties
- test/jdk/sun/security/krb5/auto/rcache_usemd5.sh
- test/jdk/sun/security/krb5/tools/ktarg.sh
- test/jdk/sun/security/krb5/tools/ktcheck.sh
- test/jdk/sun/security/krb5/tools/ktmissing.sh
- test/jdk/sun/security/krb5/tools/ktzero.sh

Changeset: 43b208f90d2f
Author:    herrick
Date:      2019-02-13 13:25 -0500
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/43b208f90d2f

Merge

- test/jdk/sun/security/pkcs11/fips/CipherTest.java
- test/jdk/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java
- test/jdk/sun/security/pkcs11/fips/ImportKeyStore.java
- test/jdk/sun/security/pkcs11/fips/JSSEClient.java
- test/jdk/sun/security/pkcs11/fips/JSSEServer.java
- test/jdk/sun/security/pkcs11/fips/TestTLS12.java
- test/jdk/sun/security/pkcs11/fips/TrustManagerTest.java
- test/jdk/sun/security/pkcs11/fips/TrustManagerTest.policy
- test/jdk/sun/security/pkcs11/fips/cert8.db
- test/jdk/sun/security/pkcs11/fips/certs/anchor.cer
- test/jdk/sun/security/pkcs11/fips/certs/ca.cer
- test/jdk/sun/security/pkcs11/fips/certs/server.cer
- test/jdk/sun/security/pkcs11/fips/fips.cfg
- test/jdk/sun/security/pkcs11/fips/key3.db
- test/jdk/sun/security/pkcs11/fips/keystore
- test/jdk/sun/security/pkcs11/fips/secmod.db
- test/jdk/sun/security/pkcs11/fips/truststore