--- a/test/hotspot/jtreg/runtime/cds/ArchiveDoesNotExist.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/ArchiveDoesNotExist.java	Fri Aug 09 13:13:36 2019 -0700
@@ -29,8 +29,6 @@
  *          mode is AUTO.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
  * @run driver ArchiveDoesNotExist
  */
 

--- a/test/hotspot/jtreg/runtime/cds/BootAppendTests.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/BootAppendTests.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,10 +27,6 @@
  * @summary Testing -Xbootclasspath/a support for CDS
  * @requires vm.cds
  * @library /test/lib
- * @modules java.compiler
- *          java.base/jdk.internal.misc
- *          java.management
- *          jdk.internal.jvmstat/sun.jvmstat.monitor
  * @compile javax/sound/sampled/MyClass.jasm
  * @compile javax/annotation/processing/FilerException.jasm
  * @compile nonjdk/myPackage/MyClass.java

--- a/test/hotspot/jtreg/runtime/cds/CdsDifferentObjectAlignment.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/CdsDifferentObjectAlignment.java	Fri Aug 09 13:13:36 2019 -0700
@@ -32,8 +32,6 @@
  * @requires vm.bits == 64
  * @library /test/lib
  * @bug 8025642
- * @modules java.base/jdk.internal.misc
- *          java.management
  * @run driver CdsDifferentObjectAlignment
  */
 

--- a/test/hotspot/jtreg/runtime/cds/CdsSameObjectAlignment.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/CdsSameObjectAlignment.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,8 +28,6 @@
  * @requires vm.cds
  * @requires vm.bits == 64
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
  * @run driver CdsSameObjectAlignment
  */
 

--- a/test/hotspot/jtreg/runtime/cds/CheckDefaultArchiveFile.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/CheckDefaultArchiveFile.java	Fri Aug 09 13:13:36 2019 -0700
@@ -26,8 +26,6 @@
  * @summary JDK platforms/binaries do not support default CDS archive should
  *          not contain classes.jsa in the default location.
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions

--- a/test/hotspot/jtreg/runtime/cds/CheckSharingWithDefaultArchive.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/CheckSharingWithDefaultArchive.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,8 +28,6 @@
  *          Verify a set of well-known shared classes.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions

--- a/test/hotspot/jtreg/runtime/cds/DumpSharedDictionary.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/DumpSharedDictionary.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,7 +27,6 @@
  * @summary Check that Shared Dictionary is printed out with jcmd
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
  * @run driver DumpSharedDictionary
  */
 

--- a/test/hotspot/jtreg/runtime/cds/DumpSymbolAndStringTable.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/DumpSymbolAndStringTable.java	Fri Aug 09 13:13:36 2019 -0700
@@ -26,8 +26,6 @@
  * @bug 8059510
  * @summary Test jcmd VM.symboltable, VM.stringtable and VM.systemdictionary options
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions DumpSymbolAndStringTable
  */
 import jdk.test.lib.cds.CDSTestUtils;

--- a/test/hotspot/jtreg/runtime/cds/NonBootLoaderClasses.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/NonBootLoaderClasses.java	Fri Aug 09 13:13:36 2019 -0700
@@ -26,8 +26,6 @@
  * @summary Test to ensure platform and app classes are archived when specified in classlist
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
  * @run driver NonBootLoaderClasses
  */
 

--- a/test/hotspot/jtreg/runtime/cds/SharedBaseAddress.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/SharedBaseAddress.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,8 +27,6 @@
  *          VM handles normal values as well as edge values w/o a crash.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
  * @run driver SharedBaseAddress
  */
 

--- a/test/hotspot/jtreg/runtime/cds/SharedStrings.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/SharedStrings.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,8 +27,6 @@
  *          are actually shared
  * @requires vm.cds.archived.java.heap
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
  * @build SharedStringsWb sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller -jar whitebox.jar sun.hotspot.WhiteBox
  * @run driver SharedStrings

--- a/test/hotspot/jtreg/runtime/cds/SharedStringsDedup.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/SharedStringsDedup.java	Fri Aug 09 13:13:36 2019 -0700
@@ -26,8 +26,6 @@
  * @summary Test -Xshare:auto with shared strings and -XX:+UseStringDeduplication
  * @requires vm.cds.archived.java.heap
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
  * @run driver SharedStringsDedup
  */
 

--- a/test/hotspot/jtreg/runtime/cds/SharedStringsRunAuto.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/SharedStringsRunAuto.java	Fri Aug 09 13:13:36 2019 -0700
@@ -26,8 +26,6 @@
  * @summary Test -Xshare:auto with shared strings.
  * @requires vm.cds.archived.java.heap
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
  * @run driver SharedStringsRunAuto
  */
 

--- a/test/hotspot/jtreg/runtime/cds/SpaceUtilizationCheck.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/SpaceUtilizationCheck.java	Fri Aug 09 13:13:36 2019 -0700
@@ -26,8 +26,6 @@
  * @summary Check if the space utilization for shared spaces is adequate
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission

--- a/test/hotspot/jtreg/runtime/cds/TestInterpreterMethodEntries.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/TestInterpreterMethodEntries.java	Fri Aug 09 13:13:36 2019 -0700
@@ -30,8 +30,6 @@
  * @comment the test disables intrinsics, so it can't be run w/ AOT'ed java module
  * @requires !vm.aot.enabled
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
  * @run driver TestInterpreterMethodEntries true false
  */
 
@@ -42,8 +40,6 @@
  *          and the intrinsic flag disabled during dump and enabled during use of the archive.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
  * @run driver TestInterpreterMethodEntries false true
  */
 

--- a/test/hotspot/jtreg/runtime/cds/appcds/AppendClasspath.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/AppendClasspath.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary At run time, it is OK to append new elements to the classpath that was used at dump time.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/Hello.java
  * @compile test-classes/HelloMore.java
  * @run driver AppendClasspath

--- a/test/hotspot/jtreg/runtime/cds/appcds/BootClassPathMismatch.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/BootClassPathMismatch.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary bootclasspath mismatch test.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/Hello.java
  * @run driver BootClassPathMismatch
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/CDSandJFR.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/CDSandJFR.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,7 +27,6 @@
  * @summary Make sure CDS and JFR work together.
  * @requires vm.hasJFR & vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes test-classes
- * @modules jdk.jfr
  * @build Hello GetFlightRecorder
  * @run driver ClassFileInstaller -jar CDSandJFR.jar Hello GetFlightRecorder GetFlightRecorder$TestEvent GetFlightRecorder$SimpleEvent
  * @run main/othervm/timeout=500 CDSandJFR

--- a/test/hotspot/jtreg/runtime/cds/appcds/CaseSensitiveClassPath.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/CaseSensitiveClassPath.java	Fri Aug 09 13:13:36 2019 -0700
@@ -29,9 +29,7 @@
  *     between dump time and archive use time
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @requires os.family != "mac"
  * @compile test-classes/Hello.java
  * @run driver CaseSensitiveClassPath

--- a/test/hotspot/jtreg/runtime/cds/appcds/ClassLoaderTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ClassLoaderTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary Initiating and defining classloader test.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/Hello.java
  * @compile test-classes/HelloWB.java
  * @compile test-classes/ForNameTest.java

--- a/test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary Class-Path: attribute in MANIFEST file
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @run driver ClassPathAttr
  */
 

--- a/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java	Fri Aug 09 13:13:36 2019 -0700
@@ -32,9 +32,7 @@
  * @summary Test command line flag combinations that
  *          could likely affect the behaviour of AppCDS
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
  * @compile test-classes/Hello.java

--- a/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagComboNegative.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagComboNegative.java	Fri Aug 09 13:13:36 2019 -0700
@@ -30,9 +30,7 @@
  *               execute w/o compressed oops
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/Hello.java
  * @run driver CommandLineFlagComboNegative
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/DumpClassList.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/DumpClassList.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,8 +28,7 @@
  *          --patch-module.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/ArrayListTest.java
  * @run driver DumpClassList
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ExtraSymbols.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary Adding extra symbols into CDS archive using -XX:SharedArchiveConfigFile
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/Hello.java
  * @run driver ExtraSymbols
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/FieldAnnotationsTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/FieldAnnotationsTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary Test for field annotations.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/FieldAnnotationsApp.java test-classes/MyAnnotation.java
  * @run driver FieldAnnotationsTest
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/HelloExtTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/HelloExtTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,10 +28,7 @@
  *          (which used to be called the "extension loader) in AppCDS
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
- *          jdk.internal.jvmstat/sun.jvmstat.monitor
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/HelloExt.java
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/test/hotspot/jtreg/runtime/cds/appcds/HelloTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/HelloTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary Hello World test for AppCDS
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/Hello.java
  * @run driver HelloTest
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/IgnoreEmptyClassPaths.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/IgnoreEmptyClassPaths.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary Test the -XX:+IgnoreEmptyClassPaths flag
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/Hello.java
  * @compile test-classes/HelloMore.java
  * @run driver IgnoreEmptyClassPaths

--- a/test/hotspot/jtreg/runtime/cds/appcds/JvmtiAddPath.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/JvmtiAddPath.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,9 +28,7 @@
  * @requires vm.cds
  * @bug 8060592
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @compile test-classes/Hello.java

--- a/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/LongClassListPath.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary Test the handling of long path to the classlist file.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/Hello.java
  * @run driver LongClassListPath
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/MissingSuperTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/MissingSuperTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,9 +28,7 @@
  *
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/MissingSuper.java
  * @run driver MissingSuperTest
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,9 +28,7 @@
  * @requires vm.cds
  * @requires os.family == "linux"
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/Hello.java
  * @run driver MoveJDKTest
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/MultiProcessSharing.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/MultiProcessSharing.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,9 +28,7 @@
  *
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @compile test-classes/MultiProcClass.java

--- a/test/hotspot/jtreg/runtime/cds/appcds/MultiReleaseJars.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/MultiReleaseJars.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,8 +27,7 @@
  * @summary Test multi-release jar with AppCDS.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @run main/othervm/timeout=2400 MultiReleaseJars
  */
 

--- a/test/hotspot/jtreg/runtime/cds/appcds/OldClassTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/OldClassTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,8 +28,6 @@
  * @requires vm.cds
  * @library /test/lib
  * @modules java.base/jdk.internal.org.objectweb.asm
- *          java.base/jdk.internal.misc
- *          java.management
  *          jdk.jartool/sun.tools.jar
  * @compile test-classes/Hello.java
  * @run build TestCommon JarBuilder

--- a/test/hotspot/jtreg/runtime/cds/appcds/ParallelLoad2.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ParallelLoad2.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary Load app classes from CDS archive in parallel threads. Similar to ParallelLoad.java, but each class in its own JAR
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/ParallelLoad.java
  * @compile test-classes/ParallelClasses.java
  * @run driver ParallelLoad2

--- a/test/hotspot/jtreg/runtime/cds/appcds/ParallelLoadTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ParallelLoadTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary Load app classes from CDS archive in parallel threads
  * @library /test/lib
  * @requires vm.cds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/ParallelLoad.java
  * @compile test-classes/ParallelClasses.java
  * @run driver ParallelLoadTest

--- a/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary test the -XX:+PrintSharedArchiveAndExit flag
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/Hello.java
  * @compile test-classes/HelloMore.java
  * @run main/othervm/timeout=3600 PrintSharedArchiveAndExit

--- a/test/hotspot/jtreg/runtime/cds/appcds/ProtectionDomain.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ProtectionDomain.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary AppCDS handling of protection domain.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/ProtDomain.java
  * @compile test-classes/ProtDomainB.java
  * @compile test-classes/JimageClassProtDomain.java

--- a/test/hotspot/jtreg/runtime/cds/appcds/RelativePath.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/RelativePath.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary Test relative paths specified in the -cp.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/Hello.java
  * @compile test-classes/HelloMore.java
  * @run driver RelativePath

--- a/test/hotspot/jtreg/runtime/cds/appcds/RewriteBytecodesTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/RewriteBytecodesTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,9 +28,7 @@
  *          the archived class with the same name is not loaded.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/RewriteBytecodes.java test-classes/Util.java test-classes/Super.java test-classes/Child.java
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,11 +27,7 @@
  * @summary SharedArchiveConsistency
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.compiler
- *          java.management
- *          jdk.jartool/sun.tools.jar
- *          jdk.internal.jvmstat/sun.jvmstat.monitor
+ * @modules jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox
  * @compile test-classes/Hello.java
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/test/hotspot/jtreg/runtime/cds/appcds/SharedBaseAddress.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/SharedBaseAddress.java	Fri Aug 09 13:13:36 2019 -0700
@@ -29,9 +29,7 @@
  *          w/o a crash.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/Hello.java
  * @run main/timeout=240 SharedBaseAddress
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/SharedPackages.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/SharedPackages.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary AppCDS handling of package.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/PackageTest.java
  * @compile test-classes/JimageClassPackage.java
  * @run driver SharedPackages

--- a/test/hotspot/jtreg/runtime/cds/appcds/SignedJar.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/SignedJar.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary AppCDS handling of signed JAR.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/Hello.java
  * @run driver SignedJar
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/SpecifySysLoaderProp.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/SpecifySysLoaderProp.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,8 +27,7 @@
  * @summary If -Djava.system.class.loader=xxx is specified in command-line, disable archived non-system classes
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *      jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/TestClassLoader.java
  * @compile test-classes/ReportMyLoader.java
  * @compile test-classes/TrySwitchMyLoader.java

--- a/test/hotspot/jtreg/runtime/cds/appcds/TestWithProfiler.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/TestWithProfiler.java	Fri Aug 09 13:13:36 2019 -0700
@@ -31,9 +31,7 @@
  *          profiler.
  * @requires vm.hasJFR & vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/MyThread.java
  * @compile test-classes/TestWithProfilerHelper.java
  * @run driver TestWithProfiler

--- a/test/hotspot/jtreg/runtime/cds/appcds/TraceLongClasspath.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/TraceLongClasspath.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary ensure -XX:+TraceClassPaths showing entire expecting app classpath
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/Hello.java
  * @compile test-classes/Super.java
  * @run driver TraceLongClasspath

--- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_0.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_0.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,7 +27,6 @@
  * @summary Unverfiable app classes should not be archived.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
  * @modules jdk.jartool/sun.tools.jar
  *          java.base/jdk.internal.org.objectweb.asm
  * @compile test-classes/Greet.java

--- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1A.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1A.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,7 +27,6 @@
  * @summary Unverfiable app classes should not be archived.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
  * @modules jdk.jartool/sun.tools.jar
  *          java.base/jdk.internal.org.objectweb.asm
  * @compile test-classes/Greet.java

--- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1B.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_1B.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,7 +27,6 @@
  * @summary Unverfiable app classes should not be archived.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
  * @modules jdk.jartool/sun.tools.jar
  *          java.base/jdk.internal.org.objectweb.asm
  * @compile test-classes/Greet.java

--- a/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_2.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/VerifierTest_2.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,7 +27,6 @@
  * @summary Unverfiable app classes should not be archived.
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
  * @modules jdk.jartool/sun.tools.jar
  *          java.base/jdk.internal.org.objectweb.asm
  * @compile test-classes/Greet.java

--- a/test/hotspot/jtreg/runtime/cds/appcds/WideIloadTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/WideIloadTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary Test 'iload_w' bytecode in shared class
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/Iloadw.jasm
  * @compile test-classes/IloadwMain.java
  * @run driver WideIloadTest

--- a/test/hotspot/jtreg/runtime/cds/appcds/WrongClasspath.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/WrongClasspath.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary classpath mismatch between dump time and execution time
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/Hello.java
  * @run driver WrongClasspath
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/XShareAutoWithChangedJar.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/XShareAutoWithChangedJar.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary Test -Xshare:auto for AppCDS
  * @requires vm.cds
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/Hello.java
  * @run driver XShareAutoWithChangedJar
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,6 @@
  * @summary Test primitive box caches integrity in various scenarios (IntegerCache etc)
  * @requires vm.cds.archived.java.heap
  * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox
  * @compile CheckIntegerCacheApp.java
  * @run driver ClassFileInstaller -jar boxCache.jar CheckIntegerCacheApp

--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleComboTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleComboTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,6 @@
  * @summary Test archived system module sub-graph and verify objects are archived.
  * @requires vm.cds.archived.java.heap
  * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox
  * @compile CheckArchivedModuleApp.java
  * @run driver ClassFileInstaller -jar app.jar CheckArchivedModuleApp

--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleCompareTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleCompareTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,6 @@
  * @summary Compare archived system modules with non-archived.
  * @requires vm.cds.archived.java.heap
  * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
  * @compile PrintSystemModulesApp.java
  * @run driver ClassFileInstaller -jar app.jar PrintSystemModulesApp
  * @run driver ArchivedModuleCompareTest

--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -26,10 +26,6 @@
  * @summary Test archived module graph with custom runtime image
  * @requires vm.cds.archived.java.heap
  * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.module
- *          java.management
- *          jdk.jlink
- *          jdk.compiler
  * @build sun.hotspot.WhiteBox
  * @compile CheckArchivedModuleApp.java
  * @run driver ClassFileInstaller -jar app.jar CheckArchivedModuleApp

--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedMirrorTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedMirrorTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,9 +28,6 @@
  * @requires vm.cds.archived.java.heap
  * @requires vm.cds.custom.loaders
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.management
- *          jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox
  * @compile CheckCachedMirrorApp.java
  * @compile ../test-classes/Hello.java

--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedResolvedReferences.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedResolvedReferences.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,9 +28,6 @@
  * @requires vm.cds
  * @requires vm.cds.custom.loaders
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.management
- *          jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox
  * @compile CheckCachedResolvedReferencesApp.java
  * @compile ../test-classes/Hello.java

--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DumpTimeVerifyFailure.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/DumpTimeVerifyFailure.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,9 +28,7 @@
  * @bug 8186789
  * @requires vm.cds.archived.java.heap
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile MyOuter.java MyException.java
  * @run driver DumpTimeVerifyFailure
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/GCStressTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/GCStressTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,6 @@
  * @summary
  * @requires vm.cds.archived.java.heap
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.management
- *          jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox
  * @compile GCStressApp.java
  * @run driver ClassFileInstaller -jar gcstress.jar GCStressApp

--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MirrorWithReferenceFieldsTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MirrorWithReferenceFieldsTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,6 @@
  * @summary Test archived mirror with reference fields
  * @requires vm.cds.archived.java.heap
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.management
- *          jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox
  * @compile MirrorWithReferenceFieldsApp.java
  * @run driver ClassFileInstaller -jar app.jar MirrorWithReferenceFieldsApp

--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/OpenArchiveRegion.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/OpenArchiveRegion.java	Fri Aug 09 13:13:36 2019 -0700
@@ -31,9 +31,7 @@
  * vm options.
  * @requires (vm.gc=="null")
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile ../test-classes/Hello.java
  * @run driver OpenArchiveRegion
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/PrimitiveTypesTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/PrimitiveTypesTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,6 @@
  * @summary Test archived primitive type mirrors
  * @requires vm.cds.archived.java.heap
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.management
- *          jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox
  * @compile PrimitiveTypesApp.java
  * @run driver ClassFileInstaller -jar app.jar PrimitiveTypesApp FieldsTest

--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/RedefineClassTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/RedefineClassTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,6 @@
  * @summary Redefine shared class. GC should not cause crash with cached resolved_references.
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes /test/hotspot/jtreg/runtime/cds/appcds/jvmti
  * @requires vm.cds.archived.java.heap
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
- *          java.management
  * @build sun.hotspot.WhiteBox
  *        RedefineClassApp
  *        InstrumentationClassFileTransformer

--- a/test/hotspot/jtreg/runtime/cds/appcds/condy/CondyHelloTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/condy/CondyHelloTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -25,7 +25,6 @@
  * @test
  * @summary Make sure CDS works with a minimal test case that uses a CONSTANT_Dynamic constant-pool entry
  * @requires (vm.cds)
- * @modules java.base/jdk.internal.misc
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
  * @build CondyHello
  * @build sun.hotspot.WhiteBox CondyHelloTest CondyHelloApp

--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java	Fri Aug 09 13:13:36 2019 -0700
@@ -29,9 +29,7 @@
  * @requires vm.cds
  * @requires vm.cds.custom.loaders
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile ../test-classes/Hello.java test-classes/CustomLoadee.java test-classes/CustomLoadee2.java
  *          test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java
  * @run driver ClassListFormatA

--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatB.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatB.java	Fri Aug 09 13:13:36 2019 -0700
@@ -29,9 +29,7 @@
  * @requires vm.cds
  * @requires vm.cds.custom.loaders
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile ../test-classes/Hello.java test-classes/CustomLoadee.java test-classes/CustomLoadee2.java
  *          test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java
  * @run driver ClassListFormatB

--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatC.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatC.java	Fri Aug 09 13:13:36 2019 -0700
@@ -29,9 +29,7 @@
  * @requires vm.cds
  * @requires vm.cds.custom.loaders
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile ../test-classes/Hello.java test-classes/CustomLoadee.java test-classes/CustomLoadee2.java
  *          test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java
  * @run driver ClassListFormatC

--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatD.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatD.java	Fri Aug 09 13:13:36 2019 -0700
@@ -29,9 +29,7 @@
  * @requires vm.cds
  * @requires vm.cds.custom.loaders
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile ../test-classes/Hello.java test-classes/CustomLoadee.java test-classes/CustomLoadee2.java
  *          test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java
  * @run driver ClassListFormatD

--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatE.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatE.java	Fri Aug 09 13:13:36 2019 -0700
@@ -29,9 +29,7 @@
  * @requires vm.cds
  * @requires vm.cds.custom.loaders
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile ../test-classes/Hello.java test-classes/CustomLoadee.java test-classes/CustomLoadee2.java
  *          test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java
  * @run driver ClassListFormatE

--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/HelloCustom.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/HelloCustom.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,8 +28,6 @@
  * @requires vm.cds
  * @requires vm.cds.custom.loaders
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /runtime/testlibrary
- * @modules java.base/jdk.internal.misc
- *          java.management
  * @compile test-classes/HelloUnload.java test-classes/CustomLoadee.java
  * @build sun.hotspot.WhiteBox ClassUnloadCommon
  * @run driver ClassFileInstaller -jar hello.jar HelloUnload ClassUnloadCommon ClassUnloadCommon$1 ClassUnloadCommon$TestFailure

--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/LoaderSegregationTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/LoaderSegregationTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -29,9 +29,7 @@
  * @requires vm.cds
  * @requires vm.cds.custom.loaders
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/LoaderSegregation.java
  *          test-classes/CustomLoadee.java test-classes/CustomLoadee2.java
  *          test-classes/CustomInterface2_ia.java test-classes/CustomInterface2_ib.java

--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestMultiFP.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestMultiFP.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,9 +28,7 @@
  * @requires vm.cds
  * @requires vm.cds.custom.loaders
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile ../test-classes/ParallelLoad.java ../test-classes/ParallelClasses.java
  * @run driver ParallelTestMultiFP
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestSingleFP.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestSingleFP.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,9 +28,7 @@
  * @requires vm.cds
  * @requires vm.cds.custom.loaders
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile ../test-classes/ParallelLoad.java ../test-classes/ParallelClasses.java
  * @run driver ParallelTestSingleFP
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProhibitedPackageNamesTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProhibitedPackageNamesTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,9 +28,7 @@
  * @requires vm.cds
  * @requires vm.cds.custom.loaders
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile ClassListFormatBase.java ../test-classes/Hello.java test-classes/InProhibitedPkg.java
  * @run driver ProhibitedPackageNamesTest
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProtectionDomain.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ProtectionDomain.java	Fri Aug 09 13:13:36 2019 -0700
@@ -30,9 +30,7 @@
  * @requires vm.cds.custom.loaders
  *
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/ProtDomain.java
  * @run driver ProtectionDomain
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -30,9 +30,7 @@
  * @requires vm.cds.custom.loaders
  *
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/CustomLoadee.java
  *     test-classes/CustomLoadee3.java
  *     test-classes/SameNameUnrelatedLoaders.java

--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnintendedLoadersTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnintendedLoadersTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,9 +28,7 @@
  * @requires vm.cds
  * @requires vm.cds.custom.loaders
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/UnintendedLoaders.java test-classes/CustomLoadee.java
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnloadUnregisteredLoaderTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnloadUnregisteredLoaderTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -30,9 +30,7 @@
  * @requires vm.cds.custom.loaders
  * @requires vm.opt.final.ClassUnloading
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/testlibrary
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox ClassUnloadCommon
  * @compile test-classes/UnloadUnregisteredLoader.java test-classes/CustomLoadee.java
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox

--- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnsupportedPlatforms.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/UnsupportedPlatforms.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary Ensure that support for AppCDS custom class loaders are not enabled on unsupported platforms.
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile test-classes/SimpleHello.java
  * @run driver UnsupportedPlatforms
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/AppendClasspath.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/AppendClasspath.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary At run time, it is OK to append new elements to the classpath that was used at dump time.
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile ../test-classes/Hello.java
  * @compile ../test-classes/HelloMore.java
  * @run driver AppendClasspath

--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicFlag.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicFlag.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,8 +27,7 @@
  * @summary The DynamicDumpShareSpaces flag is internal, setting it at the command line should have no effect.
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile ../test-classes/Hello.java
  * @run driver DynamicFlag
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicLotsOfClasses.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicLotsOfClasses.java	Fri Aug 09 13:13:36 2019 -0700
@@ -38,7 +38,6 @@
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes
  * @build LoadClasses
  * @build sun.hotspot.WhiteBox
- * @modules jdk.jartool/sun.tools.jar
  * @run driver ClassFileInstaller -jar loadclasses.jar LoadClasses
  * @run driver ClassFileInstaller -jar whitebox.jar sun.hotspot.WhiteBox
  * @run driver/timeout=500 DynamicLotsOfClasses

--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/JITInteraction.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/JITInteraction.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,7 +28,6 @@
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes
  * @build TestJIT
- * @modules jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller -jar testjit.jar TestJIT

--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MainModuleOnly.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/MainModuleOnly.java	Fri Aug 09 13:13:36 2019 -0700
@@ -26,9 +26,7 @@
  * @test
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules jdk.compiler
- *          jdk.jartool/sun.tools.jar
- *          jdk.jlink
+ * @modules jdk.jartool/sun.tools.jar
  * @run driver MainModuleOnly
  * @summary Test some scenarios with a main modular jar specified in the --module-path and -cp options in the command line.
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/RelativePath.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/RelativePath.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary Test relative paths specified in the -cp.
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile ../test-classes/Hello.java
  * @compile ../test-classes/HelloMore.java
  * @run driver RelativePath

--- a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/AnonVmClassesDuringDump.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/AnonVmClassesDuringDump.java	Fri Aug 09 13:13:36 2019 -0700
@@ -32,9 +32,6 @@
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes
  * @requires vm.cds
  * @requires vm.flavor != "minimal"
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
- *          java.management
  * @build AnonVmClassesDuringDumpTransformer Hello
  * @run main/othervm AnonVmClassesDuringDump
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCDuringDump.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCDuringDump.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,9 +28,6 @@
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes
  * @requires vm.cds
  * @requires vm.flavor != "minimal"
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
- *          java.management
  * @build GCDuringDumpTransformer Hello
  * @run main/othervm GCDuringDump
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCSharedStringsDuringDump.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/GCSharedStringsDuringDump.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,9 +28,7 @@
  *          option for testing the interaction with GC and shared strings.
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes
  * @requires vm.cds.archived.java.heap
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
- *          java.management
+ * @modules jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox GCDuringDumpTransformer GCSharedStringsDuringDumpWb
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm/timeout=480 GCSharedStringsDuringDump

--- a/test/hotspot/jtreg/runtime/cds/appcds/javaldr/HumongousDuringDump.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/javaldr/HumongousDuringDump.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,9 +28,6 @@
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes
  * @requires vm.cds.archived.java.heap
  * @requires vm.flavor != "minimal"
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
- *          java.management
  * @build HumongousDuringDumpTransformer Hello
  * @run main/othervm/timeout=240 HumongousDuringDump
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/CheckUnsupportedDumpingOptions.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/CheckUnsupportedDumpingOptions.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,10 +27,7 @@
  * @summary Abort dumping if any of the new jigsaw vm options is specified.
  * @requires vm.cds
  * @library /test/lib ..
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
- *          jdk.internal.jvmstat/sun.jvmstat.monitor
+ * @modules jdk.jartool/sun.tools.jar
  * @compile ../test-classes/Hello.java
  * @run driver CheckUnsupportedDumpingOptions
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/JigsawOptionsCombo.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/JigsawOptionsCombo.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,10 +28,7 @@
  *
  * @requires vm.cds & !vm.graal.enabled
  * @library /test/lib ..
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
- *          jdk.internal.jvmstat/sun.jvmstat.monitor
+ * @modules jdk.jartool/sun.tools.jar
  * @compile ../test-classes/Hello.java ../test-classes/HelloMore.java
  * @run driver JigsawOptionsCombo
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/AppClassInCP.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/AppClassInCP.java	Fri Aug 09 13:13:36 2019 -0700
@@ -31,8 +31,7 @@
  * @library ../..
  * @library /test/hotspot/jtreg/testlibrary
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @build PatchMain
  * @run driver AppClassInCP
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/CustomPackage.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/CustomPackage.java	Fri Aug 09 13:13:36 2019 -0700
@@ -31,8 +31,7 @@
  * @library ../..
  * @library /test/hotspot/jtreg/testlibrary
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @build PatchMain
  * @run driver CustomPackage
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/MismatchedPatchModule.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/MismatchedPatchModule.java	Fri Aug 09 13:13:36 2019 -0700
@@ -31,8 +31,7 @@
  * @library ../..
  * @library /test/hotspot/jtreg/testlibrary
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @build PatchMain
  * @run driver MismatchedPatchModule
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchDir.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchDir.java	Fri Aug 09 13:13:36 2019 -0700
@@ -30,8 +30,7 @@
  * @library ../..
  * @library /test/hotspot/jtreg/testlibrary
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @build PatchMain
  * @run driver PatchDir
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchJavaBase.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/PatchJavaBase.java	Fri Aug 09 13:13:36 2019 -0700
@@ -29,8 +29,7 @@
  * @library ../..
  * @library /test/hotspot/jtreg/testlibrary
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @build PatchMain
  * @run driver PatchJavaBase
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/Simple.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/Simple.java	Fri Aug 09 13:13:36 2019 -0700
@@ -29,8 +29,7 @@
  * @library ../..
  * @library /test/hotspot/jtreg/testlibrary
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @build PatchMain
  * @run driver Simple
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/SubClassOfPatchedClass.java	Fri Aug 09 13:13:36 2019 -0700
@@ -30,8 +30,7 @@
  * @library ../..
  * @library /test/hotspot/jtreg/testlibrary
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @build PatchMain
  * @run driver SubClassOfPatchedClass
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/TwoJars.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/PatchModule/TwoJars.java	Fri Aug 09 13:13:36 2019 -0700
@@ -29,8 +29,7 @@
  * @library ../..
  * @library /test/hotspot/jtreg/testlibrary
  * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @build PatchMain
  * @run driver TwoJars
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/BootAppendTests.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/BootAppendTests.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,10 +27,7 @@
  * @summary AppCDS tests for testing -Xbootclasspath/a
  * @requires vm.cds & !vm.graal.enabled
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
- *          jdk.internal.jvmstat/sun.jvmstat.monitor
+ * @modules jdk.jartool/sun.tools.jar
  * @compile src/jdk/test/Main.java
  * @compile src/com/sun/tools/javac/MyMain.jasm
  * @compile src/sun/nio/cs/ext/MyClass.java

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/ClassPathTests.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/ClassPathTests.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @requires vm.cds & !vm.graal.enabled
  * @library ../..
  * @library /test/lib
- * @modules java.compiler
- *          java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile src/jdk/test/Main.java
  * @compile src/com/sun/tools/javac/Main.jasm
  * @compile src/com/sun/tools/javac/MyMain.jasm

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/DummyClassesInBootClassPath.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,8 +27,7 @@
  * @summary Ensure that classes found in jimage takes precedence over classes found in -Xbootclasspath/a.
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.compiler
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @compile ../../test-classes/DummyClassHelper.java
  * @compile ../../test-classes/java/net/HttpCookie.jasm
  * @compile ../../../javax/annotation/processing/FilerException.jasm

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java	Fri Aug 09 13:13:36 2019 -0700
@@ -32,9 +32,7 @@
  * @requires vm.cds & !vm.graal.enabled
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
  * @modules java.base/jdk.internal.access
- *          java.management
  *          jdk.jartool/sun.tools.jar
- *          jdk.internal.jvmstat/sun.jvmstat.monitor
  * @compile ../../test-classes/EmptyClassHelper.java
  * @compile ../../test-classes/com/sun/tools/javac/Main.jasm
  * @run driver EmptyClassInBootClassPath

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddModules.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddModules.java	Fri Aug 09 13:13:36 2019 -0700
@@ -26,9 +26,7 @@
  * @test
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules jdk.compiler
- *          jdk.jartool/sun.tools.jar
- *          jdk.jlink
+ * @modules jdk.jartool/sun.tools.jar
  * @compile ../../test-classes/Hello.java
  * @run driver AddModules
  * @summary sanity test the --add-modules option

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddOpens.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddOpens.java	Fri Aug 09 13:13:36 2019 -0700
@@ -26,9 +26,7 @@
  * @test
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules jdk.compiler
- *          jdk.jartool/sun.tools.jar
- *          jdk.jlink
+ * @modules jdk.jartool/sun.tools.jar
  * @run driver AddOpens
  * @summary sanity test the --add-opens option
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddReads.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/AddReads.java	Fri Aug 09 13:13:36 2019 -0700
@@ -26,9 +26,7 @@
  * @test
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules jdk.compiler
- *          jdk.jartool/sun.tools.jar
- *          jdk.jlink
+ * @modules jdk.jartool/sun.tools.jar
  * @run driver AddReads
  * @summary sanity test the --add-reads option
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ExportModule.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ExportModule.java	Fri Aug 09 13:13:36 2019 -0700
@@ -26,9 +26,7 @@
  * @test
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules jdk.compiler
- *          jdk.jartool/sun.tools.jar
- *          jdk.jlink
+ * @modules jdk.jartool/sun.tools.jar
  * @run driver ExportModule
  * @summary Tests involve exporting a module from the module path to a jar in the -cp.
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/JvmtiAddPath.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/JvmtiAddPath.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary JvmtiEnv::AddToBootstrapClassLoaderSearch and JvmtiEnv::AddToSystemClassLoaderSearch should disable AppCDS
  * @requires vm.cds
  * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  * @compile ../../test-classes/JvmtiApp.java

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/MainModuleOnly.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/MainModuleOnly.java	Fri Aug 09 13:13:36 2019 -0700
@@ -26,9 +26,7 @@
  * @test
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules jdk.compiler
- *          jdk.jartool/sun.tools.jar
- *          jdk.jlink
+ * @modules jdk.jartool/sun.tools.jar
  * @run main/othervm MainModuleOnly
  * @summary Test some scenarios with a main modular jar specified in the --module-path and -cp options in the command line.
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP.java	Fri Aug 09 13:13:36 2019 -0700
@@ -26,9 +26,7 @@
  * @test
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules jdk.compiler
- *          jdk.jartool/sun.tools.jar
- *          jdk.jlink
+ * @modules jdk.jartool/sun.tools.jar
  * @run driver ModulePathAndCP
  * @summary 2 sets of tests: one with only --module-path in the command line;
  *          another with both -cp and --module-path in the command line.

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java	Fri Aug 09 13:13:36 2019 -0700
@@ -26,9 +26,7 @@
  * @test
  * @requires vm.hasJFR & vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules jdk.compiler
- *          jdk.jartool/sun.tools.jar
- *          jdk.jlink
+ * @modules jdk.jartool/sun.tools.jar
  * @run driver ModulePathAndCP_JFR
  * @summary Same as ModulePathAndCP, but add -XX:StartFlightRecording=dumponexit=true to the runtime
  *          options. This makes sure that the shared classes are compatible with both

--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/OverrideTests.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/overridetests/OverrideTests.java	Fri Aug 09 13:13:36 2019 -0700
@@ -25,8 +25,7 @@
 /**
  * @test
  * @requires vm.cds
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @library ../..
  * @library /test/lib
  * @compile ../../test-classes/Hello.java

--- a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/DumpingWithJavaAgent.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/DumpingWithJavaAgent.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,7 +28,6 @@
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes
  * @requires vm.cds
  * @requires vm.flavor != "minimal"
- * @modules jdk.jartool/sun.tools.jar
  * @build SimpleAgent Hello
  * @run main/othervm DumpingWithJavaAgent
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/parallelLoad/ParallelLoadAndTransformTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/parallelLoad/ParallelLoadAndTransformTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -31,10 +31,6 @@
  *     /test/hotspot/jtreg/testlibrary/jvmti
  * @requires vm.cds
  * @requires !vm.graal.enabled
- * @modules java.base/jdk.internal.misc
- *          java.management
- *          jdk.jartool/sun.tools.jar
- *          java.instrument
  * @build TransformUtil TransformerAgent ParallelLoad
  * @run driver ParallelLoadAndTransformTest
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/transformRelatedClasses/TransformInterfaceImplementorAppCDS.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/transformRelatedClasses/TransformInterfaceImplementorAppCDS.java	Fri Aug 09 13:13:36 2019 -0700
@@ -35,10 +35,6 @@
  * @requires vm.cds
  * @requires vm.flavor != "minimal"
  * @requires !vm.graal.enabled
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
- *          java.management
- *          java.instrument
  * @build TransformUtil TransformerAgent Interface Implementor
  * @run main/othervm TransformRelatedClassesAppCDS Interface Implementor
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/transformRelatedClasses/TransformSuperSubAppCDS.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/transformRelatedClasses/TransformSuperSubAppCDS.java	Fri Aug 09 13:13:36 2019 -0700
@@ -35,10 +35,6 @@
  * @requires vm.cds
  * @requires vm.flavor != "minimal"
  * @requires !vm.graal.enabled
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
- *          java.management
- *          java.instrument
  * @build TransformUtil TransformerAgent SubClass SuperClazz
  * @run main/othervm TransformRelatedClassesAppCDS SuperClazz SubClass
  */

--- a/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineBasicTest.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineBasicTest.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,11 +28,7 @@
  *          make sure class redefinition works with CDS.
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/serviceability/jvmti/RedefineClasses /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.compiler
- *          java.instrument
- *          jdk.jartool/sun.tools.jar
- *          java.base/jdk.internal.misc
- *          java.management
+ * @modules jdk.jartool/sun.tools.jar
  * @run driver RedefineClassHelper
  * @build sun.hotspot.WhiteBox RedefineBasic
  * @run driver RedefineBasicTest

--- a/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_Shared.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/redefineClass/RedefineRunningMethods_Shared.java	Fri Aug 09 13:13:36 2019 -0700
@@ -28,10 +28,7 @@
  *          make sure class redefinition works with CDS.
  * @requires vm.cds
  * @library /test/lib /test/hotspot/jtreg/serviceability/jvmti/RedefineClasses /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.compiler
- *          java.instrument
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @run driver RedefineClassHelper
  * @build sun.hotspot.WhiteBox RedefineRunningMethods_SharedHelper
  * @run driver RedefineRunningMethods_Shared

--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java	Fri Aug 09 13:13:36 2019 -0700
@@ -27,9 +27,7 @@
  * @summary Test relevant combinations of command line flags with shared strings
  * @requires vm.cds.archived.java.heap & vm.hasJFR
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.management
- *          jdk.jartool/sun.tools.jar
+ * @modules jdk.jartool/sun.tools.jar
  * @build HelloString
  * @run driver FlagCombo
  */
@@ -40,9 +38,6 @@
  * @comment A special test excluding the case that requires JFR
  * @requires vm.cds.archived.java.heap & !vm.hasJFR
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @modules java.base/jdk.internal.misc
- * @modules java.management
- *          jdk.jartool/sun.tools.jar
  * @build HelloString
  * @run driver FlagCombo noJfr
  */

--- a/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformInterfaceAndImplementor.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformInterfaceAndImplementor.java	Fri Aug 09 13:13:36 2019 -0700
@@ -29,10 +29,6 @@
  * @requires vm.cds
  * @requires vm.flavor != "minimal"
  * @requires !vm.graal.enabled
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
- *          java.management
- *          java.instrument
  * @build TransformUtil TransformerAgent Interface Implementor
  * @run main/othervm TransformRelatedClasses Interface Implementor
  */

--- a/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformSuperAndSubClasses.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformSuperAndSubClasses.java	Fri Aug 09 13:13:36 2019 -0700
@@ -30,10 +30,6 @@
  * @requires vm.cds
  * @requires vm.flavor != "minimal"
  * @requires !vm.graal.enabled
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
- *          java.management
- *          java.instrument
  * @build TransformUtil TransformerAgent SubClass SuperClazz
  * @run main/othervm TransformRelatedClasses SuperClazz SubClass
 */

--- a/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformSuperSubTwoPckgs.java	Fri Aug 09 12:27:05 2019 -0700
+++ b/test/hotspot/jtreg/runtime/cds/serviceability/transformRelatedClasses/TransformSuperSubTwoPckgs.java	Fri Aug 09 13:13:36 2019 -0700
@@ -30,10 +30,6 @@
  * @requires vm.cds
  * @requires vm.flavor != "minimal"
  * @requires !vm.graal.enabled
- * @modules java.base/jdk.internal.misc
- *          jdk.jartool/sun.tools.jar
- *          java.management
- *          java.instrument
  * @build TransformUtil TransformerAgent SubClass SuperClazz
  * @compile myPkg2/SubClass.java myPkg1/SuperClazz.java
  * @run main/othervm TransformRelatedClasses myPkg1.SuperClazz myPkg2.SubClass