From ff24a13a24e93a7073dc77d50dba988846059fae Mon Sep 17 00:00:00 2001 From: Jesse Dearing Date: Fri, 22 May 2015 12:06:50 -0700 Subject: [PATCH 1/2] Change nr_java_found check to support Java 1.8+ --- lib/facter/nr_java_found.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/facter/nr_java_found.rb b/lib/facter/nr_java_found.rb index 53b4ba1..4b0baf9 100644 --- a/lib/facter/nr_java_found.rb +++ b/lib/facter/nr_java_found.rb @@ -5,7 +5,7 @@ if java && !java.empty? long_version = Facter::Util::Resolution.exec("#{java} -version 2>&1") version = long_version.split("\n")[0].split('"')[1] - version.start_with?('1.6', '1.7') + version > '1.5' else false end From 5141d3a1541c47db2253cf0e211e731e0b705b3d Mon Sep 17 00:00:00 2001 From: Jesse Dearing Date: Fri, 22 May 2015 12:07:29 -0700 Subject: [PATCH 2/2] Change nr_ruby_found check to look for > 1.8.6 --- lib/facter/nr_ruby_found.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/facter/nr_ruby_found.rb b/lib/facter/nr_ruby_found.rb index 7ad0ff1..6c769e8 100644 --- a/lib/facter/nr_ruby_found.rb +++ b/lib/facter/nr_ruby_found.rb @@ -4,7 +4,7 @@ ruby = Facter::Util::Resolution.exec('which ruby 2> /dev/null') if ruby && !ruby.empty? version = Facter::Util::Resolution.exec("#{ruby} -e 'puts RUBY_VERSION'") - version.start_with?('1.8.7', '1.9', '2.0') + version > '1.8.6' else false end