Skip to content

Allow targeting specific major/minor Oracle JDK versions #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hunner merged 2 commits into from
Oct 7, 2016
Merged

Allow targeting specific major/minor Oracle JDK versions #192

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc8d998
Allow targeting specific major/minor Oracle JDK versions
gzurowski Oct 6, 2016
c833ac8
Fix lint validation issues
gzurowski Oct 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 48 additions & 26 deletions manifests/oracle.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,17 @@
#
# Parameters
# [*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*]
# Type of Java Standard Edition to install, jdk or jre.
#
Expand Down Expand Up @@ -71,10 +80,12 @@
# mike@marseglia.org
#
define java::oracle (
$ensure = 'present',
$version = '8',
$java_se = 'jdk',
$oracle_url = 'http://download.oracle.com/otn-pub/java/jdk/',
$ensure = 'present',
$version = '8',
$version_major = undef,
$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
Expand All @@ -87,27 +98,38 @@
fail('Java SE must be either jre or jdk.')
}

# determine oracle Java major and minor version, and installation path
case $version {
'6' : {
$release_major = '6u45'
$release_minor = 'b06'
$install_path = "${java_se}1.6.0_45"
}
'7' : {
$release_major = '7u80'
$release_minor = 'b15'
$install_path = "${java_se}1.7.0_80"
}
'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"
# determine Oracle Java major and minor version, and installation path
if $version_major and $version_minor {
$release_major = $version_major
$release_minor = $version_minor
if $release_major =~ /(\d+)u(\d+)/ {
$install_path = "${java_se}1.${1}.0_${2}"
} else {
$install_path = "${java_se}${release_major}${release_minor}"
}
} else {
# use default versions if no specific major and minor version parameters are provided
case $version {
'6' : {
$release_major = '6u45'
$release_minor = 'b06'
$install_path = "${java_se}1.6.0_45"
}
'7' : {
$release_major = '7u80'
$release_minor = 'b15'
$install_path = "${java_se}1.7.0_80"
}
'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"
}
}
}

Expand Down