From bc9762794652125d572b051a73a67bf5869be166 Mon Sep 17 00:00:00 2001 From: Brantone Date: Thu, 2 May 2019 09:27:33 -0700 Subject: [PATCH 1/6] By making Homebrew Cask into an attribute allows for using adoptopenjdk --- CHANGELOG.md | 2 ++ attributes/default.rb | 1 + recipes/homebrew.rb | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e2d30df..5e4a1552 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This file is used to list changes made in each version of the Java cookbook. ## Unreleased +- Make Homebrew Cask name an attribute to allow for other options (ex: adoptopenjdk) + ## 4.0.0 - 2019-04-19 - Added new install flavor "adoptopenjdk" for AdoptOpenJDK's distribution of Java diff --git a/attributes/default.rb b/attributes/default.rb index 5b6c59cd..397e2f65 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']['cask'] = 'java' else default['java']['install_flavor'] = 'openjdk' end diff --git a/recipes/homebrew.rb b/recipes/homebrew.rb index 6b761df0..3c51ca3e 100644 --- a/recipes/homebrew.rb +++ b/recipes/homebrew.rb @@ -3,6 +3,6 @@ include_recipe 'java::notify' homebrew_tap 'caskroom/versions' -homebrew_cask "java#{node['java']['jdk_version']}" do +homebrew_cask "#{node['java']['homebrew']['cask']}#{node['java']['jdk_version']}" do notifies :write, 'log[jdk-version-changed]', :immediately end From 784b2cb593c09013299d9e8de6dc7ca4bb93fd79 Mon Sep 17 00:00:00 2001 From: Brantone Date: Thu, 2 May 2019 09:35:43 -0700 Subject: [PATCH 2/6] Bump version to delineate un-merged PR upstream --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index ff28d834..3ef1d8ef 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.0.0' +version '4.9000.0' supports 'debian' supports 'ubuntu' From d8abe3f1ae3d87af13bfb1bca124b7ee6a37fb28 Mon Sep 17 00:00:00 2001 From: Brantone Date: Thu, 2 May 2019 09:27:33 -0700 Subject: [PATCH 3/6] By making Homebrew Cask into an attribute allows for using adoptopenjdk --- CHANGELOG.md | 2 ++ attributes/default.rb | 1 + recipes/homebrew.rb | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90921c9f..ce824a76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This file is used to list changes made in each version of the Java cookbook. ## Unreleased +- Make Homebrew Cask name an attribute to allow for other options (ex: adoptopenjdk) + ## 4.1.0 - 2019-05-08 - Added new install flavor "corretto" for Amazon's Corretto distribution of OpenJDK diff --git a/attributes/default.rb b/attributes/default.rb index 0e7045ac..76b7e2f8 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']['cask'] = 'java' else default['java']['install_flavor'] = 'openjdk' end diff --git a/recipes/homebrew.rb b/recipes/homebrew.rb index 6b761df0..3c51ca3e 100644 --- a/recipes/homebrew.rb +++ b/recipes/homebrew.rb @@ -3,6 +3,6 @@ include_recipe 'java::notify' homebrew_tap 'caskroom/versions' -homebrew_cask "java#{node['java']['jdk_version']}" do +homebrew_cask "#{node['java']['homebrew']['cask']}#{node['java']['jdk_version']}" do notifies :write, 'log[jdk-version-changed]', :immediately end From 01541b444e88b124f591ec4010336760ba1e2021 Mon Sep 17 00:00:00 2001 From: Brantone Date: Thu, 2 May 2019 09:35:43 -0700 Subject: [PATCH 4/6] Bump version to delineate un-merged PR upstream --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 95b3c896..b6ffb18e 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.1.0' +version '4.9001.0' supports 'debian' supports 'ubuntu' From 179c614f832b6d05d38c6114a76e4f94addf9a79 Mon Sep 17 00:00:00 2001 From: ybelotserkovsky Date: Wed, 15 Jan 2020 11:19:25 -0800 Subject: [PATCH 5/6] 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 6/6] 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)