diff --git a/README.md b/README.md index bf9d5b12..0e415564 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,16 @@ NOTE: In most cases, including just the default recipe will be sufficient. It's possible to include the install_type recipes directly, as long as the necessary attributes (such as java_home) are set. +## set_attributes_from_version + +Sets default attributes based on the JDK version. This logic must be in +a recipe instead of attributes/default.rb. See [#95](https://github.com/socrata-cookbooks/java/pull/95) +for details. + +## purge_packages + +Purges deprecated Sun Java packages. + ## openjdk This recipe installs the `openjdk` flavor of Java. It also uses the diff --git a/recipes/default.rb b/recipes/default.rb index f49ec650..5417e69b 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -18,5 +18,5 @@ # limitations under the License. # -include_recipe "java::compute_paths" +include_recipe "java::set_attributes_from_version" include_recipe "java::#{node['java']['install_flavor']}" diff --git a/recipes/compute_paths.rb b/recipes/set_attributes_from_version.rb similarity index 98% rename from recipes/compute_paths.rb rename to recipes/set_attributes_from_version.rb index 68316fa7..966076db 100644 --- a/recipes/compute_paths.rb +++ b/recipes/set_attributes_from_version.rb @@ -1,5 +1,5 @@ # Cookbook Name:: java -# Recipe:: compute_paths +# Recipe:: set_attributes_from_version # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.