Currently JarFileSystem uses sun.misc.Version to retrieve the major version. It should be updated to use the new JDK specific Version API.
diff --git a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java
@@ -36,6 +36,7 @@
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
@@ -68,14 +69,14 @@
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");
diff --git a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java
@@ -36,6 +36,7 @@
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
@@ -68,14 +69,14 @@
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");
- blocks
-
JDK-8150162 Move sun.misc.Version to a truly internal package
-
- Resolved
-
- relates to
-
JDK-8151140 Replace use of lambda/method ref in jdk.Version constructor
-
- Resolved
-
-
JDK-8144355 JDK 9 changes to ZipFileSystem to support multi-release jar files
-
- Closed
-
-
JDK-8144062 Move jdk.Version to java.lang.Runtime.Version
-
- Closed
-