X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=buildserver%2Fcookbooks%2Ffdroidbuild-general%2Frecipes%2Fdefault.rb;h=119c19e54a7619e537ea40414ec809af9f38e9af;hb=5de678e48be2be53f4e32bea125011d44cb9e8f1;hp=f9f81fe08aca96c5744ff4f17e6dda8db8e86592;hpb=d11135b44173adb25f3e3f50cb3888019a7f4fa6;p=fdroidserver.git diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb index f9f81fe0..119c19e5 100644 --- 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