Skip to content
Permalink
Browse files

Merge

  • Loading branch information
prsadhuk committed May 2, 2020
2 parents b938a4c + eb6ef3c commit 2731d622349a177eaa17ae8f09c24362c17bb0a1
Showing with 2,044 additions and 699 deletions.
  1. +1 −1 make/common/JavaCompilation.gmk
  2. +0 −31 make/data/cacerts/addtrustclass1ca
  3. +0 −30 make/data/cacerts/keynectisrootca
  4. +5 −4 make/data/charsetmapping/charsets
  5. +2 −2 make/data/publicsuffixlist/VERSION
  6. +232 −102 make/data/publicsuffixlist/public_suffix_list.dat
  7. +2 −1 src/hotspot/share/classfile/loaderConstraints.hpp
  8. +10 −4 src/hotspot/share/classfile/systemDictionary.cpp
  9. +9 −4 src/hotspot/share/classfile/systemDictionary.hpp
  10. +306 −62 src/hotspot/share/classfile/systemDictionaryShared.cpp
  11. +3 −0 src/hotspot/share/classfile/systemDictionaryShared.hpp
  12. +1 −1 src/hotspot/share/gc/shenandoah/shenandoahConcurrentRoots.cpp
  13. +18 −1 src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.cpp
  14. +4 −1 src/hotspot/share/interpreter/linkResolver.cpp
  15. +12 −10 src/hotspot/share/oops/instanceKlass.cpp
  16. +5 −4 src/hotspot/share/oops/klassVtable.cpp
  17. +1 −0 src/hotspot/share/runtime/arguments.cpp
  18. +1 −1 src/hotspot/share/runtime/globals.hpp
  19. +3 −1 src/hotspot/share/runtime/handles.hpp
  20. +1 −1 src/hotspot/share/runtime/mutexLocker.cpp
  21. +2 −2 src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
  22. +2 −2 src/java.base/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java
  23. +1 −1 src/java.base/share/legal/public_suffix.md
  24. +3 −3 src/jdk.charsets/share/classes/sun/nio/cs/ext/{IBM834.java → IBM834.java.template}
  25. +3 −3 src/jdk.charsets/share/classes/sun/nio/cs/ext/{IBM949C.java → IBM949C.java.template}
  26. +14 −4 src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ApplicationLayout.java
  27. +16 −2 src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Arguments.java
  28. +3 −2 src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/DeployParams.java
  29. +16 −15 src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/JLinkBundlerHelper.java
  30. +14 −1 src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/StandardBundlerParam.java
  31. +2 −1 src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/ValidOptions.java
  32. +7 −1 ...cubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/HelpResources.properties
  33. +3 −1 ...cubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources.properties
  34. +3 −1 ...ator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources_ja.properties
  35. +3 −1 ...r.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources_zh_CN.properties
  36. +1 −0 test/hotspot/jtreg/TEST.groups
  37. +125 −0 test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithShenandoah.java
  38. +1 −3 test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java
  39. +1 −2 test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java
  40. +98 −0 test/hotspot/jtreg/runtime/cds/appcds/loaderConstraints/DynamicLoaderConstraintsTest.java
  41. +150 −0 test/hotspot/jtreg/runtime/cds/appcds/loaderConstraints/LoaderConstraintsApp.java
  42. +77 −0 test/hotspot/jtreg/runtime/cds/appcds/loaderConstraints/LoaderConstraintsTest.java
  43. +55 −0 test/hotspot/jtreg/runtime/cds/appcds/loaderConstraints/MyClassLoader.java
  44. +29 −0 test/hotspot/jtreg/runtime/cds/appcds/loaderConstraints/MyHttpHandler.java
  45. +43 −0 test/hotspot/jtreg/runtime/cds/appcds/loaderConstraints/MyHttpHandlerB.java
  46. +43 −0 test/hotspot/jtreg/runtime/cds/appcds/loaderConstraints/MyHttpHandlerC.java
  47. +2 −1 ...ot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002/TestDescription.java
  48. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001/TestDescription.java
  49. +2 −1 ...otspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001/TestDescription.java
  50. +2 −1 .../vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter001/TestDescription.java
  51. +2 −1 ...hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter001/TestDescription.java
  52. +2 −1 .../vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java
  53. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields003/TestDescription.java
  54. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods003/TestDescription.java
  55. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj002/TestDescription.java
  56. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals002/TestDescription.java
  57. +2 −1 ...ot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedtoinit002/TestDescription.java
  58. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname003/TestDescription.java
  59. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields003/TestDescription.java
  60. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode002/TestDescription.java
  61. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract002/TestDescription.java
  62. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit002/TestDescription.java
  63. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared002/TestDescription.java
  64. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified002/TestDescription.java
  65. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods003/TestDescription.java
  66. +2 −1 ...tspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s003/TestDescription.java
  67. +2 −1 ...pot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss003/TestDescription.java
  68. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name002/TestDescription.java
  69. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename002/TestDescription.java
  70. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield003/TestDescription.java
  71. +2 −1 ...hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod003/TestDescription.java
  72. +2 −1 ...t/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java
  73. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn002/TestDescription.java
  74. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/heapwalking002/TestDescription.java
  75. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java
  76. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/monitorEvents002/TestDescription.java
  77. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/jdi/stress/serial/ownedMonitorsAndFrames002/TestDescription.java
  78. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/TestDescription.java
  79. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/TestDescription.java
  80. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/TestDescription.java
  81. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/TestDescription.java
  82. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionFinish/gcfinish001/TestDescription.java
  83. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart001/TestDescription.java
  84. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart002/TestDescription.java
  85. +1 −2 test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/abort/Abort.java
  86. +1 −2 test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/callbacks/Callbacks.java
  87. +1 −2 ...spot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/concrete_klass_filter/ConcreteKlassFilter.java
  88. +1 −2 test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter_tagged/HeapFilter.java
  89. +1 −2 ...reg/vmTestbase/nsk/jvmti/IterateThroughHeap/non_concrete_klass_filter/NonConcreteKlassFilter.java
  90. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree001/TestDescription.java
  91. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine/TestDescription.java
  92. +2 −1 ...vmTestbase/nsk/jvmti/RedefineClasses/StressRedefineWithoutBytecodeCorruption/TestDescription.java
  93. +3 −2 test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted004.java
  94. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted004/TestDescription.java
  95. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP12/ap12t001/TestDescription.java
  96. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t002/TestDescription.java
  97. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/TestDescription.java
  98. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/TestDescription.java
  99. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/TestDescription.java
  100. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/TestDescription.java
  101. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/extension/EX03/ex03t001/TestDescription.java
  102. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon001/comptimemon001.java
  103. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon002/TestDescription.java
  104. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon003/TestDescription.java
  105. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon004/TestDescription.java
  106. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/monitoring/CompilationMXBean/comptimemon005/TestDescription.java
  107. +2 −1 ...toring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters001/CollectionCounters001.java
  108. +2 −1 ...k/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters002/TestDescription.java
  109. +2 −1 ...k/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters003/TestDescription.java
  110. +2 −1 ...k/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters004/TestDescription.java
  111. +2 −1 ...k/monitoring/GarbageCollectorMXBean/CollectionCounters/CollectionCounters005/TestDescription.java
  112. +2 −1 .../hotspot/jtreg/vmTestbase/nsk/monitoring/MemoryNotificationInfo/from/from001/TestDescription.java
  113. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/monitoring/RuntimeMXBean/RuntimeMXBean001/RuntimeMXBean001.java
  114. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/monitoring/RuntimeMXBean/RuntimeMXBean002/TestDescription.java
  115. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/monitoring/RuntimeMXBean/RuntimeMXBean003/TestDescription.java
  116. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/monitoring/RuntimeMXBean/RuntimeMXBean004/TestDescription.java
  117. +2 −1 test/hotspot/jtreg/vmTestbase/nsk/monitoring/RuntimeMXBean/RuntimeMXBean005/TestDescription.java
  118. +2 −1 ...g/ThreadMXBean/GetThreadAllocatedBytes/allocatedMemorySupportedTest_directly/TestDescription.java
  119. +2 −1 ...readMXBean/GetThreadAllocatedBytes/allocatedMemorySupportedTest_proxy_custom/TestDescription.java
  120. +2 −1 ...eadMXBean/GetThreadAllocatedBytes/allocatedMemorySupportedTest_proxy_default/TestDescription.java
  121. +2 −1 ...eadMXBean/GetThreadAllocatedBytes/allocatedMemorySupportedTest_server_custom/TestDescription.java
  122. +2 −1 ...adMXBean/GetThreadAllocatedBytes/allocatedMemorySupportedTest_server_default/TestDescription.java
  123. +2 −1 ...sk/monitoring/ThreadMXBean/GetThreadAllocatedBytes/baseBehaviorTest_directly/TestDescription.java
  124. +2 −1 ...onitoring/ThreadMXBean/GetThreadAllocatedBytes/baseBehaviorTest_proxy_custom/TestDescription.java
  125. +2 −1 ...nitoring/ThreadMXBean/GetThreadAllocatedBytes/baseBehaviorTest_proxy_default/TestDescription.java
  126. +2 −1 ...nitoring/ThreadMXBean/GetThreadAllocatedBytes/baseBehaviorTest_server_custom/TestDescription.java
  127. +2 −1 ...itoring/ThreadMXBean/GetThreadAllocatedBytes/baseBehaviorTest_server_default/TestDescription.java
  128. +2 −1 ...ing/ThreadMXBean/GetThreadAllocatedBytes/doubleAllocationTest_directly_array/TestDescription.java
  129. +2 −1 ...ng/ThreadMXBean/GetThreadAllocatedBytes/doubleAllocationTest_directly_string/TestDescription.java
  130. +2 −1 ...ThreadMXBean/GetThreadAllocatedBytes/doubleAllocationTest_proxy_custom_array/TestDescription.java
  131. +2 −1 ...hreadMXBean/GetThreadAllocatedBytes/doubleAllocationTest_proxy_custom_string/TestDescription.java
  132. +2 −1 ...hreadMXBean/GetThreadAllocatedBytes/doubleAllocationTest_proxy_default_array/TestDescription.java
  133. +2 −1 ...readMXBean/GetThreadAllocatedBytes/doubleAllocationTest_proxy_default_string/TestDescription.java
  134. +2 −1 ...hreadMXBean/GetThreadAllocatedBytes/doubleAllocationTest_server_custom_array/TestDescription.java
  135. +2 −1 ...readMXBean/GetThreadAllocatedBytes/doubleAllocationTest_server_custom_string/TestDescription.java
  136. +2 −1 ...readMXBean/GetThreadAllocatedBytes/doubleAllocationTest_server_default_array/TestDescription.java
  137. +2 −1 ...eadMXBean/GetThreadAllocatedBytes/doubleAllocationTest_server_default_string/TestDescription.java
  138. +2 −1 ...itoring/ThreadMXBean/GetThreadAllocatedBytes/equalThreadsTest_directly_array/TestDescription.java
  139. +2 −1 ...toring/ThreadMXBean/GetThreadAllocatedBytes/equalThreadsTest_directly_string/TestDescription.java
  140. +2 −1 ...ing/ThreadMXBean/GetThreadAllocatedBytes/equalThreadsTest_proxy_custom_array/TestDescription.java
  141. +2 −1 ...ng/ThreadMXBean/GetThreadAllocatedBytes/equalThreadsTest_proxy_custom_string/TestDescription.java
  142. +2 −1 ...ng/ThreadMXBean/GetThreadAllocatedBytes/equalThreadsTest_proxy_default_array/TestDescription.java
  143. +2 −1 ...g/ThreadMXBean/GetThreadAllocatedBytes/equalThreadsTest_proxy_default_string/TestDescription.java
  144. +2 −1 ...ng/ThreadMXBean/GetThreadAllocatedBytes/equalThreadsTest_server_custom_array/TestDescription.java
  145. +2 −1 ...g/ThreadMXBean/GetThreadAllocatedBytes/equalThreadsTest_server_custom_string/TestDescription.java
  146. +2 −1 ...g/ThreadMXBean/GetThreadAllocatedBytes/equalThreadsTest_server_default_array/TestDescription.java
  147. +2 −1 .../ThreadMXBean/GetThreadAllocatedBytes/equalThreadsTest_server_default_string/TestDescription.java
  148. +2 −1 ...onitoring/ThreadMXBean/GetThreadAllocatedBytes/illegalArgumentsTest_directly/TestDescription.java
  149. +2 −1 ...oring/ThreadMXBean/GetThreadAllocatedBytes/illegalArgumentsTest_proxy_custom/TestDescription.java
  150. +2 −1 ...ring/ThreadMXBean/GetThreadAllocatedBytes/illegalArgumentsTest_proxy_default/TestDescription.java
  151. +2 −1 ...ring/ThreadMXBean/GetThreadAllocatedBytes/illegalArgumentsTest_server_custom/TestDescription.java
  152. +2 −1 ...ing/ThreadMXBean/GetThreadAllocatedBytes/illegalArgumentsTest_server_default/TestDescription.java
  153. +2 −1 ...sk/monitoring/ThreadMXBean/GetThreadAllocatedBytes/noAllocationTest_directly/TestDescription.java
  154. +2 −1 ...onitoring/ThreadMXBean/GetThreadAllocatedBytes/noAllocationTest_proxy_custom/TestDescription.java
  155. +2 −1 ...nitoring/ThreadMXBean/GetThreadAllocatedBytes/noAllocationTest_proxy_default/TestDescription.java
  156. +2 −1 ...nitoring/ThreadMXBean/GetThreadAllocatedBytes/noAllocationTest_server_custom/TestDescription.java
  157. +2 −1 ...itoring/ThreadMXBean/GetThreadAllocatedBytes/noAllocationTest_server_default/TestDescription.java
  158. +2 −2 ...base/nsk/monitoring/ThreadMXBean/GetThreadAllocatedBytes/stressTest_directly/TestDescription.java
  159. +2 −2 .../nsk/monitoring/ThreadMXBean/GetThreadAllocatedBytes/stressTest_proxy_custom/TestDescription.java
  160. +2 −2 ...nsk/monitoring/ThreadMXBean/GetThreadAllocatedBytes/stressTest_proxy_default/TestDescription.java
  161. +2 −2 ...nsk/monitoring/ThreadMXBean/GetThreadAllocatedBytes/stressTest_server_custom/TestDescription.java
  162. +2 −2 ...sk/monitoring/ThreadMXBean/GetThreadAllocatedBytes/stressTest_server_default/TestDescription.java
  163. +2 −1 ...tbase/nsk/monitoring/ThreadMXBean/GetThreadCpuTime/baseBehaviorTest_directly/TestDescription.java
  164. +2 −1 ...e/nsk/monitoring/ThreadMXBean/GetThreadCpuTime/baseBehaviorTest_proxy_custom/TestDescription.java
  165. +2 −1 .../nsk/monitoring/ThreadMXBean/GetThreadCpuTime/baseBehaviorTest_proxy_default/TestDescription.java
  166. +2 −1 .../nsk/monitoring/ThreadMXBean/GetThreadCpuTime/baseBehaviorTest_server_custom/TestDescription.java
  167. +2 −1 ...nsk/monitoring/ThreadMXBean/GetThreadCpuTime/baseBehaviorTest_server_default/TestDescription.java
  168. +2 −1 ...e/nsk/monitoring/ThreadMXBean/GetThreadCpuTime/illegalArgumentsTest_directly/TestDescription.java
  169. +2 −1 ...k/monitoring/ThreadMXBean/GetThreadCpuTime/illegalArgumentsTest_proxy_custom/TestDescription.java
  170. +2 −1 .../monitoring/ThreadMXBean/GetThreadCpuTime/illegalArgumentsTest_proxy_default/TestDescription.java
  171. +2 −1 .../monitoring/ThreadMXBean/GetThreadCpuTime/illegalArgumentsTest_server_custom/TestDescription.java
  172. +2 −1 ...monitoring/ThreadMXBean/GetThreadCpuTime/illegalArgumentsTest_server_default/TestDescription.java
  173. +6 −7 test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/MXBeanTestThread.java
  174. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Multi/Multi001/Multi001.java
  175. +2 −2 ...tspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Multi/Multi002/TestDescription.java
  176. +2 −2 ...tspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Multi/Multi003/TestDescription.java
  177. +2 −2 ...tspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Multi/Multi004/TestDescription.java
  178. +2 −2 ...tspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Multi/Multi005/TestDescription.java
  179. +2 −1 .../monitoring/ThreadMXBean/ThreadInfo/TimedWaitingThread/TimedWaitingThread001/TestDescription.java
  180. +2 −1 .../monitoring/ThreadMXBean/ThreadInfo/TimedWaitingThread/TimedWaitingThread002/TestDescription.java
  181. +2 −1 .../monitoring/ThreadMXBean/ThreadInfo/TimedWaitingThread/TimedWaitingThread003/TestDescription.java
  182. +2 −1 .../monitoring/ThreadMXBean/ThreadInfo/TimedWaitingThread/TimedWaitingThread004/TestDescription.java
  183. +2 −1 .../monitoring/ThreadMXBean/ThreadInfo/TimedWaitingThread/TimedWaitingThread005/TestDescription.java
  184. +4 −7 test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/ThreadMXBeanTestBase.java
  185. +1 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/BlockedThread.java
  186. +1 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/NativeBlockedThread.java
  187. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load001/TestDescription.java
  188. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load002/TestDescription.java
  189. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load003/TestDescription.java
  190. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load004/TestDescription.java
  191. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load005/TestDescription.java
  192. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load006/TestDescription.java
  193. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load007/TestDescription.java
  194. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load008/TestDescription.java
  195. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load009/TestDescription.java
  196. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load010/TestDescription.java
  197. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load011/TestDescription.java
  198. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load012/TestDescription.java
  199. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload001/TestDescription.java
  200. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload002/TestDescription.java
  201. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload003/TestDescription.java
  202. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload004/TestDescription.java
  203. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload005/TestDescription.java
  204. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload006/TestDescription.java
  205. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload007/TestDescription.java
  206. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload008/TestDescription.java
  207. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload009/TestDescription.java
  208. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload010/TestDescription.java
  209. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload011/TestDescription.java
  210. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload012/TestDescription.java
  211. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem001/TestDescription.java
  212. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem002/TestDescription.java
  213. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem003/TestDescription.java
  214. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem004/TestDescription.java
  215. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem005/TestDescription.java
  216. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem006/TestDescription.java
  217. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem007/TestDescription.java
  218. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem008/TestDescription.java
  219. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem009/TestDescription.java
  220. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem010/TestDescription.java
  221. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem011/TestDescription.java
  222. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem012/TestDescription.java
  223. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem013/TestDescription.java
  224. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem014/TestDescription.java
  225. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem015/TestDescription.java
  226. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem016/TestDescription.java
  227. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem017/TestDescription.java
  228. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem018/TestDescription.java
  229. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem019/TestDescription.java
  230. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem020/TestDescription.java
  231. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem021/TestDescription.java
  232. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem022/TestDescription.java
  233. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem023/TestDescription.java
  234. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem024/TestDescription.java
  235. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem025/TestDescription.java
  236. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem026/TestDescription.java
  237. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem027/TestDescription.java
  238. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem028/TestDescription.java
  239. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem029/TestDescription.java
  240. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem030/TestDescription.java
  241. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem031/TestDescription.java
  242. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem032/TestDescription.java
  243. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem033/TestDescription.java
  244. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem034/TestDescription.java
  245. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem035/TestDescription.java
  246. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/lowmem/lowmem036/TestDescription.java
  247. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/stress/except/except012.java
  248. +2 −6 test/hotspot/jtreg/vmTestbase/nsk/stress/jni/gclocker/gcl001.java
  249. +4 −3 test/hotspot/jtreg/vmTestbase/nsk/stress/jni/jnistress002.java
  250. +7 −3 test/hotspot/jtreg/vmTestbase/nsk/stress/numeric/numeric001.java
  251. +7 −3 test/hotspot/jtreg/vmTestbase/nsk/stress/numeric/numeric002.java
  252. +7 −3 test/hotspot/jtreg/vmTestbase/nsk/stress/numeric/numeric003.java
  253. +7 −3 test/hotspot/jtreg/vmTestbase/nsk/stress/numeric/numeric004.java
  254. +7 −3 test/hotspot/jtreg/vmTestbase/nsk/stress/numeric/numeric005.java
  255. +7 −3 test/hotspot/jtreg/vmTestbase/nsk/stress/numeric/numeric006.java
  256. +7 −3 test/hotspot/jtreg/vmTestbase/nsk/stress/numeric/numeric007.java
  257. +7 −3 test/hotspot/jtreg/vmTestbase/nsk/stress/numeric/numeric008.java
  258. +7 −3 test/hotspot/jtreg/vmTestbase/nsk/stress/numeric/numeric009.java
  259. +7 −3 test/hotspot/jtreg/vmTestbase/nsk/stress/numeric/numeric010.java
  260. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree001/btree001.java
  261. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree002/btree002.java
  262. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree003/btree003.java
  263. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree004/btree004.java
  264. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree005/btree005.java
  265. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree006/btree006.java
  266. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree007/btree007.java
  267. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree008/btree008.java
  268. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree009/btree009.java
  269. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree010/btree010.java
  270. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree011/btree011.java
  271. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/btree/btree012/btree012.java
  272. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain001/chain001.java
  273. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain002/chain002.java
  274. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain003/chain003.java
  275. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain004/chain004.java
  276. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain005/chain005.java
  277. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain006/chain006.java
  278. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain007/chain007.java
  279. +2 −2 test/hotspot/jtreg/vmTestbase/nsk/sysdict/vm/stress/chain/chain008/chain008.java
  280. +3 −2 test/jdk/java/nio/charset/Charset/RegisteredCharsets.java
  281. +25 −2 test/jdk/sun/nio/cs/CheckHistoricalNames.java
  282. +3 −11 test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
  283. +2 −2 test/jdk/sun/security/util/RegisteredDomain/ParseNames.java
  284. +4 −0 test/jdk/sun/security/util/RegisteredDomain/tests.dat
  285. +13 −0 test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
  286. +145 −0 test/jdk/tools/jpackage/share/jdk/jpackage/tests/JLinkOptionsTest.java
@@ -205,7 +205,7 @@ define SetupJavaCompilationBody
else ifeq ($$($1_COMPILER), interim)
# Use java server if it is enabled, and the user does not want a specialized
# class path.
ifeq ($$($1_ENABLE_JAVAC_SERVER+$$($1_CLASSPATH)), true+)
ifeq ($$(ENABLE_JAVAC_SERVER)+$$($1_CLASSPATH), true+)
$1_JAVAC := $$(INTERIM_LANGTOOLS_ARGS) -m jdk.compiler.interim/com.sun.tools.sjavac.Main

# How to launch the server. This must use JAVA_DETACH, which is the "big" java

This file was deleted.

This file was deleted.

@@ -1,5 +1,5 @@
#
# Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -282,6 +282,7 @@ charset ISO-8859-16 ISO_8859_16
alias iso-ir-226
alias ISO_8859-16:2001
alias ISO_8859-16
alias ISO8859_16
alias latin10
alias l10
alias csISO885916
@@ -697,7 +698,7 @@ charset x-euc-jp-linux EUC_JP_LINUX
charset x-eucJP-Open EUC_JP_Open
package sun.nio.cs.ext
type template
hisname EUC_JP_Solari
hisname EUC_JP_Solaris
ascii true
alias EUC_JP_Solaris # JDK historical
alias eucJP-open
@@ -1391,7 +1392,7 @@ charset x-IBM833 IBM833

charset x-IBM834 IBM834 # EBCDIC DBCS-only Korean
package sun.nio.cs.ext
type source
type template
alias cp834
alias ibm834
alias 834
@@ -1485,7 +1486,7 @@ charset x-IBM949 IBM949

charset x-IBM949C IBM949C
package sun.nio.cs.ext
type source
type template
alias cp949C # JDK historical
alias ibm949C
alias ibm-949C
@@ -1,2 +1,2 @@
Github: https://raw.githubusercontent.com/publicsuffix/list/33c1c788decfed1052089fa27e3005fe4088dec3/public_suffix_list.dat
Date: 2019-09-28
Github: https://raw.githubusercontent.com/publicsuffix/list/cbbba1d234670453df9c930dfbf510c0474d4301/public_suffix_list.dat
Date: 2020-04-24

0 comments on commit 2731d62

Please sign in to comment.