test/serviceability/dcmd/framework/VMVersionTest.java

*** 19,29 ****
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
! import jdk.test.lib.OutputAnalyzer;
  import jdk.test.lib.dcmd.CommandExecutor;
  import jdk.test.lib.dcmd.PidJcmdExecutor;
  import jdk.test.lib.dcmd.MainClassJcmdExecutor;
  import jdk.test.lib.dcmd.FileJcmdExecutor;
  import jdk.test.lib.dcmd.JMXExecutor;
--- 19,29 ----
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
! import jdk.test.lib.process.OutputAnalyzer;
  import jdk.test.lib.dcmd.CommandExecutor;
  import jdk.test.lib.dcmd.PidJcmdExecutor;
  import jdk.test.lib.dcmd.MainClassJcmdExecutor;
  import jdk.test.lib.dcmd.FileJcmdExecutor;
  import jdk.test.lib.dcmd.JMXExecutor;
*** 31,47 ****
  import org.testng.annotations.Test;
  
  /*
   * @test
   * @summary Test of diagnostic command VM.version (tests all DCMD executors)
!  * @library /testlibrary
   * @modules java.base/jdk.internal.misc
   *          java.compiler
   *          java.management
   *          jdk.jvmstat/sun.jvmstat.monitor
-  * @build jdk.test.lib.*
-  * @build jdk.test.lib.dcmd.*
   * @run testng/othervm -XX:+UsePerfData VMVersionTest
   */
  public class VMVersionTest {
      public void run(CommandExecutor executor) {
          OutputAnalyzer output = executor.execute("VM.version");
--- 31,45 ----
  import org.testng.annotations.Test;
  
  /*
   * @test
   * @summary Test of diagnostic command VM.version (tests all DCMD executors)
!  * @library /test/lib
   * @modules java.base/jdk.internal.misc
   *          java.compiler
   *          java.management
   *          jdk.jvmstat/sun.jvmstat.monitor
   * @run testng/othervm -XX:+UsePerfData VMVersionTest
   */
  public class VMVersionTest {
      public void run(CommandExecutor executor) {
          OutputAnalyzer output = executor.execute("VM.version");