Update java package for SLES 11.4

As of SLES 11.4, Java 1.6 has been deprecated in favor of 1.7:
https://www.suse.com/releasenotes/x86_64/SLE-SDK/11-SP4/#fate-318121
This commit is contained in:
Tyler Langlois
2016-03-25 12:11:14 -04:00
committed by Jonathan Tripathy
parent f4d218a162
commit 4b5cbc4d33
2 changed files with 24 additions and 9 deletions

View File

@@ -164,15 +164,15 @@ class java::params {
'Suse': {
case $::operatingsystem {
'SLES': {
case $::operatingsystemmajrelease{
default: {
$jdk_package = 'java-1_6_0-ibm-devel'
$jre_package = 'java-1_6_0-ibm'
}
'12': {
$jdk_package = 'java-1_7_0-openjdk-devel'
$jre_package = 'java-1_7_0-openjdk'
}
if (versioncmp($::operatingsystemrelease, '12') >= 0) {
$jdk_package = 'java-1_7_0-openjdk-devel'
$jre_package = 'java-1_7_0-openjdk'
} elsif (versioncmp($::operatingsystemrelease, '11.4') >= 0) {
$jdk_package = 'java-1_7_0-ibm-devel'
$jre_package = 'java-1_7_0-ibm'
} else {
$jdk_package = 'java-1_6_0-ibm-devel'
$jre_package = 'java-1_6_0-ibm'
}
}
'OpenSuSE': {