Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes the attribute to purge deprecated packages #125

Merged
merged 1 commit into from
Jan 17, 2014
Merged

Removes the attribute to purge deprecated packages #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ Attributes

See `attributes/default.rb` for default values.

* `node['java']['remove_deprecated_packages']` - Removes the now
deprecated Ubuntu JDK packages from the system, default `false`
* `node['java']['install_flavor']` - Flavor of JVM you would like
installed (`oracle`, `openjdk`, `ibm`, `windows`), default `openjdk`
on Linux/Unix platforms, `windows` on Windows platforms.
Expand Down Expand Up @@ -151,7 +149,7 @@ this recipe requires you to host it internally on your own http repo.
**IMPORTANT NOTE**

If you use the `windows` recipe, you'll need to make sure you've uploaded
the `aws` and `windows` cookbooks. As of version 1.18.0, this cookbook
the `aws` and `windows` cookbooks. As of version 1.18.0, this cookbook
references them with `suggests` instead of `depends`, as they are only
used by the `windows` recipe.

Expand Down Expand Up @@ -223,8 +221,8 @@ By default, the extracted directory is extracted to
## java_alternatives

The `java_alternatives` LWRP uses `update-alternatives` command
to set and unset command alternatives for various Java tools
such as java, javac, etc.
to set and unset command alternatives for various Java tools
such as java, javac, etc.

### Actions

Expand All @@ -235,7 +233,7 @@ such as java, javac, etc.

- `java_location`: Java installation location.
- `bin_cmds`: array of Java tool names to set or unset alternatives on.
- `default`: whether to set the Java tools as system default. Boolean, defaults to `true`.
- `default`: whether to set the Java tools as system default. Boolean, defaults to `true`.
- `priority`: priority of the alternatives. Integer, defaults to `1061`.

### Examples
Expand All @@ -247,7 +245,7 @@ such as java, javac, etc.
action :set
end

###
###
Usage
=====

Expand Down
3 changes: 0 additions & 3 deletions attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# remove the deprecated Ubuntu jdk packages
default['java']['remove_deprecated_packages'] = false

# default jdk attributes
default['java']['jdk_version'] = '6'
default['java']['arch'] = kernel['machine'] =~ /x86_64/ ? "x86_64" : "i586"
Expand Down
4 changes: 0 additions & 4 deletions recipes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,3 @@

include_recipe "java::compute_paths"
include_recipe "java::#{node['java']['install_flavor']}"

if node['java']['remove_deprecated_packages']
include_recipe "java::purge_packages"
end
1 change: 0 additions & 1 deletion recipes/purge_packages.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# Purge the deprecated Sun Java packages if remove_deprecated_packages is true
%w[sun-java6-jdk sun-java6-bin sun-java6-jre].each do |pkg|
package pkg do
action :purge
Expand Down