hg: jdk/sandbox: Merge
andy.herrick at oracle.com
andy.herrick at oracle.com
Tue Apr 7 12:36:05 UTC 2020
Changeset: 581494d6caf4
Author: herrick
Date: 2020-04-07 08:35 -0400
URL: https://hg.openjdk.java.net/jdk/sandbox/rev/581494d6caf4
Merge
! make/CompileDemos.gmk
- make/CompileInterimRmic.gmk
! make/CompileJavaModules.gmk
- make/CopyInterimCLDRConverter.gmk
- make/Help.gmk
- make/autoconf/basics.m4
- make/autoconf/basics_windows.m4
! make/common/Modules.gmk
! make/common/NativeCompilation.gmk
- make/common/RMICompilation.gmk
! make/lib/Lib-jdk.incubator.jpackage.gmk
- make/rmic/Rmic-java.management.rmi.gmk
- make/rmic/Rmic-java.rmi.gmk
- make/rmic/Rmic-jdk.naming.rmi.gmk
- make/rmic/RmicCommon.gmk
- src/demo/share/jfc/Font2DTest/Font2DTestApplet.java
- src/demo/share/jfc/SwingSet2/SwingSet2Applet.java
- src/hotspot/share/gc/shared/concurrentGCPhaseManager.cpp
- src/hotspot/share/gc/shared/concurrentGCPhaseManager.hpp
- src/hotspot/share/gc/shared/owstTaskTerminator.cpp
- src/hotspot/share/gc/shared/owstTaskTerminator.hpp
- src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalAggressiveHeuristics.cpp
- src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalAggressiveHeuristics.hpp
- src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp
- src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.hpp
- src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.cpp
- src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.hpp
- src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.cpp
- src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.hpp
- src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp
- src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp
- src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp
- src/hotspot/share/gc/shenandoah/shenandoahTraversalMode.cpp
- src/hotspot/share/gc/shenandoah/shenandoahTraversalMode.hpp
- src/hotspot/share/runtime/fieldType.cpp
- src/hotspot/share/runtime/fieldType.hpp
- src/java.base/linux/classes/jdk/internal/platform/cgroupv1/Metrics.java
- src/java.base/linux/classes/jdk/internal/platform/cgroupv1/SubSystem.java
- src/java.base/macosx/classes/java/lang/ClassLoaderHelper.java
! src/java.base/macosx/native/libjli/java_md_macosx.m
- src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java
- src/java.base/share/classes/java/lang/reflect/ProxyGenerator_v49.java
- src/java.base/share/classes/java/time/chrono/hijrah-config-islamic-umalqura.properties
! src/java.base/share/classes/module-info.java
- src/java.base/unix/classes/java/lang/ClassLoaderHelper.java
- src/java.base/windows/classes/java/lang/ClassLoaderHelper.java
- src/java.rmi/share/doc/stub/java/rmi/activation/ActivationGroup_Stub.java
! src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/DesktopIntegration.java
! src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxRpmBundler.java
! src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources_ja.properties
! src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/LinuxResources_zh_CN.properties
! src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppImageBuilder.java
! src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacPkgBundler.java
! src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources.properties
! src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources_ja.properties
! src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacResources_zh_CN.properties
! src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/DeployParams.java
! src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources_ja.properties
! src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources_zh_CN.properties
! src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources.properties
! src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources_ja.properties
! src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources_zh_CN.properties
! src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/main/Main.java
! src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/MsiInstallerStrings_ja.wxl
! src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/MsiInstallerStrings_zh_CN.wxl
! src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinLauncher.template
! src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinResources_ja.properties
! src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinResources_zh_CN.properties
! src/jdk.incubator.jpackage/windows/native/libapplauncher/WindowsPlatform.cpp
- src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/dumb-colors.caps
- src/jdk.internal.vm.compiler/.mx.graal/.project
- src/jdk.internal.vm.compiler/.mx.graal/.pydevproject
- src/jdk.internal.vm.compiler/.mx.graal/eclipse-settings/org.eclipse.jdt.core.prefs
- src/jdk.internal.vm.compiler/.mx.graal/mx_graal.py
- src/jdk.internal.vm.compiler/.mx.graal/mx_graal_9.py
- src/jdk.internal.vm.compiler/.mx.graal/mx_graal_bench.py
- src/jdk.internal.vm.compiler/.mx.graal/outputparser.py
- src/jdk.internal.vm.compiler/.mx.graal/sanitycheck.py
- src/jdk.internal.vm.compiler/.mx.graal/suite.py
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64MacroAssemblerTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGCProvider.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/DimensionsNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/NewObjectSnippets.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeLoadSnippets.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/Access.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/HeapAccess.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryCheckpoint.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/GCProvider.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/MemoryProxy.java
- src/jdk.jartool/share/classes/sun/tools/jar/Manifest.java
- src/jdk.jartool/share/classes/sun/tools/jar/SignatureFile.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTag.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Navigation.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/external/jquery/jquery.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils-ie.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils-ie.min.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip-utils/dist/jszip-utils.min.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip/dist/jszip.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jszip/dist/jszip.min.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/BasePropertyTaglet.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/PropertyGetterTaglet.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/PropertySetterTaglet.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java
- src/jdk.javadoc/share/legal/jszip.md
- test/hotspot/jtreg/gc/concurrent_phase_control/CheckControl.java
- test/hotspot/jtreg/gc/concurrent_phase_control/CheckSupported.java
- test/hotspot/jtreg/gc/concurrent_phase_control/CheckUnsupported.java
- test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1.java
- test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlG1Basics.java
- test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlParallel.java
- test/hotspot/jtreg/gc/concurrent_phase_control/TestConcurrentPhaseControlSerial.java
- test/hotspot/jtreg/gc/g1/TestJNIWeakG1/TestJNIWeakG1.java
- test/hotspot/jtreg/gc/g1/TestJNIWeakG1/libTestJNIWeakG1.c
- test/hotspot/jtreg/gc/shenandoah/compiler/TestCommonGCLoads.java
- test/hotspot/jtreg/gc/shenandoah/options/TestSafepointWorkers.java
- test/hotspot/jtreg/runtime/7116786/Test7116786.java
- test/hotspot/jtreg/runtime/7116786/testcases.jar
- test/hotspot/jtreg/runtime/7162488/Test7162488.sh
- test/hotspot/jtreg/runtime/CDSCompressedKPtrs/CDSCompressedKPtrsError.java
- test/hotspot/jtreg/runtime/EnclosingMethodAttr/enclMethodAttr.jar
- test/hotspot/jtreg/runtime/LocalVariableTable/DuplicateLVT.cod
- test/hotspot/jtreg/runtime/LocalVariableTable/DuplicateLVTT.cod
- test/hotspot/jtreg/runtime/LocalVariableTable/NotFoundLVTT.cod
- test/hotspot/jtreg/runtime/LocalVariableTable/testcase.jar
- test/hotspot/jtreg/runtime/StackGap/testme.sh
- test/hotspot/jtreg/runtime/StackGuardPages/testme.sh
- test/hotspot/jtreg/runtime/TLS/testtls.sh
- test/hotspot/jtreg/runtime/classFileParserBug/emptynumbootstrapmethods.jar
- test/hotspot/jtreg/runtime/classFileParserBug/test.jar
- test/hotspot/jtreg/runtime/duplAttributes/test.jar
- test/hotspot/jtreg/runtime/testlibrary/GeneratedClassLoader.java
- test/hotspot/jtreg/vmTestbase/gc/gctests/Steal/steal001/TEST.properties
- test/hotspot/jtreg/vmTestbase/gc/gctests/Steal/steal001/steal001.java
- test/hotspot/jtreg/vmTestbase/gc/gctests/Steal/steal002/TEST.properties
- test/hotspot/jtreg/vmTestbase/gc/gctests/Steal/steal002/steal002.java
- test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/LockCoarsening001/TestDescription.java
- test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/LockCoarsening002/TestDescription.java
- test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/run.sh
- test/hotspot/jtreg/vmTestbase/jit/tiered/TestDescription.java
- test/hotspot/jtreg/vmTestbase/jit/tiered/tieredTest.sh
- test/hotspot/jtreg/vmTestbase/metaspace/flags/maxMetaspaceSize/TestDescription.java
- test/hotspot/jtreg/vmTestbase/metaspace/flags/maxMetaspaceSize/maxMetaspaceSize.sh
- test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfo/TestDescription.java
- test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfo/run.sh
- test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfoOnCompilation/TestDescription.java
- test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfoOnCompilation/run.sh
- test/hotspot/jtreg/vmTestbase/vm/gc/kind/parOld/TestDescription.java
- test/hotspot/jtreg/vmTestbase/vm/gc/kind/parOld/test.sh
- test/jdk/java/awt/TrayIcon/AddPopupAfterShowTest/AddPopupAfterShowTest.html
- test/jdk/java/net/httpclient/ssltest/bad.keystore
- test/jdk/java/net/httpclient/ssltest/good.keystore
- test/jdk/java/net/httpclient/ssltest/loopback.keystore
- test/jdk/jdk/jfr/event/io/EvilInstrument.java
- test/jdk/jdk/jfr/event/sampling/libTestNative.c
- test/jdk/sun/management/jmxremote/bootstrap/Makefile
- test/jdk/sun/management/jmxremote/bootstrap/launcher.c
- test/jdk/sun/management/jmxremote/bootstrap/linux-amd64/launcher
- test/jdk/sun/management/jmxremote/bootstrap/linux-i586/launcher
- test/jdk/sun/management/jmxremote/bootstrap/solaris-amd64/launcher
- test/jdk/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher
- test/jdk/sun/tools/jps/LingeredApp.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
! test/jdk/tools/jpackage/linux/ShortcutHintTest.java
! test/jdk/tools/jpackage/share/InvalidArgTest.java
! test/jdk/tools/launcher/HelpFlagsTest.java
! test/jdk/tools/launcher/VersionCheck.java
- test/langtools/jdk/javadoc/doclet/testExternalOverridenMethod/TestExternalOverridenMethod.java
- test/langtools/jdk/javadoc/doclet/testExternalOverridenMethod/package-list
- test/langtools/jdk/javadoc/doclet/testExternalOverridenMethod/pkg/XReader.java
- test/langtools/jdk/javadoc/doclet/testOptions/help.html
- test/langtools/tools/javac/file/MultiReleaseJar/MutliReleaseModuleInfoTest.java
More information about the jdk-sandbox-changes
mailing list