test/runtime/modules/Xpatch/XpatchTraceCL.java

@@ -25,17 +25,19 @@
  * @test
  * @bug 8069469
  * @summary Make sure -Xlog:classload=info works properly with "modules" jimage,
             -Xpatch, and with -Xbootclasspath/a
  * @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
  * @compile XpatchMain.java
  * @run main XpatchTraceCL
  */
 
 import java.io.File;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.InMemoryJavaCompiler;
 
 public class XpatchTraceCL {
 
     public static void main(String[] args) throws Exception {
         String source = "package javax.naming.spi; "                +