From 30a8df0f9188c58a8cad75f55870e7880fa6217f Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Tue, 11 Aug 2020 18:48:07 +0100
Subject: [PATCH] os/mac/system_config: simplify JVM version parsing

---
 Library/Homebrew/extend/os/mac/system_config.rb | 11 +++--------
 Library/Homebrew/system_config.rb               |  1 -
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Library/Homebrew/extend/os/mac/system_config.rb b/Library/Homebrew/extend/os/mac/system_config.rb
index fb5e7736db..5bca79689d 100644
--- a/Library/Homebrew/extend/os/mac/system_config.rb
+++ b/Library/Homebrew/extend/os/mac/system_config.rb
@@ -8,15 +8,10 @@ class SystemConfig
       # java_home doesn't exist on all macOSs; it might be missing on older versions.
       return "N/A" unless File.executable? "/usr/libexec/java_home"
 
-      out, _, status = system_command("/usr/libexec/java_home", args: ["--xml", "--failfast"], print_stderr: false)
-      return "N/A" unless status.success?
+      result = system_command("/usr/libexec/java_home", args: ["--xml", "--failfast"], print_stderr: false)
+      return "N/A" unless result.success?
 
-      javas = []
-      xml = REXML::Document.new(out)
-      REXML::XPath.each(xml, "//key[text()='JVMVersion']/following-sibling::string") do |item|
-        javas << item.text
-      end
-      javas.uniq.join(", ")
+      result.plist.map { |jvm| jvm["JVMVersion"] }.uniq.join(", ")
     end
 
     def describe_homebrew_ruby
diff --git a/Library/Homebrew/system_config.rb b/Library/Homebrew/system_config.rb
index a09d1a20fa..fd65dc07aa 100644
--- a/Library/Homebrew/system_config.rb
+++ b/Library/Homebrew/system_config.rb
@@ -2,7 +2,6 @@
 
 require "hardware"
 require "software_spec"
-require "rexml/document"
 require "development_tools"
 require "extend/ENV"