diff options
| author | Vladimir Dvorak <lada.dvorak7@gmail.com> | 2020-07-01 07:08:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 07:08:04 +0200 |
| commit | f7efb882d7651d401b6a91d1a60507d09c66b8a6 (patch) | |
| tree | 04a6f08ad5a36f7a74097aaeaa583a04f7f39faf | |
| parent | 3573c7f6572d673c298cacc4ab760f5fe2a2836e (diff) | |
| parent | 7392242390d9904a4cc2cca8866137db114b5ced (diff) | |
| download | dcevm-f7efb882d7651d401b6a91d1a60507d09c66b8a6.tar.gz dcevm-f7efb882d7651d401b6a91d1a60507d09c66b8a6.zip | |
Merge pull request #186 from RobberPhex/adoptopenjdk
support adoptopenjdk
| -rw-r--r-- | installer/src/main/java/com/github/dcevm/installer/ConfigurationInfo.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |