jdk/test/tools/jar/compat/CLICompatibility.java

rev 17249 : 8180887: move FileUtils to top level testlibrary
Reviewed-by: duke

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 2016, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2017, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 33,43 ****
  import java.util.jar.JarEntry;
  import java.util.jar.JarInputStream;
  import java.util.jar.JarOutputStream;
  import java.util.stream.Stream;
  
! import jdk.testlibrary.FileUtils;
  import jdk.testlibrary.JDKToolFinder;
  import org.testng.annotations.BeforeTest;
  import org.testng.annotations.Test;
  
  import static java.lang.String.format;
--- 33,43 ----
  import java.util.jar.JarEntry;
  import java.util.jar.JarInputStream;
  import java.util.jar.JarOutputStream;
  import java.util.stream.Stream;
  
! import jdk.test.lib.util.FileUtils;
  import jdk.testlibrary.JDKToolFinder;
  import org.testng.annotations.BeforeTest;
  import org.testng.annotations.Test;
  
  import static java.lang.String.format;
*** 47,58 ****
  import static org.testng.Assert.assertTrue;
  
  /*
   * @test
   * @bug 8170952
!  * @library /lib/testlibrary
!  * @build jdk.testlibrary.FileUtils jdk.testlibrary.JDKToolFinder
   * @run testng CLICompatibility
   * @summary Basic test for compatibility of CLI options
   */
  
  public class CLICompatibility {
--- 47,58 ----
  import static org.testng.Assert.assertTrue;
  
  /*
   * @test
   * @bug 8170952
!  * @library /lib/testlibrary /test/lib
!  * @build jdk.testlibrary.JDKToolFinder
   * @run testng CLICompatibility
   * @summary Basic test for compatibility of CLI options
   */
  
  public class CLICompatibility {