From e49885293bf32dad701cb08a3394719d4f844a64 Mon Sep 17 00:00:00 2001 From: Andy Pavlo Date: Fri, 3 Jun 2016 12:58:30 -0400 Subject: [PATCH] Quick fix for getting the JVM version on 1.8 with OpenJDK --- tools/getjava.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/getjava.py b/tools/getjava.py index e19bd68be3..bdeeeac6e1 100755 --- a/tools/getjava.py +++ b/tools/getjava.py @@ -6,7 +6,7 @@ jvmVersion = None output = commands.getoutput("java -version") -regex = re.compile("java version \"(1\.\d)\..*?\"", re.IGNORECASE) +regex = re.compile("(?:java|openjdk) version \"(1\.\d)\..*?\"", re.IGNORECASE) m = regex.search(output) if m: jvmVersion = m.group(1)