all: switch to jdk8 as default

[fdroidserver.git] / buildserver / cookbooks / fdroidbuild-general / recipes / default.rb

diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
index f9f81fe08aca96c5744ff4f17e6dda8db8e86592..119c19e54a7619e537ea40414ec809af9f38e9af 100644 (file)
--- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
+++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
@@ -51,8 +51,7 @@ end
     maven
     mercurial
     nasm
-    openjdk-7-jdk
-    openjdk-8-jdk
+    openjdk-8-jdk-headless
     optipng
     p7zip
     pandoc
@@ -98,7 +97,7 @@ easy_install_package "compare-locales" do
 end
 
 execute "set-default-java" do
-  command "update-java-alternatives --set java-1.7.0-openjdk-i386"
+  command "update-java-alternatives --set java-1.8.0-openjdk-i386"
 end
 
 # Ubuntu trusty 14.04's paramiko does not work with jessie's openssh's default settings