From 4a83cc95a8dc161d2b18c1ef998314b809ee653b Mon Sep 17 00:00:00 2001 From: Hoyt Summers Pittman Date: Sun, 10 Apr 2016 11:13:07 -0400 Subject: [PATCH 1/3] Update openjdk.rb Changing uri to the http uri --- recipes/openjdk.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/openjdk.rb b/recipes/openjdk.rb index e66d4535..e4e89a7a 100644 --- a/recipes/openjdk.rb +++ b/recipes/openjdk.rb @@ -43,7 +43,7 @@ if node['platform'] == 'ubuntu' include_recipe 'apt' apt_repository 'openjdk-r-ppa' do - uri 'ppa:openjdk-r' + uri 'http://ppa.launchpad.net/openjdk-r/ppa/ubuntu/' distribution node['lsb']['codename'] end end From 5a51feb96af21f1efabc60c8a25274033f30b023 Mon Sep 17 00:00:00 2001 From: Hoyt Summers Pittman Date: Sun, 10 Apr 2016 11:23:23 -0400 Subject: [PATCH 2/3] Update openjdk.rb fixup --- recipes/openjdk.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/openjdk.rb b/recipes/openjdk.rb index e4e89a7a..e39fb134 100644 --- a/recipes/openjdk.rb +++ b/recipes/openjdk.rb @@ -45,6 +45,7 @@ apt_repository 'openjdk-r-ppa' do uri 'http://ppa.launchpad.net/openjdk-r/ppa/ubuntu/' distribution node['lsb']['codename'] + components ["main"] end end From 284bd20ec480714319ba942f086ad33f21b2fb23 Mon Sep 17 00:00:00 2001 From: Hoyt Summers Pittman Date: Sun, 10 Apr 2016 11:54:07 -0400 Subject: [PATCH 3/3] Update openjdk.rb fixup --- recipes/openjdk.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/openjdk.rb b/recipes/openjdk.rb index e39fb134..950c8d4e 100644 --- a/recipes/openjdk.rb +++ b/recipes/openjdk.rb @@ -51,6 +51,7 @@ node['java']['openjdk_packages'].each do |pkg| package pkg do + options '--force-yes' version node['java']['openjdk_version'] if node['java']['openjdk_version'] end end