hg: jdk/sandbox: 5 new changesets
andy.herrick at oracle.com
andy.herrick at oracle.com
Mon Mar 11 21:16:39 UTC 2019
Changeset: f0e513137db2
Author: herrick
Date: 2019-03-11 13:21 -0400
URL: http://hg.openjdk.java.net/jdk/sandbox/rev/f0e513137db2
Merge
- make/devkit/createMacosxDevkit6.sh
- make/devkit/createMacosxDevkit9.sh
- make/devkit/createWindowsDevkit2013.sh
- make/devkit/createWindowsDevkit2015.sh
- src/hotspot/os_cpu/linux_aarch64/linux_aarch64.ad
- src/hotspot/os_cpu/linux_sparc/linux_sparc.ad
- src/hotspot/share/classfile/dictionary.inline.hpp
- src/hotspot/share/prims/evmCompat.cpp
- src/hotspot/share/utilities/intHisto.cpp
- src/hotspot/share/utilities/intHisto.hpp
- src/java.base/share/classes/com/sun/net/ssl/HostnameVerifier.java
- src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java
- src/java.base/share/classes/com/sun/net/ssl/KeyManager.java
- src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java
- src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java
- src/java.base/share/classes/com/sun/net/ssl/SSLContext.java
- src/java.base/share/classes/com/sun/net/ssl/SSLContextSpi.java
- src/java.base/share/classes/com/sun/net/ssl/SSLPermission.java
- src/java.base/share/classes/com/sun/net/ssl/SSLSecurity.java
- src/java.base/share/classes/com/sun/net/ssl/TrustManager.java
- src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java
- src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java
- src/java.base/share/classes/com/sun/net/ssl/X509KeyManager.java
- src/java.base/share/classes/com/sun/net/ssl/X509TrustManager.java
- src/java.base/share/classes/com/sun/net/ssl/internal/ssl/Provider.java
- src/java.base/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java
- src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java
- src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java
- src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java
- src/java.base/share/classes/com/sun/net/ssl/package-info.java
- src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/BaseStructure.java
- src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/Marshaller.java
- src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XmlWriter.java
- src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/XmlWriterToTree.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlConstants.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlVersion.java
- test/hotspot/gtest/memory/test_virtualSpaceNode.cpp
- test/jdk/com/sun/net/ssl/SSLSecurity/ComKeyManagerFactoryImpl.java
- test/jdk/com/sun/net/ssl/SSLSecurity/ComSSLContextImpl.java
- test/jdk/com/sun/net/ssl/SSLSecurity/ComTrustManagerFactoryImpl.java
- test/jdk/com/sun/net/ssl/SSLSecurity/JavaxKeyManagerFactoryImpl.java
- test/jdk/com/sun/net/ssl/SSLSecurity/JavaxSSLContextImpl.java
- test/jdk/com/sun/net/ssl/SSLSecurity/JavaxTrustManagerFactoryImpl.java
- test/jdk/com/sun/net/ssl/SSLSecurity/ProviderTest.java
- test/jdk/com/sun/net/ssl/SSLSecurity/TruncateArray.java
- test/jdk/javax/net/ssl/FixingJavadocs/ComURLNulls.java
- test/jdk/javax/net/ssl/SSLSession/CheckMyTrustedKeystore.java
- test/jdk/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java
- test/jdk/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java
- test/jdk/sun/security/ssl/X509TrustManagerImpl/ClientServer.java
- test/langtools/jdk/javadoc/tool/removeOldDoclet/OldDoclet.jasm
Changeset: c1b92a014e89
Author: herrick
Date: 2019-03-11 13:24 -0400
URL: http://hg.openjdk.java.net/jdk/sandbox/rev/c1b92a014e89
8214566: --win-dir-chooser does not prompt if destination folder is not empty
Submitten-by: almatvee
Reviewed-by: herrick
! make/lib/Lib-jdk.jpackage.gmk
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/template.wxs
+ src/jdk.jpackage/windows/native/libwixhelper/libwixhelper.cpp
Changeset: f686bda3b831
Author: herrick
Date: 2019-03-11 13:31 -0400
URL: http://hg.openjdk.java.net/jdk/sandbox/rev/f686bda3b831
8215574: Investigate and document usage of --category, --copyright, --vendor and --description
Submitten-by: almatvee
Reviewed-by: herrick
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.control
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.desktop
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundleParams.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/template.iss
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/template.jre.iss
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/template.jre.wxs
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/template.wxs
Changeset: d7c27451f759
Author: herrick
Date: 2019-03-11 14:44 -0400
URL: http://hg.openjdk.java.net/jdk/sandbox/rev/d7c27451f759
8219678: CLI changes in jpackage
Reviewed-by: almatvee
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_ja.properties
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources_zh_CN.properties
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.postinst
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.prerm
! src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.spec
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppStoreBundler.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
! src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractBundler.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractImageBundler.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/BundleParams.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/EnumeratedBundlerParam.java
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/JLinkBundlerHelper.java
- src/jdk.jpackage/share/classes/jdk/jpackage/internal/SecondaryLauncherArguments.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/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
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsAppImageBuilder.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WindowsBundlerParam.java
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_ja.properties
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources_zh_CN.properties
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/template.iss
! src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/template.wxs
+ test/jdk/tools/jpackage/createimage/JPackageCreateImageAddLauncherBase.java
+ test/jdk/tools/jpackage/createimage/JPackageCreateImageAddLauncherModuleTest.java
+ test/jdk/tools/jpackage/createimage/JPackageCreateImageAddLauncherTest.java
- test/jdk/tools/jpackage/createimage/JPackageCreateImageBuildRootTest.java
- test/jdk/tools/jpackage/createimage/JPackageCreateImageSecondaryLauncherBase.java
- test/jdk/tools/jpackage/createimage/JPackageCreateImageSecondaryLauncherModuleTest.java
- test/jdk/tools/jpackage/createimage/JPackageCreateImageSecondaryLauncherTest.java
+ test/jdk/tools/jpackage/createimage/JPackageCreateImageTempRootTest.java
Changeset: 69ad9df313e4
Author: herrick
Date: 2019-03-11 15:15 -0400
URL: http://hg.openjdk.java.net/jdk/sandbox/rev/69ad9df313e4
8219679: Help text changes in jpackage
Reviewed-by: almatvee
! src/jdk.jpackage/share/classes/jdk/jpackage/internal/CLIHelp.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
More information about the jdk-sandbox-changes
mailing list