From 2e71faf1a3fbe229e0f2ae9f4b60084206eda02f Mon Sep 17 00:00:00 2001
From: Stefan Galinski <stefan@sgalinski.de>
Date: Wed, 3 Aug 2016 01:32:02 +0200
Subject: [PATCH] [TASK] Update default versions of tomcat and java for xenial

---
 attributes/default.rb | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/attributes/default.rb b/attributes/default.rb
index fd5bd00..6738fe0 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -1,7 +1,12 @@
-default['tomcat']['base_version'] = 6
-default['java']['jdk_version'] = 7
-default['java']['install_flavor'] = 'oracle'
-default['java']['oracle']['accept_oracle_download_terms'] = true
+if node['platform_version'] == '16.04'
+	default['tomcat']['base_version'] = 8
+	default['java']['jdk_version'] = 8
+else
+	default['tomcat']['base_version'] = 6
+	default['java']['jdk_version'] = 7
+	default['java']['install_flavor'] = 'oracle'
+	default['java']['oracle']['accept_oracle_download_terms'] = true
+end
 
 default['typo3_site']['ip_address'] = ''
 default['typo3_site']['webroot'] = '/var/www'
-- 
GitLab