From 70b6b81ec9ed64995c76a067f5445b5ff749d2a7 Mon Sep 17 00:00:00 2001 From: Tyler Langlois Date: Fri, 23 Dec 2016 06:36:22 -0500 Subject: [PATCH] Update SLES 11sp4 packages to Java 1.7.1 (#178) --- manifests/params.pp | 4 ++-- spec/classes/java_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 71d6171..5b5a80a 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -216,8 +216,8 @@ class java::params { $jre_package = 'java-1_7_0-openjdk' $java_home = '/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/' } elsif (versioncmp($::operatingsystemrelease, '11.4') >= 0) { - $jdk_package = 'java-1_7_0-ibm-devel' - $jre_package = 'java-1_7_0-ibm' + $jdk_package = 'java-1_7_1-ibm-devel' + $jre_package = 'java-1_7_1-ibm' $java_home = '/usr/lib64/jvm/java-1.7.0-ibm-1.7.0/' } else { $jdk_package = 'java-1_6_0-ibm-devel' diff --git a/spec/classes/java_spec.rb b/spec/classes/java_spec.rb index b6a251a..7d096cc 100644 --- a/spec/classes/java_spec.rb +++ b/spec/classes/java_spec.rb @@ -210,7 +210,7 @@ describe 'java', :type => :class do context 'select default for SLES 11.4' do let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '11.4', :architecture => 'x86_64'}} - it { should contain_package('java').with_name('java-1_7_0-ibm-devel')} + it { should contain_package('java').with_name('java-1_7_1-ibm-devel')} it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-ibm-1.7.0/') } end