diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d1d2ef..5dd4f61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +###1.1.5 + +* Add support for Java '7u71', '7u72' and '8u25' + ###1.1.4 * Fix bug in package name for Java 8u20 @@ -28,4 +32,4 @@ ###1.0.0 -First forge release \ No newline at end of file +First forge release diff --git a/README.md b/README.md index 5f27c23..ef56bf0 100644 --- a/README.md +++ b/README.md @@ -82,17 +82,17 @@ What envionment type to install. Valid values are 'jre' and 'jdk'. Defaults to ' ##Limitations -* 2 different releases of the same Java series can not cohabit on the same system when installed from RPM. Each new version will override the previous one. +* Prior to Java 8u20, two different releases of the same Java series could not cohabit on the same system when installed from RPM. Each new version overrides the previous one. * Works only on [RPM-based distributions](http://en.wikipedia.org/wiki/List_of_Linux_distributions#RPM-based) ##Credits -This module relies almost entirely on all the nice information found on [Ivan Dyedov's Blog](https://ivan-site.com/2012/05/download-oracle-java-jre-jdk-using-a-script/) +The method used by this module to retrieve its installation packages relies on the useful information found on [Ivan Dyedov's Blog](https://ivan-site.com/2012/05/download-oracle-java-jre-jdk-using-a-script/) ##To Do -* Add Oracle Java as a 'java' alternative (will craft a dedicated module for that purpose) +* Add Oracle Java as a 'java' alternative (waiting for an official release of [this module](https://github.com/adrienthebo/puppet-alternatives)) * Allow the manipulation of Java related environment variables * Propose an alternative based on tar.gz archives, also available from Oracle's archives -Features request and contributions are always welcome! \ No newline at end of file +Features request and contributions are always welcome! diff --git a/manifests/init.pp b/manifests/init.pp index 68fc90e..ad0888f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -32,9 +32,9 @@ # set to latest release if no minor version was provided if $version == '8' { - $version_real = '8u20' + $version_real = '8u25' } elsif $version == '7' { - $version_real = '7u67' + $version_real = '7u72' } elsif $version == '6' { $version_real = '6u45' } else { @@ -50,6 +50,7 @@ case $maj_version { 8 : { case $min_version { + '25' : { $build = '-b17' } '20' : { $build = '-b26' } '11' : { $build = '-b12' } '5' : { $build = '-b13' } @@ -59,6 +60,8 @@ } 7 : { case $min_version { + '72' : { $build = '-b14' } + '71' : { $build = '-b14' } '67' : { $build = '-b01' } '65' : { $build = '-b17' } '60' : { $build = '-b19' } @@ -152,9 +155,11 @@ $downloadurl = "http://download.oracle.com/otn-pub/java/jdk/${version_final}${build}/${filename}" # define package name - $packagename = $version_real ? { - '8u20' => "${type}1.${maj_version}.0_${min_version}", - default => $type + if $maj_version == '8' and $min_version >= '20' { + $packagename = "${type}1.${maj_version}.0_${min_version}" + } + else { + $packagename = $type } # make sure install/download directory exists diff --git a/metadata.json b/metadata.json index bdd589b..3ac0b6a 100644 --- a/metadata.json +++ b/metadata.json @@ -5,7 +5,7 @@ "project_page": "https://github.com/tOnI0/aco-oracle_java", "source": "git://github.com/tOnI0/aco-oracle_java.git", "summary": "Puppet module to install Oracle Java on RPM-based Linux systems", - "version": "1.1.4", + "version": "1.1.5", "tags": ["rpm","jre","jdk","oracle","java"], "dependencies": [ {