From e821923057d9cc4c58a282661d9750b58628bc9a Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 31 Mar 2016 09:51:40 -0400 Subject: [PATCH] Ubuntu xenial supports openjdk-8-jdk For more information: https://bugs.launchpad.net/ubuntu/+source/openjdk-7/+bug/1563986 Change-Id: I6cba549fc51a704a57798db15d3ad88dcdc0a4d9 Signed-off-by: Paul Belanger --- manifests/params.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index 813000f..f7c8637 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -35,12 +35,13 @@ class jenkins::params { } 'Debian': { # common packages - $jdk_package = 'openjdk-7-jdk' $ccache_package = 'ccache' $python_netaddr_package = 'python-netaddr' if ($::operatingsystem == 'Ubuntu') and ($::operatingsystemrelease >= '16.04') { + $jdk_package = 'openjdk-8-jdk' $maven_package = 'maven' } else { + $jdk_package = 'openjdk-7-jdk' $maven_package = 'maven2' } $cgroups_package = 'cgroup-bin'