Repository: bigtop Updated Branches: refs/heads/master fc6a42420 -> 68f5844af
BIGTOP-1936: Provide JDK8 for Bigtop Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/68f5844a Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/68f5844a Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/68f5844a Branch: refs/heads/master Commit: 68f5844afd9d8d434692bb06862c91daa53102b9 Parents: fc6a424 Author: Olaf Flebbe <o...@oflebbe.de> Authored: Sun Aug 30 15:02:34 2015 +0200 Committer: Olaf Flebbe <o...@oflebbe.de> Committed: Mon Sep 14 20:00:16 2015 +0200 ---------------------------------------------------------------------- bigtop_toolchain/manifests/jdk.pp | 36 ++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/68f5844a/bigtop_toolchain/manifests/jdk.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/jdk.pp b/bigtop_toolchain/manifests/jdk.pp index 12fe314..6c71ec4 100644 --- a/bigtop_toolchain/manifests/jdk.pp +++ b/bigtop_toolchain/manifests/jdk.pp @@ -16,20 +16,52 @@ class bigtop_toolchain::jdk { case $operatingsystem{ - Debian,Ubuntu: { + Debian: { + include apt + include apt::backports + package { 'openjdk-7-jdk' : ensure => present } + package { 'openjdk-8-jdk' : + ensure => present, + } + + Apt::Source['backports'] -> Exec['apt-update'] } - /(CentOS|Fedora|Amazon)/: { + Ubuntu: { + include apt + + package { 'openjdk-7-jdk' : + ensure => present + } + package { 'openjdk-8-jdk' : + ensure => present, + } + + apt::key { 'openjdk-ppa': + id => 'eb9b1d8886f44e2a', + server => 'keyserver.ubuntu.com' + } -> + apt::ppa { 'http://ppa.launchpad.net/openjdk-r/ppa/ubuntu': } + + Apt::Ppa['http://ppa.launchpad.net/openjdk-r/ppa/ubuntu'] -> Exec['apt-update'] + } + /(CentOS|Fedora|Amazon|OpenSuSE)/: { package { 'java-1.7.0-openjdk-devel' : ensure => present } + package { 'java-1.8.0-openjdk-devel' : + ensure => present + } } /(OpenSuSE)/: { package { 'java-1_7_0-openjdk-devel' : ensure => present } + package { 'java-1_8_0-openjdk-devel' : + ensure => present + } } } }
