From 3e4d06331598f25d7ab9701118422a009d6eea0d Mon Sep 17 00:00:00 2001 From: Antoine Cotten Date: Mon, 25 Apr 2016 10:58:39 +0200 Subject: [PATCH] Add support for Java 8u91/8u92, release v2.6.3 --- CHANGELOG.md | 4 ++++ manifests/checksums.pp | 18 ++++++++++++++++++ manifests/init.pp | 2 +- manifests/installation.pp | 22 +++++++++++++++++++++- manifests/javalist.pp | 2 ++ metadata.json | 5 +++-- 6 files changed, 49 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b74c8a..cdd84c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +###2.6.3 + +Add support for Java '8u91'/'8u92' + ###2.6.2 Add support for Java '8u77' diff --git a/manifests/checksums.pp b/manifests/checksums.pp index 618553d..6c9f191 100644 --- a/manifests/checksums.pp +++ b/manifests/checksums.pp @@ -10,6 +10,24 @@ if !$oracle_java::custom_checksum { case $oracle_java::filename { + # 8u92 + 'jdk-8u92-linux-i586.rpm' : { $checksum = 'ac93a9f5b9a24cf2243e70fe4b45821d' } + 'jdk-8u92-linux-i586.tar.gz' : { $checksum = '0f2839ff1066438123dac3404702a3ef' } + 'jdk-8u92-linux-x64.rpm' : { $checksum = '881ee6070efcb427204f04c98db9a173' } + 'jdk-8u92-linux-x64.tar.gz' : { $checksum = '65a1cc17ea362453a6e0eb4f13be76e4' } + 'jre-8u92-linux-i586.rpm' : { $checksum = '2c55be06a4591a1c92ecf6d70da6f538' } + 'jre-8u92-linux-i586.tar.gz' : { $checksum = 'e2157870ce7f0484f347b8374da863a0' } + 'jre-8u92-linux-x64.rpm' : { $checksum = '99a3ab44a94c17520e70d5f8502ae0ee' } + 'jre-8u92-linux-x64.tar.gz' : { $checksum = 'df1371cec5c66c1039ccc3e7a433c1de' } + # 8u91 + 'jdk-8u91-linux-i586.rpm' : { $checksum = 'aa51e55b8d9a62dc981a36f1377e0d7a' } + 'jdk-8u91-linux-i586.tar.gz' : { $checksum = 'f18cbe901f2c77630f1e301cea32b259' } + 'jdk-8u91-linux-x64.rpm' : { $checksum = '967d658352ebd7fac8904fed690856c6' } + 'jdk-8u91-linux-x64.tar.gz' : { $checksum = '3f3d7d0cd70bfe0feab382ed4b0e45c0' } + 'jre-8u91-linux-i586.rpm' : { $checksum = 'c1ea766e7b25ed730c5d685f34ad62a5' } + 'jre-8u91-linux-i586.tar.gz' : { $checksum = '705521705f0ddaa150f64090e56ae96c' } + 'jre-8u91-linux-x64.rpm' : { $checksum = '60a99e2076ccdc28003a106d6e995f2c' } + 'jre-8u91-linux-x64.tar.gz' : { $checksum = 'cc48b4cacfeda1f699b43ea77ddfaa95' } # 8u77 'jdk-8u77-linux-i586.rpm' : { $checksum = '466a2bb2b48011b51620aeb115a3d6ae' } 'jdk-8u77-linux-i586.tar.gz' : { $checksum = 'e5bac32e2a7ab5cf9068ba92ba084472' } diff --git a/manifests/init.pp b/manifests/init.pp index b98ad45..1dd338b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -77,7 +77,7 @@ # set to latest release if no minor version was provided if $version == '8' { - $version_real = '8u77' + $version_real = '8u92' } elsif $version == '7' { $version_real = '7u80' } else { diff --git a/manifests/installation.pp b/manifests/installation.pp index 22fd9d3..a2c9a6f 100644 --- a/manifests/installation.pp +++ b/manifests/installation.pp @@ -56,7 +56,7 @@ # set to latest release if no minor version was provided if $version == '8' { - $version_real = '8u77' + $version_real = '8u92' } elsif $version == '7' { $version_real = '7u80' } else { @@ -92,6 +92,8 @@ case $maj_version { '8' : { case $min_version { + '92' : { $build = '-b14' } + '91' : { $build = '-b14' } '77' : { $build = '-b03' } '72' : { $build = '-b15' } '71' : { $build = '-b15' } @@ -176,6 +178,24 @@ #-- start checksum --# if !$custom_checksum { case $filename { + # 8u92 + 'jdk-8u92-linux-i586.rpm' : { $checksum = 'ac93a9f5b9a24cf2243e70fe4b45821d' } + 'jdk-8u92-linux-i586.tar.gz' : { $checksum = '0f2839ff1066438123dac3404702a3ef' } + 'jdk-8u92-linux-x64.rpm' : { $checksum = '881ee6070efcb427204f04c98db9a173' } + 'jdk-8u92-linux-x64.tar.gz' : { $checksum = '65a1cc17ea362453a6e0eb4f13be76e4' } + 'jre-8u92-linux-i586.rpm' : { $checksum = '2c55be06a4591a1c92ecf6d70da6f538' } + 'jre-8u92-linux-i586.tar.gz' : { $checksum = 'e2157870ce7f0484f347b8374da863a0' } + 'jre-8u92-linux-x64.rpm' : { $checksum = '99a3ab44a94c17520e70d5f8502ae0ee' } + 'jre-8u92-linux-x64.tar.gz' : { $checksum = 'df1371cec5c66c1039ccc3e7a433c1de' } + # 8u91 + 'jdk-8u91-linux-i586.rpm' : { $checksum = 'aa51e55b8d9a62dc981a36f1377e0d7a' } + 'jdk-8u91-linux-i586.tar.gz' : { $checksum = 'f18cbe901f2c77630f1e301cea32b259' } + 'jdk-8u91-linux-x64.rpm' : { $checksum = '967d658352ebd7fac8904fed690856c6' } + 'jdk-8u91-linux-x64.tar.gz' : { $checksum = '3f3d7d0cd70bfe0feab382ed4b0e45c0' } + 'jre-8u91-linux-i586.rpm' : { $checksum = 'c1ea766e7b25ed730c5d685f34ad62a5' } + 'jre-8u91-linux-i586.tar.gz' : { $checksum = '705521705f0ddaa150f64090e56ae96c' } + 'jre-8u91-linux-x64.rpm' : { $checksum = '60a99e2076ccdc28003a106d6e995f2c' } + 'jre-8u91-linux-x64.tar.gz' : { $checksum = 'cc48b4cacfeda1f699b43ea77ddfaa95' } # 8u77 'jdk-8u77-linux-i586.rpm' : { $checksum = '466a2bb2b48011b51620aeb115a3d6ae' } 'jdk-8u77-linux-i586.tar.gz' : { $checksum = 'e5bac32e2a7ab5cf9068ba92ba084472' } diff --git a/manifests/javalist.pp b/manifests/javalist.pp index 4284ec1..0e565a3 100644 --- a/manifests/javalist.pp +++ b/manifests/javalist.pp @@ -12,6 +12,8 @@ case $oracle_java::maj_version { '8' : { case $oracle_java::min_version { + '92' : { $build = '-b14' } + '91' : { $build = '-b14' } '77' : { $build = '-b03' } '72' : { $build = '-b15' } '71' : { $build = '-b15' } diff --git a/metadata.json b/metadata.json index 6933f8d..8ee7e91 100644 --- a/metadata.json +++ b/metadata.json @@ -5,7 +5,7 @@ "project_page": "https://github.com/antoineco/aco-oracle_java", "source": "git://github.com/antoineco/aco-oracle_java.git", "summary": "Puppet module to install Oracle Java on Linux systems", - "version": "2.6.2", + "version": "2.6.3", "tags": ["jre","jdk","oracle","java"], "dependencies": [ { @@ -128,7 +128,8 @@ "14.04", "14.10", "15.04", - "15.10" + "15.10", + "16.04" ] }, {