Skip to content
Snippets Groups Projects
Commit a5c8628f authored by Mike McQuaid's avatar Mike McQuaid Committed by GitHub
Browse files

Merge pull request #3333 from DomT4/java_versioning

java_requirement: fix Java 9 version detection
parents c7d21dad 19790679
No related branches found
No related tags found
No related merge requests found
......@@ -11,7 +11,7 @@ class JavaRequirement < Requirement
end
def initialize(tags)
@version = tags.shift if /(\d\.)+\d/ =~ tags.first
@version = tags.shift if /(\d+\.)+\d/ =~ tags.first
super
end
......@@ -103,7 +103,7 @@ class JavaRequirement < Requirement
end
def satisfies_version(java)
java_version_s = Utils.popen_read("#{java} -version 2>&1")[/1.\d/]
java_version_s = Utils.popen_read("#{java} -version 2>&1")[/\d+.\d/]
return false unless java_version_s
java_version = Version.create(java_version_s)
needed_version = Version.create(version_without_plus)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment