From: Robert LU <robberphex@gmail.com>
Date: Wed, 1 Jul 2020 03:50:18 +0000 (+0800)
Subject: support adoptopenjdk
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7392242390d9904a4cc2cca8866137db114b5ced;p=dcevm.git

support adoptopenjdk
---

diff --git a/installer/src/main/java/com/github/dcevm/installer/ConfigurationInfo.java b/installer/src/main/java/com/github/dcevm/installer/ConfigurationInfo.java
index 18a2e558..cd71d265 100644
--- a/installer/src/main/java/com/github/dcevm/installer/ConfigurationInfo.java
+++ b/installer/src/main/java/com/github/dcevm/installer/ConfigurationInfo.java
@@ -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 {