From 179c614f832b6d05d38c6114a76e4f94addf9a79 Mon Sep 17 00:00:00 2001 From: ybelotserkovsky Date: Wed, 15 Jan 2020 11:19:25 -0800 Subject: [PATCH 1/2] Update homebrew tap for Java Fixes : `caskroom/versions` was moved. Tap `homebrew/cask-versions` instead * Based on proposed changes from * Switch homebrew tap to homebrew/cask-versions * Make Homebrew Tap name an attribute to allow for other options --- CHANGELOG.md | 7 ++++++- attributes/default.rb | 1 + metadata.rb | 2 +- recipes/homebrew.rb | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce824a76..e851a5b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,12 @@ This file is used to list changes made in each version of the Java cookbook. -## Unreleased +## 4.9002.0 - 2020-01-15 +- Based on proposed changes from +- Switch homebrew tap to homebrew/cask-versions +- Make Homebrew Tap name an attribute to allow for other options + +## 4.9001.0 - 2019-05-23 - Make Homebrew Cask name an attribute to allow for other options (ex: adoptopenjdk) diff --git a/attributes/default.rb b/attributes/default.rb index 76b7e2f8..60fa2ad8 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -47,6 +47,7 @@ default['java']['windows']['returns'] = 0 when 'mac_os_x' default['java']['install_flavor'] = 'homebrew' + default['java']['homebrew']['tap'] = 'homebrew/cask-versions' default['java']['homebrew']['cask'] = 'java' else default['java']['install_flavor'] = 'openjdk' diff --git a/metadata.rb b/metadata.rb index b6ffb18e..10002bf5 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license 'Apache-2.0' description 'Recipes and resources for installing Java and managing certificates' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '4.9001.0' +version '4.9002.0' supports 'debian' supports 'ubuntu' diff --git a/recipes/homebrew.rb b/recipes/homebrew.rb index 3c51ca3e..0e96cf86 100644 --- a/recipes/homebrew.rb +++ b/recipes/homebrew.rb @@ -2,7 +2,7 @@ include_recipe 'homebrew::cask' include_recipe 'java::notify' -homebrew_tap 'caskroom/versions' +homebrew_tap node['java']['homebrew']['tap'] homebrew_cask "#{node['java']['homebrew']['cask']}#{node['java']['jdk_version']}" do notifies :write, 'log[jdk-version-changed]', :immediately end From 28e131dcaf5bcb709df65349517b59e0fe4059c3 Mon Sep 17 00:00:00 2001 From: ybelotserkovsky Date: Wed, 15 Jan 2020 14:08:08 -0800 Subject: [PATCH 2/2] Updates to CHANGELOG --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e851a5b4..93510bb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,14 @@ This file is used to list changes made in each version of the Java cookbook. -## 4.9002.0 - 2020-01-15 +## Unreleased +### 4.9002.0 - Roblox internal + - Based on proposed changes from - Switch homebrew tap to homebrew/cask-versions - Make Homebrew Tap name an attribute to allow for other options -## 4.9001.0 - 2019-05-23 +### 4.9001.0 - Roblox internal - Make Homebrew Cask name an attribute to allow for other options (ex: adoptopenjdk)