From 47ba62fce0d8d511219660b9b7ae63f5cbf667ab Mon Sep 17 00:00:00 2001 From: nothsa Date: Mon, 23 Mar 2015 15:18:05 -0700 Subject: [PATCH 1/2] Update oracle.rb --- recipes/oracle.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/oracle.rb b/recipes/oracle.rb index 4c5c80e1..f2b710fc 100644 --- a/recipes/oracle.rb +++ b/recipes/oracle.rb @@ -48,6 +48,8 @@ Chef::Application.fatal!("You must change the download link to your private repository. You can no longer download java directly from http://download.oracle.com without a web broswer") end +Chef::Application.fatal!("#{tarball_url}") + include_recipe "java::set_java_home" java_ark "jdk" do From d4d5cffb78368e6821d6ccaae03277ba7b3f6a34 Mon Sep 17 00:00:00 2001 From: nothsa Date: Mon, 23 Mar 2015 17:03:32 -0700 Subject: [PATCH 2/2] Update default.rb --- recipes/default.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/default.rb b/recipes/default.rb index 2c1b2871..34f36ed5 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -18,6 +18,8 @@ # limitations under the License. # +Chef::Application.fatal!("____ #{node['java']['install_flavor']} ____") + if node['java']['install_flavor'] != 'windows' if node['java']['jdk_version'].to_i == 8 and node['java']['install_flavor'] != 'oracle' Chef::Application.fatal!("JDK 8 is currently only provided with the Oracle JDK")