From ff5dddab9935f304ba73fadcf42170c13c88c59b Mon Sep 17 00:00:00 2001 From: Gary Bartlett Date: Wed, 6 Feb 2019 06:31:57 -0800 Subject: [PATCH 1/2] Add support for java version strings without periods, e.g. "12-ea" (java-beta). --- Library/Homebrew/requirements/java_requirement.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/requirements/java_requirement.rb b/Library/Homebrew/requirements/java_requirement.rb index bc59ea1f68..71e6a5a2ba 100644 --- a/Library/Homebrew/requirements/java_requirement.rb +++ b/Library/Homebrew/requirements/java_requirement.rb @@ -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) From 8a6a46da36a1bd2b4e4d6d5527a0d657a7cb0495 Mon Sep 17 00:00:00 2001 From: Gary Bartlett Date: Wed, 6 Feb 2019 14:48:19 -0800 Subject: [PATCH 2/2] Add additional support for java minor versions > 9. --- Library/Homebrew/requirements/java_requirement.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/requirements/java_requirement.rb b/Library/Homebrew/requirements/java_requirement.rb index 71e6a5a2ba..aa29e116b7 100644 --- a/Library/Homebrew/requirements/java_requirement.rb +++ b/Library/Homebrew/requirements/java_requirement.rb @@ -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)