jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.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.  Oracle designates this
--- 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.  Oracle designates this
*** 25,44 ****
  
  package jdk.nio.zipfs;
  
  import java.io.IOException;
  import java.io.InputStream;
  import java.nio.file.Path;
  import java.util.Arrays;
  import java.util.HashMap;
  import java.util.Map;
  import java.util.TreeMap;
  import java.util.function.Consumer;
  import java.util.function.Function;
  import java.util.jar.Attributes;
  import java.util.jar.Manifest;
- import jdk.Version;
  
  /**
   * Adds aliasing to ZipFileSystem to support multi-release jar files.  An alias map
   * is created by {@link JarFileSystem#createVersionedLinks(int)}.  The map is then
   * consulted when an entry is looked up in {@link JarFileSystem#getEntry(byte[])}
--- 25,44 ----
  
  package jdk.nio.zipfs;
  
  import java.io.IOException;
  import java.io.InputStream;
+ import java.lang.Runtime.Version;
  import java.nio.file.Path;
  import java.util.Arrays;
  import java.util.HashMap;
  import java.util.Map;
  import java.util.TreeMap;
  import java.util.function.Consumer;
  import java.util.function.Function;
  import java.util.jar.Attributes;
  import java.util.jar.Manifest;
  
  /**
   * Adds aliasing to ZipFileSystem to support multi-release jar files.  An alias map
   * is created by {@link JarFileSystem#createVersionedLinks(int)}.  The map is then
   * consulted when an entry is looked up in {@link JarFileSystem#getEntry(byte[])}
*** 67,77 ****
              int version;
              Object o = env.get("multi-release");
              if (o instanceof String) {
                  String s = (String)o;
                  if (s.equals("runtime")) {
!                     version = jdk.Version.current().major();
                  } else {
                      version = Integer.parseInt(s);
                  }
              } else if (o instanceof Integer) {
                  version = (Integer)o;
--- 67,77 ----
              int version;
              Object o = env.get("multi-release");
              if (o instanceof String) {
                  String s = (String)o;
                  if (s.equals("runtime")) {
!                     version = Runtime.version().major();
                  } else {
                      version = Integer.parseInt(s);
                  }
              } else if (o instanceof Integer) {
                  version = (Integer)o;