Merge pull request #5682 from gcbartlett/issues/5671

Add support for java version strings without periods, e.g. "12-ea"
This commit is contained in:
Markus Reiter 2019-02-07 01:03:46 +01:00 committed by GitHub
commit e32c151543
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -129,7 +129,7 @@ class JavaRequirement < Requirement
end
def satisfies_version(java)
java_version_s = system_command(java, args: ["-version"], print_stderr: false).stderr[/\d+\.\d/]
java_version_s = system_command(java, args: ["-version"], print_stderr: false).stderr[/\d+(\.\d+)?/]
return false unless java_version_s
java_version = Version.create(java_version_s)