src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java

@@ -34,10 +34,11 @@
 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[])}

@@ -66,18 +67,18 @@
             int version;
             Object o = env.get("multi-release");
             if (o instanceof String) {
                 String s = (String)o;
                 if (s.equals("runtime")) {
-                    version = sun.misc.Version.jdkMajorVersion();  // fixme waiting for jdk.util.Version
+                    version = jdk.Version.current().major();
                 } else {
                     version = Integer.parseInt(s);
                 }
             } else if (o instanceof Integer) {
                 version = (Integer)o;
-            } else if (false /*o instanceof Version*/) {  // fixme waiting for jdk.util.Version
-//                version = ((Version)o).major();
+            } else if (o instanceof Version) {
+                version = ((Version)o).major();
             } else {
                 throw new IllegalArgumentException("env parameter must be String, Integer, "
                         + "or Version");
             }
             lookup = createVersionedLinks(version < 0 ? 0 : version);