]> source.dussan.org Git - dcevm.git/commitdiff
support adoptopenjdk 186/head
authorRobert LU <robberphex@gmail.com>
Wed, 1 Jul 2020 03:50:18 +0000 (11:50 +0800)
committerGitHub <noreply@github.com>
Wed, 1 Jul 2020 03:50:18 +0000 (11:50 +0800)
installer/src/main/java/com/github/dcevm/installer/ConfigurationInfo.java

index 18a2e55889ac22f838e8bb96d14003ddd2cfa6fb..cd71d265ba7304ca3fb49af232a5096f89a788ce 100644 (file)
@@ -268,7 +268,7 @@ public enum ConfigurationInfo {
     }
 
     public String getJavaVersion(Path jreDir) throws IOException {
-        return getVersionHelper(jreDir, ".*java version.*\"(.*)\".*", true, false);
+        return getVersionHelper(jreDir, ".*(?:java|openjdk) version.*\"(.*)\".*", true, false);;
     }
 
     final public String getDCEVersion(Path jreDir, boolean altjvm) throws IOException {