Replace JavaVersion with JDK API

trinodb · May 14, 2020 · e7eeeed · e7eeeed
1 parent 685ae60
commit e7eeeed
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 191 deletions.
diff --git a/presto-main/src/main/java/io/prestosql/server/JavaVersion.java b/presto-main/src/main/java/io/prestosql/server/JavaVersion.java
diff --git a/presto-main/src/main/java/io/prestosql/server/PrestoSystemRequirements.java b/presto-main/src/main/java/io/prestosql/server/PrestoSystemRequirements.java
@@ -94,18 +94,9 @@ else if ("Mac OS X".equals(osName)) {
 
     private static void verifyJavaVersion()
     {
-        String javaVersion = StandardSystemProperty.JAVA_VERSION.value();
-        if (javaVersion == null) {
-            failRequirement("Java version not defined");
+        if (Runtime.version().feature() < 11) {
+            failRequirement("Presto requires Java 11+ (found %s)", Runtime.version());
         }
-
-        JavaVersion version = JavaVersion.parse(javaVersion);
-
-        if (version.getMajor() >= 11) {
-            return;
-        }
-
-        failRequirement("Presto requires Java 11+ (found %s)", javaVersion);
     }
 
     private static void verifyUsingG1Gc()

diff --git a/presto-main/src/test/java/io/prestosql/server/TestJavaVersion.java b/presto-main/src/test/java/io/prestosql/server/TestJavaVersion.java