jdk/test/java/util/jar/JarFile/MultiReleaseJarProperties.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 8132734
   * @summary Test the System properties for JarFile that support multi-release jar files
   * @library /lib/testlibrary/java/util/jar
   * @build Compiler JarBuilder CreateMultiReleaseTestJars
   * @run testng MultiReleaseJarProperties
   * @run testng/othervm -Djdk.util.jar.version=0 MultiReleaseJarProperties
--- 21,31 ----
   * questions.
   */
  
  /*
   * @test
!  * @bug 8132734 8144062
   * @summary Test the System properties for JarFile that support multi-release jar files
   * @library /lib/testlibrary/java/util/jar
   * @build Compiler JarBuilder CreateMultiReleaseTestJars
   * @run testng MultiReleaseJarProperties
   * @run testng/othervm -Djdk.util.jar.version=0 MultiReleaseJarProperties
*** 52,71 ****
  import java.net.URL;
  import java.net.URLClassLoader;
  import java.nio.file.Files;
  import java.util.jar.JarEntry;
  import java.util.jar.JarFile;
- import jdk.Version;
  
  import org.testng.Assert;
  import org.testng.annotations.AfterClass;
  import org.testng.annotations.BeforeClass;
  import org.testng.annotations.Test;
  
  public class MultiReleaseJarProperties {
  
!     static final int MAJOR_VERSION = Version.current().major();
  
      final static int ROOTVERSION = 8; // magic number from knowledge of internals
      final static String userdir = System.getProperty("user.dir", ".");
      final static File multirelease = new File(userdir, "multi-release.jar");
      protected int rtVersion;
--- 52,70 ----
  import java.net.URL;
  import java.net.URLClassLoader;
  import java.nio.file.Files;
  import java.util.jar.JarEntry;
  import java.util.jar.JarFile;
  
  import org.testng.Assert;
  import org.testng.annotations.AfterClass;
  import org.testng.annotations.BeforeClass;
  import org.testng.annotations.Test;
  
  public class MultiReleaseJarProperties {
  
!     static final int MAJOR_VERSION = Runtime.version().major();
  
      final static int ROOTVERSION = 8; // magic number from knowledge of internals
      final static String userdir = System.getProperty("user.dir", ".");
      final static File multirelease = new File(userdir, "multi-release.jar");
      protected int rtVersion;