jdk/test/jdk/nio/zipfs/MultiReleaseJarTest.java

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 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, 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.
*** 21,31 ****
   * questions.
   */
  
  /*
   * @test
!  * @bug 8144355
   * @summary Test aliasing additions to ZipFileSystem for multi-release jar files
   * @library /lib/testlibrary/java/util/jar
   * @build Compiler JarBuilder CreateMultiReleaseTestJars
   * @run testng MultiReleaseJarTest
   */
--- 21,31 ----
   * questions.
   */
  
  /*
   * @test
!  * @bug 8144355 8144062
   * @summary Test aliasing additions to ZipFileSystem for multi-release jar files
   * @library /lib/testlibrary/java/util/jar
   * @build Compiler JarBuilder CreateMultiReleaseTestJars
   * @run testng MultiReleaseJarTest
   */
*** 32,52 ****
  
  import java.io.IOException;
  import java.lang.invoke.MethodHandle;
  import java.lang.invoke.MethodHandles;
  import java.lang.invoke.MethodType;
  import java.net.URI;
  import java.nio.file.*;
  import java.util.HashMap;
  import java.util.Map;
- import jdk.Version;
  
  import org.testng.Assert;
  import org.testng.annotations.*;
  
  public class MultiReleaseJarTest {
!     final private int MAJOR_VERSION = Version.current().major();
  
      final private String userdir = System.getProperty("user.dir",".");
      final private Map<String,String> stringEnv = new HashMap<>();
      final private Map<String,Integer> integerEnv = new HashMap<>();
      final private Map<String,Version> versionEnv = new HashMap<>();
--- 32,52 ----
  
  import java.io.IOException;
  import java.lang.invoke.MethodHandle;
  import java.lang.invoke.MethodHandles;
  import java.lang.invoke.MethodType;
+ import java.lang.Runtime.Version;
  import java.net.URI;
  import java.nio.file.*;
  import java.util.HashMap;
  import java.util.Map;
  
  import org.testng.Assert;
  import org.testng.annotations.*;
  
  public class MultiReleaseJarTest {
!     final private int MAJOR_VERSION = Runtime.version().major();
  
      final private String userdir = System.getProperty("user.dir",".");
      final private Map<String,String> stringEnv = new HashMap<>();
      final private Map<String,Integer> integerEnv = new HashMap<>();
      final private Map<String,Version> versionEnv = new HashMap<>();