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

*** 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2018, 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 8144062 8176709
   * @summary Test aliasing additions to ZipFileSystem for multi-release jar files
   * @library /lib/testlibrary/java/util/jar
   * @build Compiler JarBuilder CreateMultiReleaseTestJars
   * @run testng MultiReleaseJarTest
   * @modules jdk.compiler
--- 21,31 ----
   * questions.
   */
  
  /*
   * @test
!  * @bug 8144355 8144062 8176709 8194070
   * @summary Test aliasing additions to ZipFileSystem for multi-release jar files
   * @library /lib/testlibrary/java/util/jar
   * @build Compiler JarBuilder CreateMultiReleaseTestJars
   * @run testng MultiReleaseJarTest
   * @modules jdk.compiler
*** 46,56 ****
  
  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 CreateMultiReleaseTestJars creator =  new CreateMultiReleaseTestJars();
      final private Map<String,String> stringEnv = new HashMap<>();
      final private Map<String,Integer> integerEnv = new HashMap<>();
--- 46,56 ----
  
  import org.testng.Assert;
  import org.testng.annotations.*;
  
  public class MultiReleaseJarTest {
!     final private int MAJOR_VERSION = Math.min(Runtime.version().major(), 10);
  
      final private String userdir = System.getProperty("user.dir",".");
      final private CreateMultiReleaseTestJars creator =  new CreateMultiReleaseTestJars();
      final private Map<String,String> stringEnv = new HashMap<>();
      final private Map<String,Integer> integerEnv = new HashMap<>();