RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Add support for java 11, the default in debian buster 10

Browse Source
This commit is contained in:
Jeroen Hooyberghs
2019-09-10 12:21:19 +02:00
parent 00c05a826f
commit 21d39590b0
7 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/facter/java_libjvm_path.rb
View File

@@ -14,7 +14,7 @@ Facter.add(:java_libjvm_path) do
confine kernel: ['Linux', 'OpenBSD']
setcode do
java_default_home = Facter.value(:java_default_home)
java_libjvm_file = Dir.glob("#{java_default_home}/jre/lib/**/libjvm.so")
java_libjvm_file = Dir.glob("#{java_default_home}/**/lib/**/libjvm.so")
if java_libjvm_file.nil? || java_libjvm_file.empty?
nil
else

10
lib/facter/java_major_version.rb
View File

@@ -16,7 +16,15 @@ Facter.add(:java_major_version) do
java_major_version = nil
setcode do
java_version = Facter.value(:java_version)
java_major_version = java_version.strip.split('_')[0].split('.')[1] unless java_version.nil?
unless java_version.nil?
# First part > 1, use the first part as major version
java_version_test = java_version.strip.split('.')[0]
if java_version_test.to_i > 1
java_major_version = java_version_test
else
java_major_version = java_version.strip.split('_')[0].split('.')[1]
end
end
end
java_major_version
end

11
lib/facter/java_patch_level.rb
View File

@@ -14,7 +14,16 @@ Facter.add(:java_patch_level) do
java_patch_level = nil
setcode do
java_version = Facter.value(:java_version)
java_patch_level = java_version.strip.split('_')[1] unless java_version.nil?
unless java_version.nil?
# First part > 1, use . as seperator to get patch level
java_version_test = java_version.strip.split('.')[0]
if java_version_test.to_i > 1
java_patch_level = java_version.strip.split('.')[2]
else
java_patch_level = java_version.strip.split('_')[1]
end
end
end
java_patch_level
end

3
lib/facter/java_version.rb
View File

@@ -24,7 +24,8 @@ Facter.add(:java_version) do
unless ['darwin'].include? Facter.value(:operatingsystem).downcase
version = nil
if Facter::Util::Resolution.which('java')
Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = $LAST_MATCH_INFO[1] if %r{^.+ version \"(.+)\"$} =~ line }
Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = $LAST_MATCH_INFO[1] if %r{^.+ version \"(.+)\".*$} =~ line }
end
version
end