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

Allow targeting specific major/minor Oracle JDK versions (#192)

Browse Source 
* Allow targeting specific major/minor Oracle JDK versions

Expose two new parameters 'version_major' and 'version_minor' to
allow users targeting specific Oracle JDK versions.

Signed-off-by: Gregor Zurowski <gregor@zurowski.org>

* Fix lint validation issues

Signed-off-by: Gregor Zurowski <gregor@zurowski.org>
This commit is contained in:
Gregor Zurowski
2016-10-07 19:48:58 +02:00
committed by Hunter Haugen
parent 2b0bd48cb5
commit 2a8236e6d1
1 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
manifests/oracle.pp
View File

@@ -14,8 +14,17 @@
# #
# Parameters # Parameters
# [*version*] # [*version*]
# Version of Java to install # Version of Java to install, e.g. '7' or '8'. Default values for major and minor
# versions will be used.
# #
# [*major_version*]
# Major version which should be installed, e.g. '8u101'. Must be used together with
# minor_version.
#
# [*minor_version*]
# Minor version which should be installed, e.g. 'b12'. Must be used together with
# major_version.
#
# [*java_se*] # [*java_se*]
# Type of Java Standard Edition to install, jdk or jre. # Type of Java Standard Edition to install, jdk or jre.
# #
@@ -71,10 +80,12 @@
# mike@marseglia.org # mike@marseglia.org
# #
define java::oracle ( define java::oracle (
$ensure = 'present', $ensure = 'present',
$version = '8', $version = '8',
$java_se = 'jdk', $version_major = undef,
$oracle_url = 'http://download.oracle.com/otn-pub/java/jdk/', $version_minor = undef,
$java_se = 'jdk',
$oracle_url = 'http://download.oracle.com/otn-pub/java/jdk/',
) { ) {
# archive module is used to download the java package # archive module is used to download the java package
@@ -87,27 +98,38 @@ define java::oracle (
fail('Java SE must be either jre or jdk.') fail('Java SE must be either jre or jdk.')
} }
# determine oracle Java major and minor version, and installation path # determine Oracle Java major and minor version, and installation path
case $version { if $version_major and $version_minor {
'6' : { $release_major = $version_major
$release_major = '6u45' $release_minor = $version_minor
$release_minor = 'b06' if $release_major =~ /(\d+)u(\d+)/ {
$install_path = "${java_se}1.6.0_45" $install_path = "${java_se}1.${1}.0_${2}"
} else {
$install_path = "${java_se}${release_major}${release_minor}"
} }
'7' : { } else {
$release_major = '7u80' # use default versions if no specific major and minor version parameters are provided
$release_minor = 'b15' case $version {
$install_path = "${java_se}1.7.0_80" '6' : {
} $release_major = '6u45'
'8' : { $release_minor = 'b06'
$release_major = '8u51' $install_path = "${java_se}1.6.0_45"
$release_minor = 'b16' }
$install_path = "${java_se}1.8.0_51" '7' : {
} $release_major = '7u80'
default : { $release_minor = 'b15'
$release_major = '8u51' $install_path = "${java_se}1.7.0_80"
$release_minor = 'b16' }
$install_path = "${java_se}1.8.0_51" '8' : {
$release_major = '8u51'
$release_minor = 'b16'
$install_path = "${java_se}1.8.0_51"
}
default : {
$release_major = '8u51'
$release_minor = 'b16'
$install_path = "${java_se}1.8.0_51"
}
} }
} }