Use standard java recipe instead of jenkins::java

Author: adriaanm

attributes/master.rb

@@ -9,6 +9,10 @@
 default['s3']['downloads']['host'] = "downloads.typesafe.com.s3.amazonaws.com"
 
 if node.name == "jenkins-master"
+  # JAVA
+  default['java']['jdk_version']    = '7'
+  default['java']['install_flavor'] = 'openjdk'
+
   # JENKINS
   override['jenkins']['master']['install_method'] = 'war'
   override['jenkins']['master']['listen_address'] = '127.0.0.1' # external traffic must go through nginx

recipes/_master-init-jenkins.rb

@@ -7,10 +7,6 @@
 # All rights reserved - Do Not Redistribute
 #
 
-# The jenkins cookbook comes with a very simple java installer. If you need more
-#  complex java installs you are on your own.
-#  https://github.com/opscode-cookbooks/jenkins#java
-include_recipe 'jenkins::java'
 include_recipe 'jenkins::master'
 
 # recursive doesn't set owner correctly??

recipes/master-init.rb

@@ -10,6 +10,8 @@
 
 chef_gem "chef-vault"
 
+include_recipe "java"
+
 include_recipe "scala-jenkins-infra::_master-init-jenkins"