Merge pull request #263 from pmcmaw/paulaTesting

(FM-6503) - Release Prep for 2.2.1
2017-11-08 09:25:50 -08:00 · 2017-11-06 15:35:10 +00:00 · 2017-10-09 17:51:01 +01:00 · 2017-10-09 18:30:09 +02:00 · 2017-10-02 12:41:05 +01:00 · 2017-10-01 15:15:01 +02:00
62 changed files with 1733 additions and 806 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
 #This file is generated by ModuleSync, do not edit.
-*.rb  eol=lf
+*.rb eol=lf
 *.erb eol=lf
-*.pp  eol=lf
-*.sh  eol=lf
+*.pp eol=lf
+*.sh eol=lf
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,24 @@
 #This file is generated by ModuleSync, do not edit.
 pkg/
 Gemfile.lock
+Gemfile.local
 vendor/
-spec/fixtures/
+spec/fixtures/manifests/
+spec/fixtures/modules/
+log/
+junit/
 .vagrant/
 .bundle/
 coverage/
 log/
 .idea/
+.metadata
 *.iml
+.*.sw[op]
+.yardoc
+.yardwarns
+.DS_Store
+tmp/
+vendor/
+doc/
+
--- a/.project
+++ b/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>puppetlabs-java</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+	</natures>
+</projectDescription>
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -0,0 +1,508 @@
+require: rubocop-rspec
+AllCops:
+  TargetRubyVersion: 1.9
+  Include:
+    - ./**/*.rb
+  Exclude:
+    - vendor/**/*
+    - .vendor/**/*
+    - pkg/**/*
+    - spec/fixtures/**/*
+Lint/ConditionPosition:
+  Enabled: True
+
+Lint/ElseLayout:
+  Enabled: True
+
+Lint/UnreachableCode:
+  Enabled: True
+
+Lint/UselessComparison:
+  Enabled: True
+
+Lint/EnsureReturn:
+  Enabled: True
+
+Lint/HandleExceptions:
+  Enabled: True
+
+Lint/LiteralInCondition:
+  Enabled: True
+
+Lint/ShadowingOuterLocalVariable:
+  Enabled: True
+
+Lint/LiteralInInterpolation:
+  Enabled: True
+
+Style/HashSyntax:
+  Enabled: True
+
+Style/RedundantReturn:
+  Enabled: True
+
+Lint/AmbiguousOperator:
+  Enabled: True
+
+Lint/AssignmentInCondition:
+  Enabled: True
+
+Style/SpaceBeforeComment:
+  Enabled: True
+
+Style/AndOr:
+  Enabled: True
+
+Style/RedundantSelf:
+  Enabled: True
+
+# Method length is not necessarily an indicator of code quality
+Metrics/MethodLength:
+  Enabled: False
+
+# Module length is not necessarily an indicator of code quality
+Metrics/ModuleLength:
+  Enabled: False
+
+Style/WhileUntilModifier:
+  Enabled: True
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: True
+
+Lint/Eval:
+  Enabled: True
+
+Lint/BlockAlignment:
+  Enabled: True
+
+Lint/DefEndAlignment:
+  Enabled: True
+
+Lint/EndAlignment:
+  Enabled: True
+
+Lint/DeprecatedClassMethods:
+  Enabled: True
+
+Lint/Loop:
+  Enabled: True
+
+Lint/ParenthesesAsGroupedExpression:
+  Enabled: True
+
+Lint/RescueException:
+  Enabled: True
+
+Lint/StringConversionInInterpolation:
+  Enabled: True
+
+Lint/UnusedBlockArgument:
+  Enabled: True
+
+Lint/UnusedMethodArgument:
+  Enabled: True
+
+Lint/UselessAccessModifier:
+  Enabled: True
+
+Lint/UselessAssignment:
+  Enabled: True
+
+Lint/Void:
+  Enabled: True
+
+Style/AccessModifierIndentation:
+  Enabled: True
+
+Style/AccessorMethodName:
+  Enabled: True
+
+Style/Alias:
+  Enabled: True
+
+Style/AlignArray:
+  Enabled: True
+
+Style/AlignHash:
+  Enabled: True
+
+Style/AlignParameters:
+  Enabled: True
+
+Metrics/BlockNesting:
+  Enabled: True
+
+Style/AsciiComments:
+  Enabled: True
+
+Style/Attr:
+  Enabled: True
+
+Style/BracesAroundHashParameters:
+  Enabled: True
+
+Style/CaseEquality:
+  Enabled: True
+
+Style/CaseIndentation:
+  Enabled: True
+
+Style/CharacterLiteral:
+  Enabled: True
+
+Style/ClassAndModuleCamelCase:
+  Enabled: True
+
+Style/ClassAndModuleChildren:
+  Enabled: False
+
+Style/ClassCheck:
+  Enabled: True
+
+# Class length is not necessarily an indicator of code quality
+Metrics/ClassLength:
+  Enabled: False
+
+Style/ClassMethods:
+  Enabled: True
+
+Style/ClassVars:
+  Enabled: True
+
+Style/WhenThen:
+  Enabled: True
+
+Style/WordArray:
+  Enabled: True
+
+Style/UnneededPercentQ:
+  Enabled: True
+
+Style/Tab:
+  Enabled: True
+
+Style/SpaceBeforeSemicolon:
+  Enabled: True
+
+Style/TrailingBlankLines:
+  Enabled: True
+
+Style/SpaceInsideBlockBraces:
+  Enabled: True
+
+Style/SpaceInsideBrackets:
+  Enabled: True
+
+Style/SpaceInsideHashLiteralBraces:
+  Enabled: True
+
+Style/SpaceInsideParens:
+  Enabled: True
+
+Style/LeadingCommentSpace:
+  Enabled: True
+
+Style/SpaceBeforeFirstArg:
+  Enabled: True
+
+Style/SpaceAfterColon:
+  Enabled: True
+
+Style/SpaceAfterComma:
+  Enabled: True
+
+Style/SpaceAfterMethodName:
+  Enabled: True
+
+Style/SpaceAfterNot:
+  Enabled: True
+
+Style/SpaceAfterSemicolon:
+  Enabled: True
+
+Style/SpaceAroundEqualsInParameterDefault:
+  Enabled: True
+
+Style/SpaceAroundOperators:
+  Enabled: True
+
+Style/SpaceBeforeBlockBraces:
+  Enabled: True
+
+Style/SpaceBeforeComma:
+  Enabled: True
+
+Style/CollectionMethods:
+  Enabled: True
+
+Style/CommentIndentation:
+  Enabled: True
+
+Style/ColonMethodCall:
+  Enabled: True
+
+Style/CommentAnnotation:
+  Enabled: True
+
+# 'Complexity' is very relative
+Metrics/CyclomaticComplexity:
+  Enabled: False
+
+Style/ConstantName:
+  Enabled: True
+
+Style/Documentation:
+  Enabled: False
+
+Style/DefWithParentheses:
+  Enabled: True
+
+Style/PreferredHashMethods:
+  Enabled: True
+
+Style/DotPosition:
+  EnforcedStyle: trailing
+
+Style/DoubleNegation:
+  Enabled: True
+
+Style/EachWithObject:
+  Enabled: True
+
+Style/EmptyLineBetweenDefs:
+  Enabled: True
+
+Style/IndentArray:
+  Enabled: True
+
+Style/IndentHash:
+  Enabled: True
+
+Style/IndentationConsistency:
+  Enabled: True
+
+Style/IndentationWidth:
+  Enabled: True
+
+Style/EmptyLines:
+  Enabled: True
+
+Style/EmptyLinesAroundAccessModifier:
+  Enabled: True
+
+Style/EmptyLiteral:
+  Enabled: True
+
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Enabled: False
+
+Style/MethodCallParentheses:
+  Enabled: True
+
+Style/MethodDefParentheses:
+  Enabled: True
+
+Style/LineEndConcatenation:
+  Enabled: True
+
+Style/TrailingWhitespace:
+  Enabled: True
+
+Style/StringLiterals:
+  Enabled: True
+
+Style/TrailingCommaInArguments:
+  Enabled: True
+
+Style/TrailingCommaInLiteral:
+  Enabled: True
+
+Style/GlobalVars:
+  Enabled: True
+
+Style/GuardClause:
+  Enabled: True
+
+Style/IfUnlessModifier:
+  Enabled: True
+
+Style/MultilineIfThen:
+  Enabled: True
+
+Style/NegatedIf:
+  Enabled: True
+
+Style/NegatedWhile:
+  Enabled: True
+
+Style/Next:
+  Enabled: True
+
+Style/SingleLineBlockParams:
+  Enabled: True
+
+Style/SingleLineMethods:
+  Enabled: True
+
+Style/SpecialGlobalVars:
+  Enabled: True
+
+Style/TrivialAccessors:
+  Enabled: True
+
+Style/UnlessElse:
+  Enabled: True
+
+Style/VariableInterpolation:
+  Enabled: True
+
+Style/VariableName:
+  Enabled: True
+
+Style/WhileUntilDo:
+  Enabled: True
+
+Style/EvenOdd:
+  Enabled: True
+
+Style/FileName:
+  Enabled: True
+
+Style/For:
+  Enabled: True
+
+Style/Lambda:
+  Enabled: True
+
+Style/MethodName:
+  Enabled: True
+
+Style/MultilineTernaryOperator:
+  Enabled: True
+
+Style/NestedTernaryOperator:
+  Enabled: True
+
+Style/NilComparison:
+  Enabled: True
+
+Style/FormatString:
+  Enabled: True
+
+Style/MultilineBlockChain:
+  Enabled: True
+
+Style/Semicolon:
+  Enabled: True
+
+Style/SignalException:
+  Enabled: True
+
+Style/NonNilCheck:
+  Enabled: True
+
+Style/Not:
+  Enabled: True
+
+Style/NumericLiterals:
+  Enabled: True
+
+Style/OneLineConditional:
+  Enabled: True
+
+Style/OpMethod:
+  Enabled: True
+
+Style/ParenthesesAroundCondition:
+  Enabled: True
+
+Style/PercentLiteralDelimiters:
+  Enabled: True
+
+Style/PerlBackrefs:
+  Enabled: True
+
+Style/PredicateName:
+  Enabled: True
+
+Style/RedundantException:
+  Enabled: True
+
+Style/SelfAssignment:
+  Enabled: True
+
+Style/Proc:
+  Enabled: True
+
+Style/RaiseArgs:
+  Enabled: True
+
+Style/RedundantBegin:
+  Enabled: True
+
+Style/RescueModifier:
+  Enabled: True
+
+# based on https://github.com/voxpupuli/modulesync_config/issues/168
+Style/RegexpLiteral:
+  EnforcedStyle: percent_r
+  Enabled: True
+
+Lint/UnderscorePrefixedVariableName:
+  Enabled: True
+
+Metrics/ParameterLists:
+  Enabled: False
+
+Lint/RequireParentheses:
+  Enabled: True
+
+Style/SpaceBeforeFirstArg:
+  Enabled: True
+
+Style/ModuleFunction:
+  Enabled: True
+
+Lint/Debugger:
+  Enabled: True
+
+Style/IfWithSemicolon:
+  Enabled: True
+
+Style/Encoding:
+  Enabled: True
+
+Style/BlockDelimiters:
+  Enabled: True
+
+Style/MultilineBlockLayout:
+  Enabled: True
+
+# 'Complexity' is very relative
+Metrics/AbcSize:
+  Enabled: False
+
+# 'Complexity' is very relative
+Metrics/PerceivedComplexity:
+  Enabled: False
+
+Lint/UselessAssignment:
+  Enabled: True
+
+Style/ClosingParenthesisIndentation:
+  Enabled: False
+
+# RSpec
+
+# We don't use rspec in this way
+RSpec/DescribeClass:
+  Enabled: False
+
+# Example length is not necessarily an indicator of code quality
+RSpec/ExampleLength:
+  Enabled: False
+
+RSpec/NamedSubject:
+  Enabled: False
--- a/.sync.yml
+++ b/.sync.yml
@@ -0,0 +1,5 @@
+---
+appveyor.yml:
+  delete: true
+spec/spec_helper.rb:
+  allow_deprecations: true
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,18 +3,30 @@
 sudo: false
 language: ruby
 cache: bundler
-bundler_args: --without system_tests
-script: "bundle exec rake validate lint spec"
+script: "bundle exec rake release_checks"
+#Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
+before_install:
+  - gem update bundler
 matrix:
  fast_finish: true
  include:
-  - rvm: 2.1.6
-    env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 2.3.1
+    dist: trusty
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
+    script: bundle exec rake beaker
+    services: docker
+    sudo: required
+  - rvm: 2.3.1
+    dist: trusty
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
+    script: bundle exec rake beaker
+    services: docker
+    sudo: required
+  - rvm: 2.4.0
+    bundler_args: --without system_tests
+    env: PUPPET_GEM_VERSION="~> 5.0"
+  - rvm: 2.1.9
+    bundler_args: --without system_tests
+    env: PUPPET_GEM_VERSION="~> 4.0"
 notifications:
  email: false
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,72 @@
+## Supported Release 2.1.1
+### Summary
+This release is a maintenance release that includes a roll up of minor changes.
+
+#### Added
+- Basic Arch Linux, Cloud Linux and Ubuntu 17.04 compatibility.
+- Metadata bump for Puppet 5.
+- Search for matching line with java version.
+- ([MODULES-4069](https://tickets.puppet.com/browse/MODULES-4069)) Fail when required params are not available in params.
+- A test for java version when java not installed.
+- Allow latest archive version as dependency.
+
+#### Changed
+- CONTRIBUTING.md document includes updates.
+- Removal of Ubuntu 10.04 ad 12.04, Debian 6 in supported versions.
+
+## Supported Release 2.1.0
+### Summary
+This release adds fixes to restore the ability to install Oracle Java. It also fixes the paths for the latest RHEL 7 1.7.0 and 1.8.0 OpenJDKs.
+
+### Added
+- java::oracle parameter `url`
+- java::oracle parameter `url_hash`
+
+### Fixed
+- Let `java_default_home` fact work when /usr/bin/java does not exist
+- Add puppet 4 parameter types
+- Use `/usr/lib/jvm/java-1.x.0` symlinks for `java_home` defaults.
+
+## Supported Release 2.0.0
+### Summary
+
+This is a major release including some bug fixes, new parameters, and general module updates.
+
+**This release drops Puppet 3 support**
+
+#### Added
+- Debian Stretch, Yakkety Yak, Amazon Linux, Oracle Linux, Scientific Linux CERN compatibility
+- `version_major` and `version_minor` parameters for specifying Java SE version to install
+- `$JAVA_HOME` now set by the module on compatible systems. The `java_home` parameter is also provided for manual setting. [MODULES-2971](https://tickets.puppetlabs.com/browse/MODULES-2971)
+- `proxy_server` and `proxy_type` for choosing a proxy server to get Java from
+
+#### Changed
+- Moved lower Puppet version requirement to 4.7.0
+
+#### Fixed
+- Module no longer downloads the Java archive on Puppet runs if Java is already installed.
+- java_default_home fact is not always correct on oracle packages [MODULES-4050](https://tickets.puppetlabs.com/browse/MODULES-4050)
+- Order of operations for archives [MODULES-4751](https://tickets.puppetlabs.com/browse/https://tickets.puppetlabs.com/browse/MODULES-4751)
+- Increase Xmx setting for `java_version` fact [MODULES-4736](https://tickets.puppetlabs.com/browse/MODULES-4736)
+
+## Supported Release 1.6.0
+### Summary
+
+Addition of a new supported OS, along with several other features and bugfixes.
+
+#### Features
+- Ubuntu 16.04 support.
+- Addition example for installing Java 8.
+- Update to newest modulesync_configs.
+- Addition of RedHat for Oracle Java.
+
+#### Bugfixes
+- Custom archive type now given extract_path.
+- Fix for rspec deprectation warnings.
+- Typo fixes for readme.
+- Fixed tests to run under strict variables.
+- Updated Java package for SLES 11.4.
+
 ## Supported Release 1.5.0
 ### Summary

@@ -19,7 +88,7 @@ A release which has several support additions for different OSes. Also a couple
 - Small README updates and syntax error fixes.

 ## Supported Release 1.4.3
-###Summary
+### Summary

 Small release for support of newer PE versions. This increments the version of PE in the metadata.json file.

@@ -37,18 +106,18 @@ This release updates the metadata for the upcoming release of PE and update para
 #### Bugfixes:
 - Add missing OEL to params

-##2015-07-07 - Supported Release 1.4.0
-###Summary
+## 2015-07-07 - Supported Release 1.4.0
+### Summary
 This release adds several new features, bugfixes, documentation updates, and test improvements.

-####Features:
+#### Features:
 - Puppet 4 support and testing
 - Adds support for several Operating Systems
  - Ubuntu 15.04
  - OpenBSD 5.6, 5.7
  - Fedora 20, 21, 22

-####Bugfixes:
+#### Bugfixes:
 - Fixes java_version fact to work on large systems. (MODULES-1749)
 - Improves maintainability of java_version fact.
 - Fixes java package names on Fedora 21+.
@@ -56,11 +125,11 @@ This release adds several new features, bugfixes, documentation updates, and tes
 - Fixes create-java-alternatives commands on RedHat distros.
 - Fixes bug with Debian systems missing java-common package.

-##2015-01-20 - Supported Release 1.3.0
-###Summary
+## 2015-01-20 - Supported Release 1.3.0
+### Summary
 This release adds 3 new facts for determining Java version, adds RHEL alternatives support, adds utopic support, and fixes the flag for `update-java-alternatives` when installed from a headless pacakge.

-####Features
+#### Features
 - Added RHEL support for alternatives
 - New facts
  - java_major_version
@@ -68,65 +137,65 @@ This release adds 3 new facts for determining Java version, adds RHEL alternativ
  - java_version
 - Add support for utopic

-####Bugfixes
+#### Bugfixes
 - Use `--jre-headless` in the `update-java-alternatives` command when installed from a `headless` package

-##2014-11-11 - Supported Version 1.2.0
+## 2014-11-11 - Supported Version 1.2.0

-###Summary: 
+### Summary:
 This release adds SLES 12 support and is tested for Future Parser Support

-####Bugfixes:
+#### Bugfixes:
 - Several readme updates
 - Testcase flexability increased

-####Features:
+#### Features:
 - Add SLES 12 support
 - Future Parser tested
 - Validated against PE 3.7  

-##2014-08-25 - Supported Version 1.1.2
+## 2014-08-25 - Supported Version 1.1.2

-###Summary: 
+### Summary:
 This release begins the support coverage of the puppetlabs-java module.

-###Bugfixes:
+### Bugfixes:
 - Update java alternative values from deprecated names
 - Readme updated
 - Testing updated

-##2014-05-02 - Version 1.1.1
+## 2014-05-02 - Version 1.1.1

-###Summary:
+### Summary:

 Add support for new versions of Debian and Ubuntu!

-####Features:
+#### Features:
 - Add support for Ubuntu Trusty (14.04)
 - Add support for Debian Jessie (8.x)

-##2014-01-06 - Version 1.1.0
+## 2014-01-06 - Version 1.1.0

-####Summary:
+### Summary:

 Primarily a release for Ubuntu users!

-####Features:
+#### Features:
 - Add support for Ubuntu Saucy (13.10)
 - Add `java_home` parameter for centralized setting of JAVA_HOME.
 - Add Scientific Linux

-###Bugfixes:
+#### Bugfixes:
 - Plus signs are valid in debian/ubuntu package names.

-##2013-08-01 - Version 1.0.1
+## 2013-08-01 - Version 1.0.1

 Matthaus Owens <matthaus@puppetlabs.com>
 * Update java packages for Fedora systems

-##2013-07-29 - Version 1.0.0
+## 2013-07-29 - Version 1.0.0

-####Detailed Changes
+#### Detailed Changes

 Krzysztof Suszyński <krzysztof.suszynski@coi.gov.pl>
 * Adding support for Oracle Enterprise Linux
@@ -151,39 +220,39 @@ Nathan R Valentine <nrvale0@gmail.com>
 Sharif Nassar <sharif@mediatemple.net>
 * Add support for Debian alternatives, and more than one JDK/JRE per platform.

-##2013-04-04 - Version 0.3.0
+## 2013-04-04 - Version 0.3.0
 Reid Vandewiele <reid@puppetlabs.com> -
 * Refactor, introduce params pattern

-##2012-11-15 - Version 0.2.0
+## 2012-11-15 - Version 0.2.0
 Scott Schneider <sschneider@puppetlabs.com>
 * Add Solaris support

-##2011-06-16 - Version 0.1.5
-Jeff McCune <jeff@puppetlabs.com> 
+## 2011-06-16 - Version 0.1.5
+Jeff McCune <jeff@puppetlabs.com>
 * Add Debian based distro (Lucid) support

-##2011-06-02 - Version 0.1.4
-Jeff McCune <jeff@puppetlabs.com> 
+## 2011-06-02 - Version 0.1.4
+Jeff McCune <jeff@puppetlabs.com>
 * Fix class composition ordering problems

-##2011-05-28 - Version 0.1.3
+## 2011-05-28 - Version 0.1.3
 Jeff McCune <jeff@puppetlabs.com>
 * Remove stages

-##2011-05-26 - Version 0.1.2
+## 2011-05-26 - Version 0.1.2
 Jeff McCune <jeff@puppetlabs.com>
 * Changes JRE/JDK selection class parameter to $distribution

-##2011-05-25 - Version 0.1.1
+## 2011-05-25 - Version 0.1.1
 Jeff McCune <jeff@puppetlabs.com>
 * Re-did versioning to follow semantic versioning
 * Add validation of class parameters

-##2011-05-24 - Version 0.1.0
-Jeff McCune <jeff@puppetlabs.com> 
+## 2011-05-24 - Version 0.1.0
+Jeff McCune <jeff@puppetlabs.com>
 * Default to JDK version 6u25

-##2011-05-24 - Version 0.0.1
-Jeff McCune <jeff@puppetlabs.com> 
+## 2011-05-24 - Version 0.0.1
+Jeff McCune <jeff@puppetlabs.com>
 * Initial release
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,63 +1,75 @@
-Checklist (and a short version for the impatient)
-=================================================
+# Contributing to Puppet modules

-  * Commits:
+So you want to contribute to a Puppet module: Great! Below are some instructions to get you started doing
+that very thing while setting expectations around code quality as well as a few tips for making the
+process as easy as possible. 

-    - Make commits of logical units.
+### Table of Contents

-    - Check for unnecessary whitespace with "git diff --check" before
-      committing.
+1. [Getting Started](#getting-started)
+1. [Commit Checklist](#commit-checklist)
+1. [Submission](#submission)
+1. [More about commits](#more-about-commits)
+1. [Testing](#testing)
+    - [Running Tests](#running-tests)
+    - [Writing Tests](#writing-tests)
+1. [Get Help](#get-help)

-    - Commit using Unix line endings (check the settings around "crlf" in
-      git-config(1)).
+## Getting Started

-    - Do not check in commented out code or unneeded files.
+- Fork the module repository on GitHub and clone to your workspace

-    - The first line of the commit message should be a short
-      description (50 characters is the soft limit, excluding ticket
-      number(s)), and should skip the full stop.
+- Make your changes!

-    - Associate the issue in the message. The first line should include
-      the issue number in the form "(#XXXX) Rest of message".
+## Commit Checklist

-    - The body should provide a meaningful commit message, which:
+### The Basics

-      - uses the imperative, present tense: "change", not "changed" or
-        "changes".
+- [x] my commit is a single logical unit of work

-      - includes motivation for the change, and contrasts its
-        implementation with the previous behavior.
+- [x] I have checked for unnecessary whitespace with "git diff --check" 

-    - Make sure that you have tests for the bug you are fixing, or
-      feature you are adding.
+- [x] my commit does not include commented out code or unneeded files

-    - Make sure the test suites passes after your commit:
-      `bundle exec rspec spec/acceptance` More information on [testing](#Testing) below
+### The Content

-    - When introducing a new feature, make sure it is properly
-      documented in the README.md
+- [x] my commit includes tests for the bug I fixed or feature I added

-  * Submission:
+- [x] my commit includes appropriate documentation changes if it is introducing a new feature or changing existing functionality
+    
+- [x] my code passes existing test suites

-    * Pre-requisites:
+### The Commit Message

-      - Make sure you have a [GitHub account](https://github.com/join)
+- [x] the first line of my commit message includes:

-      - [Create a ticket](https://tickets.puppetlabs.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppetlabs.com/browse/) you are patching for.
+  - [x] an issue number (if applicable), e.g. "(MODULES-xxxx) This is the first line" 
+  
+  - [x] a short description (50 characters is the soft limit, excluding ticket number(s))

-    * Preferred method:
+- [x] the body of my commit message:

-      - Fork the repository on GitHub.
+  - [x] is meaningful

-      - Push your changes to a topic branch in your fork of the
-        repository. (the format ticket/1234-short_description_of_change is
-        usually preferred for this project).
+  - [x] uses the imperative, present tense: "change", not "changed" or "changes"

-      - Submit a pull request to the repository in the puppetlabs
-        organization.
+  - [x] includes motivation for the change, and contrasts its implementation with the previous behavior

-The long version
-================
+## Submission
+
+### Pre-requisites
+
+- Make sure you have a [GitHub account](https://github.com/join)
+
+- [Create a ticket](https://tickets.puppet.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppet.com/browse/) you are patching for.
+
+### Push and PR
+
+- Push your changes to your fork
+
+- [Open a Pull Request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) against the repository in the puppetlabs organization
+
+## More about commits 

  1.  Make separate commits for logically separate changes.

@@ -104,37 +116,32 @@ The long version
      GitHub has some pretty good
      [general documentation](http://help.github.com/) on using
      their site.  They also have documentation on
-      [creating pull requests](http://help.github.com/send-pull-requests/).
+      [creating pull requests](https://help.github.com/articles/creating-a-pull-request-from-a-fork/).

      In general, after pushing your topic branch up to your
      repository on GitHub, you can switch to the branch in the
      GitHub UI and click "Pull Request" towards the top of the page
      in order to open a pull request.

+  3.  Update the related JIRA issue.

-  3.  Update the related GitHub issue.
-
-      If there is a GitHub issue associated with the change you
+      If there is a JIRA issue associated with the change you
      submitted, then you should update the ticket to include the
      location of your branch, along with any other commentary you
      may wish to make.

-Testing
-=======
+# Testing

-Getting Started
---------------
+## Getting Started

-Our puppet modules provide [`Gemfile`](./Gemfile)s which can tell a ruby
-package manager such as [bundler](http://bundler.io/) what Ruby packages,
+Our Puppet modules provide [`Gemfile`](./Gemfile)s, which can tell a Ruby package manager such as [bundler](http://bundler.io/) what Ruby packages,
 or Gems, are required to build, develop, and test this software.

-Please make sure you have [bundler installed](http://bundler.io/#getting-started)
-on your system, then use it to install all dependencies needed for this project,
-by running
+Please make sure you have [bundler installed](http://bundler.io/#getting-started) on your system, and then use it to 
+install all dependencies needed for this project in the project root by running

 ```shell
-% bundle install
+% bundle install --path .bundle/gems
 Fetching gem metadata from https://rubygems.org/........
 Fetching gem metadata from https://rubygems.org/..
 Using rake (10.1.0)
@@ -148,7 +155,7 @@ Your bundle is complete!
 Use `bundle show [gemname]` to see where a bundled gem is installed.
 ```

-NOTE some systems may require you to run this command with sudo.
+NOTE: some systems may require you to run this command with sudo.

 If you already have those gems installed, make sure they are up-to-date:

@@ -156,26 +163,27 @@ If you already have those gems installed, make sure they are up-to-date:
 % bundle update
 ```

-With all dependencies in place and up-to-date we can now run the tests:
+## Running Tests
+
+With all dependencies in place and up-to-date, run the tests:
+
+### Unit Tests

 ```shell
 % bundle exec rake spec
 ```

-This will execute all the [rspec tests](http://rspec-puppet.com/) tests
-under [spec/defines](./spec/defines), [spec/classes](./spec/classes),
-and so on. rspec tests may have the same kind of dependencies as the
-module they are testing. While the module defines in its [Modulefile](./Modulefile),
+This executes all the [rspec tests](http://rspec-puppet.com/) in the directories defined [here](https://github.com/puppetlabs/puppetlabs_spec_helper/blob/699d9fbca1d2489bff1736bb254bb7b7edb32c74/lib/puppetlabs_spec_helper/rake_tasks.rb#L17) and so on. 
+rspec tests may have the same kind of dependencies as the module they are testing. Although the module defines these dependencies in its [metadata.json](./metadata.json),
 rspec tests define them in [.fixtures.yml](./fixtures.yml).

-Some puppet modules also come with [beaker](https://github.com/puppetlabs/beaker)
-tests. These tests spin up a virtual machine under
-[VirtualBox](https://www.virtualbox.org/)) with, controlling it with
-[Vagrant](http://www.vagrantup.com/) to actually simulate scripted test
-scenarios. In order to run these, you will need both of those tools
-installed on your system.
+### Acceptance Tests

-You can run them by issuing the following command
+Some Puppet modules also come with acceptance tests, which use [beaker][]. These tests spin up a virtual machine under
+[VirtualBox](https://www.virtualbox.org/), controlled with [Vagrant](http://www.vagrantup.com/), to simulate scripted test
+scenarios. In order to run these, you need both Virtualbox and Vagrant installed on your system.
+
+Run the tests by issuing the following command

 ```shell
 % bundle exec rake spec_clean
@@ -183,38 +191,81 @@ You can run them by issuing the following command
 ```

 This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),
-install puppet, copy this module and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb)
+install Puppet, copy this module, and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb)
 and then run all the tests under [spec/acceptance](./spec/acceptance).

-Writing Tests
-------------
+## Writing Tests

-XXX getting started writing tests.
+### Unit Tests

-If you have commit access to the repository
-===========================================
+When writing unit tests for Puppet, [rspec-puppet][] is your best friend. It provides tons of helper methods for testing your manifests against a 
+catalog (e.g. contain_file, contain_package, with_params, etc). It would be ridiculous to try and top rspec-puppet's [documentation][rspec-puppet_docs] 
+but here's a tiny sample:

-Even if you have commit access to the repository, you will still need to
-go through the process above, and have someone else review and merge
-in your changes.  The rule is that all changes must be reviewed by a
-developer on the project (that did not write the code) to ensure that
-all changes go through a code review process.
+Sample manifest:

-Having someone other than the author of the topic branch recorded as
-performing the merge is the record that they performed the code
-review.
+```puppet
+file { "a test file":
+  ensure => present,
+  path   => "/etc/sample",
+}
+```

+Sample test:

-Additional Resources
-====================
+```ruby
+it 'does a thing' do
+  expect(subject).to contain_file("a test file").with({:path => "/etc/sample"})
+end
+```

-* [Getting additional help](http://puppetlabs.com/community/get-help)
+### Acceptance Tests

-* [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests)
+Writing acceptance tests for Puppet involves [beaker][] and its cousin [beaker-rspec][]. A common pattern for acceptance tests is to create a test manifest, apply it
+twice to check for idempotency or errors, then run expectations.

-* [Patchwork](https://patchwork.puppetlabs.com)
+```ruby
+it 'does an end-to-end thing' do
+  pp = <<-EOF
+    file { 'a test file': 
+      ensure  => present,
+      path    => "/etc/sample",
+      content => "test string",
+    }
+    
+  apply_manifest(pp, :catch_failures => true)
+  apply_manifest(pp, :catch_changes => true)
+  
+end

+describe file("/etc/sample") do
+  it { is_expected.to contain "test string" }
+end
+
+```
+
+# If you have commit access to the repository
+
+Even if you have commit access to the repository, you still need to go through the process above, and have someone else review and merge
+in your changes.  The rule is that **all changes must be reviewed by a project developer that did not write the code to ensure that
+all changes go through a code review process.**
+
+The record of someone performing the merge is the record that they performed the code review. Again, this should be someone other than the author of the topic branch.
+
+# Get Help
+
+### On the web
+* [Puppet help messageboard](http://puppet.com/community/get-help)
+* [Writing tests](https://docs.puppet.com/guides/module_guides/bgtm.html#step-three-module-testing)
 * [General GitHub documentation](http://help.github.com/)
-
 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)

+### On chat
+* Slack (slack.puppet.com) #forge-modules, #puppet-dev, #windows, #voxpupuli
+* IRC (freenode) #puppet-dev, #voxpupuli
+
+
+[rspec-puppet]: http://rspec-puppet.com/
+[rspec-puppet_docs]: http://rspec-puppet.com/documentation/
+[beaker]: https://github.com/puppetlabs/beaker
+[beaker-rspec]: https://github.com/puppetlabs/beaker-rspec
--- a/83
+++ b/83
@@ -2,38 +2,75 @@

 source ENV['GEM_SOURCE'] || "https://rubygems.org"

-def location_for(place, version = nil)
-  if place =~ /^(git[:@][^#]*)#(.*)/
-    [version, { :git => $1, :branch => $2, :require => false}].compact
-  elsif place =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false}]
+# Determines what type of gem is requested based on place_or_version.
+def gem_type(place_or_version)
+  if place_or_version =~ /^git:/
+    :git
+  elsif place_or_version =~ /^file:/
+    :file
  else
-    [place, version, { :require => false}].compact
+    :gem
  end
 end

-group :development, :unit_tests do
-  gem 'json',                      :require => false
-  gem 'metadata-json-lint',        :require => false
-  gem 'puppet_facts',              :require => false
-  gem 'puppet-blacksmith',         :require => false
-  gem 'puppetlabs_spec_helper',    :require => false
-  gem 'rspec-puppet', '>= 2.3.2',  :require => false
-  gem 'simplecov',                 :require => false
-end
-group :system_tests do
-  gem 'beaker-rspec',                  *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
-  gem 'beaker',                        *location_for(ENV['BEAKER_VERSION'])
-  gem 'serverspec',                    :require => false
-  gem 'beaker-puppet_install_helper',  :require => false
-  gem 'master_manipulator',            :require => false
-  gem 'beaker-hostgenerator',          *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
+# Find a location or specific version for a gem. place_or_version can be a
+# version, which is most often used. It can also be git, which is specified as
+# `git://somewhere.git#branch`. You can also use a file source location, which
+# is specified as `file://some/location/on/disk`.
+def location_for(place_or_version, fake_version = nil)
+  if place_or_version =~ /^(git[:@][^#]*)#(.*)/
+    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
+  elsif place_or_version =~ /^file:\/\/(.*)/
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
+  else
+    [place_or_version, { :require => false }]
+  end
+end
+
+# Used for gem conditionals
+supports_windows = false
+ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
+minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
+
+group :development do
+  gem "puppet-module-posix-default-r#{minor_version}",    :require => false, :platforms => "ruby"
+  gem "puppet-module-win-default-r#{minor_version}",      :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
+  gem "puppet-module-posix-dev-r#{minor_version}",        :require => false, :platforms => "ruby"
+  gem "puppet-module-win-dev-r#{minor_version}", '0.0.7', :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
+  gem "json_pure", '<= 2.0.1',                            :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
+  gem "fast_gettext", '1.1.0',                            :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
+  gem "fast_gettext",                                     :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
+end
+
+group :system_tests do
+  gem "puppet-module-posix-system-r#{minor_version}",                            :require => false, :platforms => "ruby"
+  gem "puppet-module-win-system-r#{minor_version}",                              :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3')                  
+  gem "beaker-pe",                                                               :require => false
+  gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])                
+  gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
+  gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')        
+  gem "puppet-blacksmith", '~> 3.4',                                             :require => false
 end

-gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'])
 gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])

+# Only explicitly specify Facter/Hiera if a version has been specified.
+# Otherwise it can lead to strange bundler behavior. If you are seeing weird
+# gem resolution behavior, try setting `DEBUG_RESOLVER` environment variable
+# to `1` and then run bundle install.
+gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) if ENV['FACTER_GEM_VERSION']
+gem 'hiera', *location_for(ENV['HIERA_GEM_VERSION']) if ENV['HIERA_GEM_VERSION']

+
+# Evaluate Gemfile.local if it exists
 if File.exists? "#{__FILE__}.local"
  eval(File.read("#{__FILE__}.local"), binding)
 end
+
+# Evaluate ~/.gemfile if it exists
+if File.exists?(File.join(Dir.home, '.gemfile'))
+  eval(File.read(File.join(Dir.home, '.gemfile')), binding)
+end
+
+# vim:ft=ruby
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -0,0 +1,6 @@
+## Maintenance
+
+Maintainers:
+  - Puppet Forge Modules Team `forge-modules |at| puppet |dot| com`
+
+Tickets: https://tickets.puppet.com/browse/MODULES. Make sure to set component to `java`.
--- a/9
+++ b/9
@@ -1,9 +1,6 @@
-java puppet module
-
-Copyright (C) 2011-2016 Puppet Labs, Inc.
-
-Puppet Labs can be contacted at: info@puppetlabs.com
+Puppet Module - puppetlabs-java

+Copyright 2017 Puppet, Inc.

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,4 +12,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.
--- a/README.markdown
+++ b/README.markdown
@@ -1,6 +1,6 @@
-#java
+# java

-####Table of Contents
+#### Table of Contents

 1. [Overview](#overview)
 2. [Module Description - What the module does and why it is useful](#module-description)
@@ -11,32 +11,41 @@
 6. [Limitations - OS compatibility, etc.](#limitations)
 7. [Development - Guide for contributing to the module](#development)

-##Overview
+## Overview

-Installs the correct Java package on various platforms. 
+Installs the correct Java package on various platforms.

-##Module Description
+## Module Description

 The java module can automatically install Java jdk or jre on a wide variety of systems. Java is a base component for many software platforms, but Java system packages don't always follow packaging conventions. The java module simplifies the Java installation process.

-##Setup
+## Setup
+
+### Beginning with the java module

-###Beginning with the java module
 To install the correct Java package on your system, include the `java` class: `include java`.

-##Usage
+## Usage

-The java module installs the correct jdk or jre package on a wide variety of systems. By default, the module will install the jdk package, but you can set different installation parameters as needed. For example, to install jre instead of jdk, you would set the distribution parameter:
+The java module installs the correct jdk or jre package on a wide variety of systems. By default, the module installs the jdk package, but you can set different installation parameters as needed. For example, to install jre instead of jdk, you would set the distribution parameter:

-~~~
+```puppet
 class { 'java':
  distribution => 'jre',
 }
-~~~
+```
+
+To install the latest patch version of Java 8 on CentOS
+
+```puppet
+class { 'java' :
+  package => 'java-1.8.0-openjdk-devel',
+}
+```

 The defined type `java::oracle` installs one or more versions of Oracle Java SE. `java::oracle` depends on [puppet/archive](https://github.com/voxpupuli/puppet-archive).  By using `java::oracle` you agree to Oracle's licensing terms for Java SE.

-~~~
+```puppet
 java::oracle { 'jdk6' :
  ensure  => 'present',
  version => '6',
@@ -48,67 +57,111 @@ java::oracle { 'jdk8' :
  version => '8',
  java_se => 'jdk',
 }
-~~~
+```

-##Reference
+To install a specific release of a Java version, e.g. 8u101-b13, provide both parameters `version_major` and `version_minor` as follows:

-###Classes
+```puppet
+java::oracle { 'jdk8' :
+  ensure  => 'present',
+  version_major => '8u101',
+  version_minor => 'b13',
+  java_se => 'jdk',
+}
+```

-####Public classes
+## Reference
+
+### Classes
+
+#### Public classes

 * `java`: Installs and manages the Java package.

-####Private classes
+#### Private classes

 * `java::config`: Configures the Java alternatives.

 * `java::params`: Builds a hash of jdk/jre packages for all compatible operating systems.


-####Parameters
+#### Parameters
+
 The following parameters are available in `java`:

 ##### `distribution`
-Specifies the Java distribution to install.  
+
+Specifies the Java distribution to install.
 Valid options:  'jdk', 'jre', or, where the platform supports alternative packages, 'sun-jdk', 'sun-jre', 'oracle-jdk', 'oracle-jre'. Default: 'jdk'.

-#####`java_alternative`
-Specifies the name of the Java alternative to use. If you set this parameter, *you must also set the `java_alternative_path`.*  
+##### `java_alternative`
+
+Specifies the name of the Java alternative to use. If you set this parameter, *you must also set the `java_alternative_path`.*
 Valid options: Run command `update-java-alternatives -l` for a list of available choices. Default: OS and distribution dependent defaults on *deb systems, undef on others.

-#####`java_alternative_path`  
-*Required when `java_alternative` is specified.* Defines the path to the `java` command.  
+##### `java_alternative_path`
+
+*Required when `java_alternative` is specified.* Defines the path to the `java` command.
 Valid option: String. Default: OS and distribution dependent defaults on *deb systems, undef on others.

-#####`package`
-Specifies the name of the Java package. This is configurable in case you want to install a non-standard Java package. If not set, the module will install the appropriate package for the `distribution` parameter and target platform. If you set `package`, the `distribution` parameter will do nothing.  
-Valid option: String. Default: undef. 
+##### `package`

-#####`version`
-Sets the version of Java to install, if you want to ensure a particular version.  
+Specifies the name of the Java package. This is configurable in case you want to install a non-standard Java package. If not set, the module installs the appropriate package for the `distribution` parameter and target platform. If you set `package`, the `distribution` parameter does nothing.
+Valid option: String. Default: undef.
+
+##### `version`
+
+Sets the version of Java to install, if you want to ensure a particular version.
 Valid options: 'present', 'installed', 'latest', or a string matching `/^[.+_0-9a-zA-Z:-]+$/`. Default: 'present'.

-####Public defined types
+#### Public defined types

 * `java::oracle`: Installs specified version of Oracle Java SE.  You may install multiple versions of Oracle Jave SE on the same node using this defined type.

-####Parameters
+#### Parameters

 The following parameters are available in `java::oracle`:

-######`version`
+##### `version`
 Version of Java Standard Edition (SE) to install. 6, 7 or 8.

-#####`java_se`
+##### `version_major`
+
+Major version of the Java Standard Edition (SE) to install. Must be used together with `version_minor`. For example, '8u101'.
+
+##### `version_minor`
+
+Minor version (or build version) of the Java Standard Edition (SE) to install. Must be used together with `version_major`. For example, 'b13'.
+
+##### `java_se`
+
 Type of Java SE to install, jdk or jre.

-#####`ensure`
+##### `ensure`
+
 Install or remove the package.

-#####`oracle_url`
+##### `oracle_url`
+
 Official Oracle URL to download the binaries from.

-###Facts
+##### `proxy_server`
+
+Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
+
+##### `proxy_type`
+
+Proxy server type (none|http|https|ftp). (passed to archive)
+
+##### `url`
+
+Pass an entire URL to download the installer from rather than building the complete URL from other parameters. This will allow the module to be used even if the URLs are changed by Oracle. If this parameter is used, matching `version_major` and `version_minor` parameters must also be passed to the class.
+
+##### `url_hash`
+
+Directory hash used by the download.oracle.com site. This value is a 32 character string which is part of the file URL returned by the JDK download site.
+
+### Facts

 The java module includes a few facts to describe the version of Java installed on the system:

@@ -120,17 +173,17 @@ The java module includes a few facts to describe the version of Java installed o

 **Note:** The facts return `nil` if Java is not installed on the system.

-##Limitations
+## Limitations

-This module cannot guarantee installation of Java versions that are not available on  platform repositories. 
+This module cannot guarantee installation of Java versions that are not available on  platform repositories.

 This module only manages a singular installation of Java, meaning it is not possible to manage e.g. OpenJDK 7, Oracle Java 7 and Oracle Java 8 in parallel on the same system.

-Oracle Java packages are not included in Debian 7 and Ubuntu 12.04/14.04 repositories. To install Java on those systems, you'll need to package Oracle JDK/JRE, and then the module will be able to install the package. For more information on how to package Oracle JDK/JRE, see the [Debian wiki](http://wiki.debian.org/JavaPackage).
+Oracle Java packages are not included in Debian 7 and Ubuntu 12.04/14.04 repositories. To install Java on those systems, you'll need to package Oracle JDK/JRE, and then the module can install the package. For more information on how to package Oracle JDK/JRE, see the [Debian wiki](http://wiki.debian.org/JavaPackage).

 This module is officially [supported](https://forge.puppetlabs.com/supported) for the following Java versions and platforms:

-OpenJDK is supported on:  
+OpenJDK is supported on:

 * Red Hat Enterprise Linux (RHEL) 5, 6, 7
 * CentOS 5, 6, 7
@@ -139,36 +192,44 @@ OpenJDK is supported on:
 * Debian 6, 7
 * Ubuntu 10.04, 12.04, 14.04
 * Solaris 11
-* SLES 11 SP1, 12 
+* SLES 11 SP1, SP2, SP3, SP4; SLES 12, SP1, SP2
 * OpenBSD 5.6, 5.7

-Sun Java is supported on:  
+Sun Java is supported on:

 * Debian 6

 Oracle Java is supported on:
+
 * CentOS 6

-### A note to OpenBSD
+### Known issues
+
+Where Oracle change the format of the URLs to different installer packages, the curl to fetch the package may fail with a HTTP/404 error. In this case, passing a full known good URL using the `url` parameter will allow the module to still be able to install specific versions of the JRE/JDK. Note the `version_major` and `version_minor` parameters must be passed and must match the version downloaded using the known URL in the `url` parameter. 
+
+#### OpenBSD
+
 OpenBSD packages install Java JRE/JDK in a unique directory structure, not linking
 the binaries to a standard directory. Because of that, the path to this location
-is hardcoded in the java_version fact. Whenever a Java upgrade to a newer
-version/path will be done on OpenBSD, it has to be adapted there.
+is hardcoded in the `java_version` fact. Whenever you upgrade Java to a newer
+version, you have to update the path in this fact.

-### A note to FreeBSD
-By default on FreeBSD Puppet < 4.0, you will see an error as `pkgng` is not the default provider. To fix this, you can install the [zleslie/pkgng module](https://forge.puppetlabs.com/zleslie/pkgng) and set it as the default package provider like so:
+#### FreeBSD
+
+By default on FreeBSD, Puppet versions prior to 4.0 throw an error saying `pkgng` is not the default provider. To fix this, install the [zleslie/pkgng module](https://forge.puppetlabs.com/zleslie/pkgng) and set it as the default package provider:

 ```puppet
 Package {
  provider => 'pkgng',
 }
+```

-On Puppet > 4.0 (ie. using the sysutils/puppet4 port), `pkgng` is included within Puppet and it's the default package provider.
+On Puppet 4.0 and later, `pkgng` is included within Puppet and is the default package provider.

-##Development
+## Development

-Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad hardware, software, and deployment configurations that Puppet is intended to serve. We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things. For more information, see our [module contribution guide.](https://docs.puppetlabs.com/forge/contributing.html)
+Puppet modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. To contribute to Puppet projects, see our [module contribution guide.](https://docs.puppetlabs.com/forge/contributing.html)

-##Contributors
+## Contributors

-The list of contributors can be found at: [https://github.com/puppetlabs/puppetlabs-java/graphs/contributors](https://github.com/puppetlabs/puppetlabs-java/graphs/contributors).
+The list of contributors can be found at [https://github.com/puppetlabs/puppetlabs-java/graphs/contributors](https://github.com/puppetlabs/puppetlabs-java/graphs/contributors).
--- a/9
+++ b/9
@@ -1,14 +1,9 @@
-require 'puppet_blacksmith/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
 require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppet-lint/tasks/puppet-lint'
+require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?

 PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-PuppetLint.configuration.send('disable_documentation')
-PuppetLint.configuration.send('disable_single_quote_string_with_variables')
-PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]

 desc 'Generate pooler nodesets'
 task :gen_nodeset do
--- a/examples/alternative.pp
+++ b/examples/alternative.pp
--- a/examples/init.pp
+++ b/examples/init.pp
--- a/examples/oracle.pp
+++ b/examples/oracle.pp
--- a/lib/facter/java_default_home.rb
+++ b/lib/facter/java_default_home.rb
@@ -15,7 +15,13 @@ Facter.add(:java_default_home) do
  setcode do
    if Facter::Util::Resolution.which('readlink')
      java_bin = Facter::Util::Resolution.exec('readlink -e /usr/bin/java').strip
-      java_default_home = File.dirname(File.dirname(File.dirname(java_bin)))
+      if java_bin.empty?
+        nil
+      elsif java_bin =~ %r(/jre/)
+        java_default_home = File.dirname(File.dirname(File.dirname(java_bin)))
+      else
+        java_default_home = File.dirname(File.dirname(java_bin))
+      end
    end
  end
 end
--- a/lib/facter/java_version.rb
+++ b/lib/facter/java_version.rb
@@ -22,9 +22,11 @@ Facter.add(:java_version) do
  # positive matches, so this needs to be done manually in setcode.
  setcode do
    unless [ 'openbsd', 'darwin' ].include? Facter.value(:operatingsystem).downcase
+      version = nil
      if Facter::Util::Resolution.which('java')
-        Facter::Util::Resolution.exec('java -Xmx8m -version 2>&1').lines.first.split(/"/)[1].strip
+        Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = $~[1] if /^.+ version \"(.+)\"$/ =~ line }
      end
+      version
    end
  end
 end
@@ -34,9 +36,11 @@ Facter.add(:java_version) do
  has_weight 100
  setcode do
    Facter::Util::Resolution.with_env("PATH" => '/usr/local/jdk-1.7.0/jre/bin:/usr/local/jre-1.7.0/bin') do
+      version = nil
      if Facter::Util::Resolution.which('java')
-        Facter::Util::Resolution.exec('java -Xmx8m -version 2>&1').lines.first.split(/"/)[1].strip
+        Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = $~[1] if /^.+ version \"(.+)\"$/ =~ line }
      end
+      version
    end
  end
 end
@@ -46,7 +50,9 @@ Facter.add(:java_version) do
  has_weight 100
  setcode do
    unless /Unable to find any JVMs matching version/ =~ Facter::Util::Resolution.exec('/usr/libexec/java_home --failfast 2>&1')
-      Facter::Util::Resolution.exec('java -Xmx8m -version 2>&1').lines.first.split(/"/)[1].strip
+      version = nil
+      Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = $~[1] if /^.+ version \"(.+)\"$/ =~ line }
+      version
    end
  end
 end
--- a/locales/config.yaml
+++ b/locales/config.yaml
@@ -0,0 +1,26 @@
+---
+# This is the project-specific configuration file for setting up
+# fast_gettext for your project.
+gettext:
+  # This is used for the name of the .pot and .po files; they will be
+  # called <project_name>.pot?
+  project_name: puppetlabs-java
+  # This is used in comments in the .pot and .po files to indicate what
+  # project the files belong to and should bea little more desctiptive than
+  # <project_name>
+  package_name: puppetlabs-java
+  # The locale that the default messages in the .pot file are in
+  default_locale: en
+  # The email used for sending bug reports.
+  bugs_address: docs@puppet.com
+  # The holder of the copyright.
+  copyright_holder: Puppet, Inc.
+  # This determines which comments in code should be eligible for translation.
+  # Any comments that start with this string will be externalized. (Leave
+  # empty to include all.)
+  comments_tag: TRANSLATOR
+  # Patterns for +Dir.glob+ used to find all files that might contain
+  # translatable content, relative to the project root directory
+  source_files:
+      - './lib/**/*.rb'
+  
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -9,6 +9,13 @@ class java::config ( ) {
          unless  => "test /etc/alternatives/java -ef '${java::use_java_alternative_path}'",
        }
      }
+      if $java::use_java_home != undef {
+        file_line { 'java-home-environment':
+          path  => '/etc/environment',
+          line  => "JAVA_HOME=${$java::use_java_home}",
+          match => 'JAVA_HOME=',
+        }
+      }
    }
    'RedHat': {
      if $java::use_java_alternative != undef and $java::use_java_alternative_path != undef {
@@ -29,6 +36,40 @@ class java::config ( ) {
          unless  => "test /etc/alternatives/java -ef '${java::use_java_alternative_path}'",
        }
      }
+      if $java::use_java_home != undef {
+        file_line { 'java-home-environment':
+          path  => '/etc/environment',
+          line  => "JAVA_HOME=${$java::use_java_home}",
+          match => 'JAVA_HOME=',
+        }
+      }
+    }
+    'OpenBSD', 'FreeBSD', 'Suse': {
+      if $java::use_java_home != undef {
+        file_line { 'java-home-environment':
+          path  => '/etc/environment',
+          line  => "JAVA_HOME=${$java::use_java_home}",
+          match => 'JAVA_HOME=',
+        }
+      }
+    }
+    'Solaris': {
+      if $java::use_java_home != undef {
+        file_line { 'java-home-environment':
+          path  => '/etc/profile',
+          line  => "JAVA_HOME=${$java::use_java_home}",
+          match => 'JAVA_HOME=',
+        }
+      }
+    }
+    'Archlinux': {
+      if $java::use_java_home != undef {
+        file_line { 'java-home-environment':
+          path  => '/etc/profile',
+          line  => "JAVA_HOME=${$java::use_java_home}",
+          match => 'JAVA_HOME=',
+        }
+      }
    }
    default: {
      # Do nothing.
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -9,7 +9,6 @@
 #    or other platform-specific options where there are multiple
 #    implementations available (eg: OpenJDK vs Oracle JDK).
 #
-#
 #  [*version*]
 #    The version of java to install. By default, this module simply ensures
 #    that java is present, and does not require a specific version.
@@ -35,6 +34,10 @@
 #    alternative is actually enabled, this is required to ensure the
 #    correct JVM is enabled.
 #
+#  [*java_home*]
+#    The path to where the JRE is installed. This will be set as an
+#    environment variable.
+#
 # Actions:
 #
 # Requires:
@@ -42,28 +45,19 @@
 # Sample Usage:
 #
 class java(
-  $distribution          = 'jdk',
-  $version               = 'present',
-  $package               = undef,
-  $package_options       = undef,
-  $java_alternative      = undef,
-  $java_alternative_path = undef
+  String $distribution                                              = 'jdk',
+  Pattern[/present|installed|latest|^[.+_0-9a-zA-Z:~-]+$/] $version = 'present',
+  Optional[String] $package                                         = undef,
+  Optional[Array] $package_options                                  = undef,
+  Optional[String] $java_alternative                                = undef,
+  Optional[String] $java_alternative_path                           = undef,
+  Optional[String] $java_home                                       = undef
 ) {
-  include java::params
+  include ::java::params

-  validate_re($version, 'present|installed|latest|^[.+_0-9a-zA-Z:~-]+$')
-  
-  if $package_options != undef {
-    validate_array($package_options)
-  }
-
-  if has_key($java::params::java, $distribution) {
-    $default_package_name     = $java::params::java[$distribution]['package']
-    $default_alternative      = $java::params::java[$distribution]['alternative']
-    $default_alternative_path = $java::params::java[$distribution]['alternative_path']
-    $java_home                = $java::params::java[$distribution]['java_home']
-  } else {
-    fail("Java distribution ${distribution} is not supported.")
+  $default_package_name = has_key($java::params::java, $distribution) ? {
+    false   => undef,
+    default => $java::params::java[$distribution]['package'],
  }

  $use_java_package_name = $package ? {
@@ -71,12 +65,17 @@ class java(
    default => $package,
  }

+
+  ## Weird logic........
  ## If $java_alternative is set, use that.
  ## Elsif the DEFAULT package is being used, then use $default_alternative.
  ## Else undef
  $use_java_alternative = $java_alternative ? {
-    undef   => $use_java_package_name ? {
-      $default_package_name => $default_alternative,
+    undef                   => $use_java_package_name ? {
+      $default_package_name => has_key($java::params::java, $distribution) ? {
+        default => $java::params::java[$distribution]['alternative'],
+        false => undef,
+      },
      default               => undef,
    },
    default => $java_alternative,
@@ -84,13 +83,38 @@ class java(

  ## Same logic as $java_alternative above.
  $use_java_alternative_path = $java_alternative_path ? {
-    undef   => $use_java_package_name ? {
-      $default_package_name => $default_alternative_path,
+    undef                   => $use_java_package_name ? {
+      $default_package_name => has_key($java::params::java, $distribution) ? {
+      default               => $java::params::java[$distribution]['alternative_path'],
+      false                 => undef,
+      },
      default               => undef,
    },
    default => $java_alternative_path,
  }

+  $use_java_home = $java_home ? {
+    undef                   => $use_java_package_name ? {
+      $default_package_name => has_key($java::params::java, $distribution) ? {
+        default             => $java::params::java[$distribution]['java_home'],
+        false               => undef,
+      },
+      default               => undef,
+    },
+    default => $java_home,
+  }
+
+  ## This should only be required if we did not override all the information we need.
+  # One of the defaults is missing and its not intentional:
+  if ((
+      $use_java_package_name == undef or $use_java_alternative == undef or
+      $use_java_alternative_path == undef or $use_java_home == undef
+    ) and (
+      ! has_key($::java::params::java, $distribution)
+    )) {
+    fail("Java distribution ${distribution} is not supported. Missing default values.")
+  }
+
  $jre_flag = $use_java_package_name ? {
    /headless/ => '--jre-headless',
    default    => '--jre'
@@ -105,14 +129,12 @@ class java(
  }

  anchor { 'java::begin:': }
-  ->
-  package { 'java':
+  -> package { 'java':
    ensure          => $version,
    install_options => $package_options,
    name            => $use_java_package_name,
  }
-  ->
-  class { 'java::config': }
+  -> class { 'java::config': }
  -> anchor { 'java::end': }

 }
--- a/manifests/oracle.pp
+++ b/manifests/oracle.pp
@@ -10,11 +10,20 @@
 # the licensing terms.
 # wget --no-cookies --no-check-certificate --header \
 # "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
-# "http://download.oracle.com/otn-pub/java/jdk/8u25-b17/jre-8u25-linux-x64.tar.gz"
+# "http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.tar.gz"
 #
 # Parameters
 # [*version*]
-# Version of Java to install
+# Version of Java to install, e.g. '7' or '8'. Default values for major and minor
+# versions will be used.
+#
+# [*version_major*]
+# Major version which should be installed, e.g. '8u101'. Must be used together with
+# version_minor.
+#
+# [*version_minor*]
+# Minor version which should be installed, e.g. 'b12'. Must be used together with
+# version_major.
 #
 # [*java_se*]
 # Type of Java Standard Edition to install, jdk or jre.
@@ -25,6 +34,12 @@
 # [*oracle_url*]
 # Official Oracle URL to download binaries from.
 #
+# [*proxy_server*]
+# Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
+#
+# [*proxy_type*]
+# Proxy server type (none|http|https|ftp). (passed to archive)
+#
 # Variables
 # [*release_major*]
 # Major version release number for java_se. Used to construct download URL.
@@ -60,21 +75,32 @@
 # [*install_command*]
 # Installation command used to install Oracle java_se. Installation commands
 # differ by package_type. 'bin' types are installed via shell command. 'rpmbin'
-# types have the rpms extracted and then foricibly installed. 'rpm' types are
-# foricibly installed.
+# types have the rpms extracted and then forcibly installed. 'rpm' types are
+# forcibly installed.
 #
 # [*url*]
 # Full URL, including oracle_url, release_major, release_minor and package_name, to
-# download the Oracle java_se installer.
+# download the Oracle java_se installer. Originally present but not used, activated
+# to workaround MODULES-5058
+#
+# [*url_hash*]
+# Directory hash used by the download.oracle.com site.  This value is a 32 character string
+# which is part of the file URL returned by the JDK download site.
 #
 # ### Author
 # mike@marseglia.org
 #
 define java::oracle (
-  $ensure       = 'present',
-  $version      = '8',
-  $java_se      = 'jdk',
-  $oracle_url   = 'http://download.oracle.com/otn-pub/java/jdk/',
+  $ensure        = 'present',
+  $version       = '8',
+  $version_major = undef,
+  $version_minor = undef,
+  $java_se       = 'jdk',
+  $oracle_url    = 'http://download.oracle.com/otn-pub/java/jdk/',
+  $proxy_server  = undef,
+  $proxy_type    = undef,
+  $url           = undef,
+  $url_hash      = undef,
 ) {

  # archive module is used to download the java package
@@ -87,35 +113,53 @@ define java::oracle (
    fail('Java SE must be either jre or jdk.')
  }

-  # determine oracle Java major and minor version, and installation path
-  case $version {
-    '6' : {
-      $release_major = '6u45'
-      $release_minor = 'b06'
-      $install_path = "${java_se}1.6.0_45"
+  # determine Oracle Java major and minor version, and installation path
+  if $version_major and $version_minor {
+
+    $release_major = $version_major
+    $release_minor = $version_minor
+    $release_hash  = $url_hash
+
+    if $release_major =~ /(\d+)u(\d+)/ {
+      $install_path = "${java_se}1.${1}.0_${2}"
+    } else {
+      $install_path = "${java_se}${release_major}${release_minor}"
    }
-    '7' : {
-      $release_major = '7u80'
-      $release_minor = 'b15'
-      $install_path = "${java_se}1.7.0_80"
-    }
-    '8' : {
-      $release_major = '8u51'
-      $release_minor = 'b16'
-      $install_path = "${java_se}1.8.0_51"
-    }
-    default : {
-      $release_major = '8u51'
-      $release_minor = 'b16'
-      $install_path = "${java_se}1.8.0_51"
+  } else {
+    # use default versions if no specific major and minor version parameters are provided
+    case $version {
+      '6' : {
+        $release_major = '6u45'
+        $release_minor = 'b06'
+        $install_path = "${java_se}1.6.0_45"
+        $release_hash  = undef
+      }
+      '7' : {
+        $release_major = '7u80'
+        $release_minor = 'b15'
+        $install_path = "${java_se}1.7.0_80"
+        $release_hash  = undef
+      }
+      '8' : {
+        $release_major = '8u131'
+        $release_minor = 'b11'
+        $install_path = "${java_se}1.8.0_131"
+        $release_hash  = 'd54c1d3a095b4ff2b6607d096fa80163'
+      }
+      default : {
+        $release_major = '8u131'
+        $release_minor = 'b11'
+        $install_path = "${java_se}1.8.0_131"
+        $release_hash  = 'd54c1d3a095b4ff2b6607d096fa80163'
+      }
    }
  }

  # determine package type (exe/tar/rpm), destination directory based on OS
-  case $::kernel {
+  case $facts['kernel'] {
    'Linux' : {
-      case $::operatingsystem {
-        'CentOS' : {
+      case $facts['os']['family'] {
+        'RedHat', 'Amazon' : {
          # Oracle Java 6 comes in a special rpmbin format
          if $version == '6' {
            $package_type = 'rpmbin'
@@ -124,7 +168,7 @@ define java::oracle (
          }
        }
        default : {
-          fail ("unsupported platform ${::operatingsystem}") }
+          fail ("unsupported platform ${$facts['os']['name']}") }
      }

      $os = 'linux'
@@ -132,24 +176,24 @@ define java::oracle (
      $creates_path = "/usr/java/${install_path}"
    }
    default : {
-      fail ( "unsupported platform ${::kernel}" ) }
+      fail ( "unsupported platform ${$facts['kernel']}" ) }
  }

  # set java architecture nomenclature
-  case $::architecture {
+  case $facts['os']['architecture'] {
    'i386' : { $arch = 'i586' }
    'x86_64' : { $arch = 'x64' }
    default : {
-      fail ("unsupported platform ${::architecture}")
+      fail ("unsupported platform ${$facts['os']['architecture']}")
    }
  }

  # following are based on this example:
-  # http://download.oracle.com/otn/java/jdk/7u80-b15/jre-7u80-linux-i586.rpm
+  # http://download.oracle.com/otn-pub/java/jdk/7u80-b15/jre-7u80-linux-i586.rpm
  #
  # JaveSE 6 distributed in .bin format
-  # http://download.oracle.com/otn/java/jdk/6u45-b06/jdk-6u45-linux-i586-rpm.bin
-  # http://download.oracle.com/otn/java/jdk/6u45-b06/jdk-6u45-linux-i586.bin
+  # http://download.oracle.com/otn-pub/java/jdk/6u45-b06/jdk-6u45-linux-i586-rpm.bin
+  # http://download.oracle.com/otn-pub/java/jdk/6u45-b06/jdk-6u45-linux-i586.bin
  # package name to download from Oracle's website
  case $package_type {
    'bin' : {
@@ -166,6 +210,17 @@ define java::oracle (
    }
  }

+  # if complete URL is provided, use this value for source in archive resource
+  if $url {
+    $source = $url
+  }
+  elsif $release_hash != undef {
+    $source = "${oracle_url}/${release_major}-${release_minor}/${release_hash}/${package_name}"
+  }
+  else {
+    $source = "${oracle_url}/${release_major}-${release_minor}/${package_name}"
+  }
+
  # full path to the installer
  $destination = "${destination_dir}${package_name}"
  notice ("Destination is ${destination}")
@@ -188,21 +243,26 @@ define java::oracle (
  case $ensure {
    'present' : {
      archive { $destination :
-        ensure  => present,
-        source  => "${oracle_url}${release_major}-${release_minor}/${package_name}",
-        cleanup => false,
-        cookie  => 'gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie',
-      }->
-      case $::kernel {
+        ensure       => present,
+        source       => $source,
+        cookie       => 'gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie',
+        extract_path => '/tmp',
+        cleanup      => false,
+        creates      => $creates_path,
+        proxy_server => $proxy_server,
+        proxy_type   => $proxy_type,
+      }
+      case $facts['kernel'] {
        'Linux' : {
          exec { "Install Oracle java_se ${java_se} ${version}" :
            path    => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
            command => $install_command,
            creates => $creates_path,
+            require => Archive[$destination]
          }
        }
        default : {
-          fail ("unsupported platform ${::kernel}")
+          fail ("unsupported platform ${$facts['kernel']}")
        }
      }
    }
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -15,46 +15,65 @@ class java::params {
  case $::osfamily {
    'RedHat': {
      case $::operatingsystem {
-        'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL': {
+        'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC', 'CloudLinux': {
          if (versioncmp($::operatingsystemrelease, '5.0') < 0) {
            $jdk_package = 'java-1.6.0-sun-devel'
            $jre_package = 'java-1.6.0-sun'
+            $java_home   = '/usr/lib/jvm/java-1.6.0-sun/jre/'
          }
+          # See cde7046 for why >= 5.0 < 6.3
          elsif (versioncmp($::operatingsystemrelease, '6.3') < 0) {
            $jdk_package = 'java-1.6.0-openjdk-devel'
            $jre_package = 'java-1.6.0-openjdk'
+            $java_home   = '/usr/lib/jvm/java-1.6.0/'
          }
+          # See PR#160 / c8e46b5 for why >= 6.3 < 7.1
          elsif (versioncmp($::operatingsystemrelease, '7.1') < 0) {
            $jdk_package = 'java-1.7.0-openjdk-devel'
            $jre_package = 'java-1.7.0-openjdk'
+            $java_home   = '/usr/lib/jvm/java-1.7.0/'
          }
          else {
            $jdk_package = 'java-1.8.0-openjdk-devel'
            $jre_package = 'java-1.8.0-openjdk'
+            $java_home   = '/usr/lib/jvm/java-1.8.0/'
          }
        }
        'Fedora': {
          if (versioncmp($::operatingsystemrelease, '21') < 0) {
            $jdk_package = 'java-1.7.0-openjdk-devel'
            $jre_package = 'java-1.7.0-openjdk'
+            $java_home   = "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/"
          }
          else {
            $jdk_package = 'java-1.8.0-openjdk-devel'
            $jre_package = 'java-1.8.0-openjdk'
+            $java_home   = "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/"
          }
        }
        'Amazon': {
          $jdk_package = 'java-1.7.0-openjdk-devel'
          $jre_package = 'java-1.7.0-openjdk'
+          $java_home   = "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/"
        }
        default: { fail("unsupported os ${::operatingsystem}") }
      }
      $java = {
-        'jdk' => { 'package' => $jdk_package, },
-        'jre' => { 'package' => $jre_package, },
+        'jdk' => {
+          'package'   => $jdk_package,
+          'java_home' => $java_home,
+        },
+        'jre' => {
+          'package'   => $jre_package,
+          'java_home' => $java_home,
+        },
      }
    }
    'Debian': {
+      $oracle_architecture = $::architecture ? {
+        'amd64' => 'x64',
+        default => $::architecture
+      }
      case $::lsbdistcodename {
        'lenny', 'squeeze', 'lucid', 'natty': {
          $java  = {
@@ -84,7 +103,7 @@ class java::params {
            },
          }
        }
-        'wheezy', 'jessie', 'precise','quantal','raring','saucy', 'trusty', 'utopic': {
+        'wheezy', 'jessie', 'precise', 'quantal', 'raring', 'saucy', 'trusty', 'utopic': {
          $java =  {
            'jdk' => {
              'package'          => 'openjdk-7-jdk',
@@ -121,10 +140,22 @@ class java::params {
              'alternative'      => 'j2sdk1.8-oracle',
              'alternative_path' => '/usr/lib/jvm/j2sdk1.8-oracle/bin/java',
              'java_home'        => '/usr/lib/jvm/j2sdk1.8-oracle/',
-              },
+            },
+            'oracle-java8-jre' => {
+              'package'          => 'oracle-java8-jre',
+              'alternative'      => "jre-8-oracle-${oracle_architecture}",
+              'alternative_path' => "/usr/lib/jvm/jre-8-oracle-${oracle_architecture}/bin/java",
+              'java_home'        => "/usr/lib/jvm/jre-8-oracle-${oracle_architecture}/",
+            },
+            'oracle-java8-jdk' => {
+              'package'          => 'oracle-java8-jdk',
+              'alternative'      => "jdk-8-oracle-${oracle_architecture}",
+              'alternative_path' => "/usr/lib/jvm/jdk-8-oracle-${oracle_architecture}/bin/java",
+              'java_home'        => "/usr/lib/jvm/jdk-8-oracle-${oracle_architecture}/",
+            },
          }
        }
-        'vivid', 'wily': {
+        'stretch', 'vivid', 'wily', 'xenial', 'yakkety', 'zesty': {
          $java =  {
            'jdk' => {
              'package'          => 'openjdk-8-jdk',
@@ -145,48 +176,96 @@ class java::params {
    }
    'OpenBSD': {
      $java = {
-        'jdk' => { 'package' => 'jdk', },
-        'jre' => { 'package' => 'jre', },
+        'jdk' => {
+          'package'   => 'jdk',
+          'java_home' => '/usr/local/jdk/',
+        },
+        'jre' => {
+          'package'   => 'jre',
+          'java_home' => '/usr/local/jdk/',
+        },
      }
    }
    'FreeBSD': {
      $java = {
-        'jdk' => { 'package' => 'openjdk', },
-        'jre' => { 'package' => 'openjdk-jre', },
+        'jdk' => {
+          'package'   => 'openjdk',
+          'java_home' => '/usr/local/openjdk7/',
+        },
+        'jre' => {
+          'package'   => 'openjdk-jre',
+          'java_home' => '/usr/local/openjdk7/',
+        },
      }
    }
    'Solaris': {
      $java = {
-        'jdk' => { 'package' => 'developer/java/jdk-7', },
-        'jre' => { 'package' => 'runtime/java/jre-7', },
+        'jdk' => {
+          'package'   => 'developer/java/jdk-7',
+          'java_home' => '/usr/jdk/instances/jdk1.7.0/',
+        },
+        'jre' => {
+          'package'   => 'runtime/java/jre-7',
+          'java_home' => '/usr/jdk/instances/jdk1.7.0/',
+        },
      }
    }
    'Suse': {
      case $::operatingsystem {
        'SLES': {
-          case $::operatingsystemmajrelease{
-            default: {
-              $jdk_package = 'java-1_6_0-ibm-devel'
-              $jre_package = 'java-1_6_0-ibm'
-            }
-            '12': {
-              $jdk_package = 'java-1_7_0-openjdk-devel'
-              $jre_package = 'java-1_7_0-openjdk'
-            }
+          if (versioncmp($::operatingsystemrelease, '12.1') >= 0) {
+            $jdk_package = 'java-1_8_0-openjdk-devel'
+            $jre_package = 'java-1_8_0-openjdk'
+            $java_home   = '/usr/lib64/jvm/java-1.8.0-openjdk-1.8.0/'
+          } elsif (versioncmp($::operatingsystemrelease, '12') >= 0) {
+            $jdk_package = 'java-1_7_0-openjdk-devel'
+            $jre_package = 'java-1_7_0-openjdk'
+            $java_home   = '/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/'
+          } elsif (versioncmp($::operatingsystemrelease, '11.4') >= 0) {
+            $jdk_package = 'java-1_7_1-ibm-devel'
+            $jre_package = 'java-1_7_1-ibm'
+            $java_home   = '/usr/lib64/jvm/java-1.7.0-ibm-1.7.0/'
+          } else {
+            $jdk_package = 'java-1_6_0-ibm-devel'
+            $jre_package = 'java-1_6_0-ibm'
+            $java_home   = '/usr/lib64/jvm/java-1.6.0-ibm-1.6.0/'
          }
        }
        'OpenSuSE': {
          $jdk_package = 'java-1_7_0-openjdk-devel'
          $jre_package = 'java-1_7_0-openjdk'
+          $java_home   = '/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/'
        }
        default: {
          $jdk_package = 'java-1_6_0-ibm-devel'
          $jre_package = 'java-1_6_0-ibm'
+          $java_home   = '/usr/lib64/jvm/java-1.6.0-ibd-1.6.0/'
        }
      }
      $java = {
-        'jdk' => { 'package' => $jdk_package, },
-        'jre' => { 'package' => $jre_package, },
+        'jdk' => {
+          'package'   => $jdk_package,
+          'java_home' => $java_home,
+        },
+        'jre' => {
+          'package'   => $jre_package,
+          'java_home' => $java_home,
+        },
+      }
+    }
+    'Archlinux': {
+      $jdk_package = 'jdk8-openjdk'
+      $jre_package = 'jre8-openjdk'
+      $java_home   = '/usr/lib/jvm/java-8-openjdk/jre/'
+      $java = {
+        'jdk' => {
+          'package'   => $jdk_package,
+          'java_home' => $java_home,
+        },
+        'jre' => {
+          'package'   => $jre_package,
+          'java_home' => $java_home,
+        },
      }
    }
    default: { fail("unsupported platform ${::osfamily}") }
--- a/metadata.json
+++ b/metadata.json
@@ -1,12 +1,12 @@
 {
  "name": "puppetlabs-java",
-  "version": "1.5.0",
+  "version": "2.1.1",
  "author": "puppetlabs",
  "summary": "Installs the correct Java package on various platforms.",
  "license": "Apache-2.0",
  "source": "git://github.com/puppetlabs/puppetlabs-java",
  "project_page": "https://github.com/puppetlabs/puppetlabs-java",
-  "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+  "issues_url": "https://tickets.puppet.com/CreateIssueDetails!init.jspa?pid=10707&issuetype=1&team=Modules&customfield_14200=14302&labels=triage&customfield_10005=2147&summary=Issue+found+with+module%3A+puppetlabs-java",
  "operatingsystem_support": [
    {
      "operatingsystem": "RedHat",
@@ -49,7 +49,6 @@
    {
      "operatingsystem": "Debian",
      "operatingsystemrelease": [
-        "6",
        "7",
        "8"
      ]
@@ -57,16 +56,20 @@
    {
      "operatingsystem": "Ubuntu",
      "operatingsystemrelease": [
-        "10.04",
-        "12.04",
-        "14.04"
+        "14.04",
+        "16.04"
      ]
    },
    {
      "operatingsystem": "SLES",
      "operatingsystemrelease": [
        "11 SP1",
-        "12"
+        "11 SP2",
+        "11 SP3",
+        "11 SP4",
+        "12",
+        "12 SP1",
+        "12 SP2"
      ]
    },
    {
@@ -77,16 +80,19 @@
    }
  ],
  "requirements": [
-    {
-      "name": "pe",
-      "version_requirement": ">= 3.0.0 < 2015.4.0"
-    },
    {
      "name": "puppet",
-      "version_requirement": ">= 3.0.0 < 5.0.0"
+      "version_requirement": ">= 4.7.0 < 6.0.0"
    }
  ],
  "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"}
+    {
+      "name":"puppetlabs/stdlib",
+      "version_requirement": ">= 4.13.1 < 5.0.0"
+    },
+    {
+      "name":"puppet/archive",
+      "version_requirement": ">= 1.1.0 < 3.0.0"
+    }
  ]
 }
--- a/spec/acceptance/install_spec.rb
+++ b/spec/acceptance/install_spec.rb
@@ -136,14 +136,17 @@ end

 describe 'failure cases' do
  # C14711
-  it 'should fail to install java with an incorrect version' do
-    pp = <<-EOS
+  # SLES 10 returns an exit code of 0 on zypper failure
+  unless fact('operatingsystem') == 'SLES' and fact('operatingsystemrelease') < '11'
+    it 'should fail to install java with an incorrect version' do
+      pp = <<-EOS
      class { 'java':
        version => '14.5',
      }
    EOS

    apply_manifest(pp, :expect_failures => true)
+    end
  end

  # C14712
--- a/spec/acceptance/nodesets/centos-5-vcloud.yml
+++ b/spec/acceptance/nodesets/centos-5-vcloud.yml
@@ -1,15 +0,0 @@
-HOSTS:
-  'centos-5-vcloud':
-    roles:
-      - master
-    platform: el-5-x86_64
-    hypervisor: vcloud
-    template: centos-5-x86_64
-CONFIG:
-  type: foss
-  ssh:
-    keys: "~/.ssh/id_rsa-acceptance"
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
--- a/spec/acceptance/nodesets/centos-59-x64-pe.yml
+++ b/spec/acceptance/nodesets/centos-59-x64-pe.yml
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-59-x64:
-    roles:
-      - master
-      - database
-      - console
-    platform: el-5-x86_64
-    box : centos-59-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
--- a/spec/acceptance/nodesets/centos-59-x64.yml
+++ b/spec/acceptance/nodesets/centos-59-x64.yml
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-59-x64:
-    roles:
-      - master
-    platform: el-5-x86_64
-    box : centos-59-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
--- a/spec/acceptance/nodesets/centos-6-vcloud.yml
+++ b/spec/acceptance/nodesets/centos-6-vcloud.yml
@@ -1,15 +0,0 @@
-HOSTS:
-  'centos-6-vcloud':
-    roles:
-      - master
-    platform: el-6-x86_64
-    hypervisor: vcloud
-    template: centos-6-x86_64
-CONFIG:
-  type: foss
-  ssh:
-    keys: "~/.ssh/id_rsa-acceptance"
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
--- a/spec/acceptance/nodesets/centos-64-x64-fusion.yml
+++ b/spec/acceptance/nodesets/centos-64-x64-fusion.yml
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-fusion503-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-fusion503-nocm.box
-    hypervisor : fusion
-CONFIG:
-  type: foss
--- a/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ b/spec/acceptance/nodesets/centos-64-x64-pe.yml
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
--- a/spec/acceptance/nodesets/centos-64-x64.yml
+++ b/spec/acceptance/nodesets/centos-64-x64.yml
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
--- a/spec/acceptance/nodesets/centos-65-x64.yml
+++ b/spec/acceptance/nodesets/centos-65-x64.yml
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-65-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-65-x64-vbox436-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
--- a/spec/acceptance/nodesets/centos-7-vcloud.yml
+++ b/spec/acceptance/nodesets/centos-7-vcloud.yml
@@ -1,15 +0,0 @@
-HOSTS:
-  'centos-7-vcloud':
-    roles:
-      - master
-    platform: el-7-x86_64
-    hypervisor: vcloud
-    template: centos-7-x86_64
-CONFIG:
-  type: foss
-  ssh:
-    keys: "~/.ssh/id_rsa-acceptance"
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
--- a/spec/acceptance/nodesets/centos-7-x64.yml
+++ b/spec/acceptance/nodesets/centos-7-x64.yml
@@ -0,0 +1,10 @@
+HOSTS:
+  centos-7-x64:
+    roles:
+      - agent
+      - default
+    platform: el-7-x86_64
+    hypervisor: vagrant
+    box: puppetlabs/centos-7.2-64-nocm
+CONFIG:
+  type: foss
--- a/spec/acceptance/nodesets/debian-6-vcloud.yml
+++ b/spec/acceptance/nodesets/debian-6-vcloud.yml
@@ -1,15 +0,0 @@
-HOSTS:
-  'debian-6-amd64':
-    roles:
-      - master
-    platform: debian-6-amd64
-    hypervisor: vcloud
-    template: debian-6-x86_64
-CONFIG:
-  type: foss
-  ssh:
-    keys: "~/.ssh/id_rsa-acceptance"
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
--- a/spec/acceptance/nodesets/debian-607-x64.yml
+++ b/spec/acceptance/nodesets/debian-607-x64.yml
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-607-x64:
-    roles:
-      - master
-    platform: debian-6-amd64
-    box : debian-607-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
--- a/spec/acceptance/nodesets/debian-7-vcloud.yml
+++ b/spec/acceptance/nodesets/debian-7-vcloud.yml
@@ -1,15 +0,0 @@
-HOSTS:
-  'debian-7-amd64':
-    roles:
-      - master
-    platform: debian-7-amd64
-    hypervisor: vcloud
-    template: debian-7-x86_64
-CONFIG:
-  type: foss
-  ssh:
-    keys: "~/.ssh/id_rsa-acceptance"
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
--- a/spec/acceptance/nodesets/debian-70rc1-x64.yml
+++ b/spec/acceptance/nodesets/debian-70rc1-x64.yml
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-70rc1-x64:
-    roles:
-      - master
-    platform: debian-7-amd64
-    box : debian-70rc1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
--- a/spec/acceptance/nodesets/debian-8-x64.yml
+++ b/spec/acceptance/nodesets/debian-8-x64.yml
@@ -0,0 +1,10 @@
+HOSTS:
+  debian-8-x64:
+    roles:
+      - agent
+      - default
+    platform: debian-8-amd64
+    hypervisor: vagrant
+    box: puppetlabs/debian-8.2-64-nocm
+CONFIG:
+  type: foss
--- a/spec/acceptance/nodesets/default.yml
+++ b/spec/acceptance/nodesets/default.yml
@@ -1,10 +1,10 @@
 HOSTS:
-  centos-64-x64:
+  ubuntu-1404-x64:
    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
+      - agent
+      - default
+    platform: ubuntu-14.04-amd64
+    hypervisor: vagrant
+    box: puppetlabs/ubuntu-14.04-64-nocm
 CONFIG:
  type: foss
--- a/spec/acceptance/nodesets/docker/centos-7.yml
+++ b/spec/acceptance/nodesets/docker/centos-7.yml
@@ -0,0 +1,12 @@
+HOSTS:
+  centos-7-x64:
+    platform: el-7-x86_64
+    hypervisor: docker
+    image: centos:7
+    docker_preserve_image: true
+    docker_cmd: '["/usr/sbin/init"]'
+    # install various tools required to get the image up to usable levels
+    docker_image_commands:
+      - 'yum install -y crontabs tar wget openssl sysvinit-tools iproute which initscripts'
+CONFIG:
+  trace_limit: 200
--- a/spec/acceptance/nodesets/docker/debian-8.yml
+++ b/spec/acceptance/nodesets/docker/debian-8.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  debian-8-x64:
+    platform: debian-8-amd64
+    hypervisor: docker
+    image: debian:8
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get update && apt-get install -y net-tools wget locales strace lsof && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen'
+CONFIG:
+  trace_limit: 200
--- a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml
+++ b/spec/acceptance/nodesets/docker/ubuntu-14.04.yml
@@ -0,0 +1,12 @@
+HOSTS:
+  ubuntu-1404-x64:
+    platform: ubuntu-14.04-amd64
+    hypervisor: docker
+    image: ubuntu:14.04
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      # ensure that upstart is booting correctly in the container
+      - 'rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl && apt-get update && apt-get install -y net-tools wget && locale-gen en_US.UTF-8'
+CONFIG:
+  trace_limit: 200
--- a/spec/acceptance/nodesets/fedora-18-x64.yml
+++ b/spec/acceptance/nodesets/fedora-18-x64.yml
@@ -1,10 +0,0 @@
-HOSTS:
-  fedora-18-x64:
-    roles:
-      - master
-    platform: fedora-18-x86_64
-    box : fedora-18-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
--- a/spec/acceptance/nodesets/redhat-7-vcloud.yml
+++ b/spec/acceptance/nodesets/redhat-7-vcloud.yml
@@ -1,15 +0,0 @@
-HOSTS:
-  'redhat-7-vcloud':
-    roles:
-      - master
-    platform: el-7-x86_64
-    hypervisor: vcloud
-    template: redhat-7-x86_64
-CONFIG:
-  type: foss
-  ssh:
-    keys: "~/.ssh/id_rsa-acceptance"
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
--- a/spec/acceptance/nodesets/sles-11-vcloud.yml
+++ b/spec/acceptance/nodesets/sles-11-vcloud.yml
@@ -1,16 +0,0 @@
-HOSTS:
-  'sles-11-vcloud':
-    roles:
-      - master
-    platform: sles-11-x86_64
-    hypervisor: vcloud
-    template: sles-11-x86_64
-
-CONFIG:
-  type: foss
-  ssh:
-    keys: "~/.ssh/id_rsa-acceptance"
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
--- a/spec/acceptance/nodesets/sles-11sp1-x64.yml
+++ b/spec/acceptance/nodesets/sles-11sp1-x64.yml
@@ -1,10 +0,0 @@
-HOSTS:
-  sles-11sp1-x64:
-    roles:
-      - master
-    platform: sles-11-x86_64
-    box : sles-11sp1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
--- a/spec/acceptance/nodesets/solaris-11-vcloud.yml
+++ b/spec/acceptance/nodesets/solaris-11-vcloud.yml
@@ -1,15 +0,0 @@
-HOSTS:
-  'solaris-11-vcloud':
-    roles:
-      - master
-    platform: solaris-11-i386
-    hypervisor: vcloud
-    template: solaris-11-x86_64
-CONFIG:
-  type: foss
-  ssh:
-    keys: "~/.ssh/id_rsa-acceptance"
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
--- a/spec/acceptance/nodesets/ubuntu-1004-vcloud.yml
+++ b/spec/acceptance/nodesets/ubuntu-1004-vcloud.yml
@@ -1,15 +0,0 @@
-HOSTS:
-  'ubuntu-1004-amd64':
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    hypervisor: vcloud
-    template: ubuntu-1004-x86_64
-CONFIG:
-  type: foss
-  ssh:
-    keys: "~/.ssh/id_rsa-acceptance"
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
--- a/spec/acceptance/nodesets/ubuntu-1404-vcloud.yml
+++ b/spec/acceptance/nodesets/ubuntu-1404-vcloud.yml
@@ -1,15 +0,0 @@
-HOSTS:
-  'ubuntu-1404-amd64':
-    roles:
-      - master
-    platform: ubuntu-14.04-amd64
-    hypervisor: vcloud
-    template: ubuntu-1404-x86_64
-CONFIG:
-  type: foss
-  ssh:
-    keys: "~/.ssh/id_rsa-acceptance"
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
--- a/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ b/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
--- a/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ b/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
--- a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+++ b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-1404-x64:
-    roles:
-      - master
-    platform: ubuntu-14.04-amd64
-    box : puppetlabs/ubuntu-14.04-64-nocm
-    box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
-    hypervisor : vagrant
-CONFIG:
-  log_level   : debug
-  type: git
--- a/spec/acceptance/nodesets/ubuntu-server-1504-x64.yml
+++ b/spec/acceptance/nodesets/ubuntu-server-1504-x64.yml
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-1504-x64:
-    roles:
-      - master
-    platform: ubuntu-15.04-amd64
-    box : puppetlabs/ubuntu-15.04-64-nocm
-    box_url : https://vagrantcloud.com/puppetlabs/ubuntu-15.04-64-nocm
-    hypervisor : vagrant
-CONFIG:
-  log_level   : debug
-  type: git
--- a/spec/classes/java_spec.rb
+++ b/spec/classes/java_spec.rb
@@ -3,184 +3,276 @@ require 'spec_helper'
 describe 'java', :type => :class do

  context 'select openjdk for Centos 5.8' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.8'} }
-    it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.8', :architecture => 'x86_64'} }
+    it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.6.0/') }
  end

  context 'select openjdk for Centos 6.3' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.3'} }
-    it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.3', :architecture => 'x86_64'} }
+    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0/') }
  end

  context 'select openjdk for Centos 7.1.1503' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '7.1.1503'} }
-    it { should contain_package('java').with_name('java-1.8.0-openjdk-devel') }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '7.1.1503', :architecture => 'x86_64'} }
+    it { is_expected.to contain_package('java').with_name('java-1.8.0-openjdk-devel') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0/') }
  end

  context 'select openjdk for Centos 6.2' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.2'} }
-    it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }
-    it { should_not contain_exec('update-java-alternatives') }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.2', :architecture => 'x86_64'} }
+    it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
+    it { is_expected.to_not contain_exec('update-java-alternatives') }
  end

  context 'select Oracle JRE with alternatives for Centos 6.3' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.3'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.3', :architecture => 'x86_64'} }
    let(:params) { { 'package' => 'jre', 'java_alternative' => '/usr/bin/java', 'java_alternative_path' => '/usr/java/jre1.7.0_67/bin/java'} }
-    it { should contain_package('java').with_name('jre') }
-    it { should contain_exec('create-java-alternatives').with_command('alternatives --install /usr/bin/java java /usr/java/jre1.7.0_67/bin/java 20000') }
-    it { should contain_exec('update-java-alternatives').with_command('alternatives --set java /usr/java/jre1.7.0_67/bin/java') }
+    it { is_expected.to contain_package('java').with_name('jre') }
+    it { is_expected.to contain_exec('create-java-alternatives').with_command('alternatives --install /usr/bin/java java /usr/java/jre1.7.0_67/bin/java 20000') }
+    it { is_expected.to contain_exec('update-java-alternatives').with_command('alternatives --set java /usr/java/jre1.7.0_67/bin/java') }
  end

  context 'select openjdk for Fedora 20' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '20'} }
-    it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '20', :architecture => 'x86_64'} }
+    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-x86_64/') }
  end

  context 'select openjdk for Fedora 21' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21'} }
-    it { should contain_package('java').with_name('java-1.8.0-openjdk-devel') }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21', :architecture => 'x86_64'} }
+    it { is_expected.to contain_package('java').with_name('java-1.8.0-openjdk-devel') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-x86_64/') }
  end

  context 'select passed value for Fedora 20' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '20'} }
-    let(:params) { { 'distribution' => 'jre' } }
-    it { should contain_package('java').with_name('java-1.7.0-openjdk') }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '20', :architecture => 'x86_64'} }
+    let(:params) { { 'distribution' => 'jre', 'java_home' => '/usr/local/lib/jre/' } }
+    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/local/lib/jre/') }
  end

  context 'select passed value for Fedora 21' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21'} }
-    let(:params) { { 'distribution' => 'jre' } }
-    it { should contain_package('java').with_name('java-1.8.0-openjdk') }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21', :architecture => 'x86_64'} }
+    let(:params) { { 'distribution' => 'jre', 'java_home' => '/usr/local/lib/jre/' } }
+    it { is_expected.to contain_package('java').with_name('java-1.8.0-openjdk') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/local/lib/jre/') }
  end
  
  context 'select passed value for Fedora 21 with yum option' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21', :architecture => 'x86_64'} }
    let(:params) { { 'distribution' => 'jre' } }
    let(:params) { { 'package_options'  => ['--skip-broken'] } }
-    it { should contain_package('java') }
+    it { is_expected.to contain_package('java') }
  end

  context 'select passed value for Centos 5.3' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.3'} }
-    let(:params) { { 'package' => 'jdk' } }
-    it { should contain_package('java').with_name('jdk') }
-    it { should_not contain_exec('update-java-alternatives') }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.3', :architecture => 'x86_64'} }
+    let(:params) { { 'package' => 'jdk', 'java_home' => '/usr/local/lib/jre' } }
+    it { is_expected.to contain_package('java').with_name('jdk') }
+    it { is_expected.to_not contain_exec('update-java-alternatives') }
  end

  context 'select default for Centos 5.3' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.3'} }
-    it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }
-    it { should_not contain_exec('update-java-alternatives') }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.3', :architecture => 'x86_64'} }
+    it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
+    it { is_expected.to_not contain_exec('update-java-alternatives') }
  end

  context 'select default for Debian Wheezy' do
    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', :operatingsystemrelease => '7.1', :architecture => 'amd64',} }
-    it { should contain_package('java').with_name('openjdk-7-jdk') }
-    it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-1.7.0-openjdk-amd64 --jre') }
+    it { is_expected.to contain_package('java').with_name('openjdk-7-jdk') }
+    it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-1.7.0-openjdk-amd64 --jre') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64/') }
  end

  context 'select Oracle JRE for Debian Wheezy' do
    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', :operatingsystemrelease => '7.1', :architecture => 'amd64',} }
    let(:params) { { 'distribution' => 'oracle-jre' } }
-    it { should contain_package('java').with_name('oracle-j2re1.7') }
-    it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set j2re1.7-oracle --jre') }
+    it { is_expected.to contain_package('java').with_name('oracle-j2re1.7') }
+    it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set j2re1.7-oracle --jre') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/j2re1.7-oracle/') }
  end

+  context 'select Oracle Java 8 JRE >=u100 for Debian Wheezy' do
+    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', :operatingsystemrelease => '7.1', :architecture => 'amd64',} }
+    let(:params) { { 'distribution' => 'oracle-java8-jre' } }
+    it { is_expected.to contain_package('java').with_name('oracle-java8-jre') }
+    it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set jre-8-oracle-x64 --jre') }
+  end
+
+  context 'select Oracle Java 8 JDK >=u100 for Debian Wheezy' do
+    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', :operatingsystemrelease => '7.1', :architecture => 'amd64',} }
+    let(:params) { { 'distribution' => 'oracle-java8-jdk' } }
+    it { is_expected.to contain_package('java').with_name('oracle-java8-jdk') }
+    it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set jdk-8-oracle-x64 --jre') }
+  end
+
+
  context 'select OpenJDK JRE for Debian Wheezy' do
    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', :operatingsystemrelease => '7.1', :architecture => 'amd64',} }
    let(:params) { { 'distribution' => 'jre' } }
-    it { should contain_package('java').with_name('openjdk-7-jre-headless') }
-    it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-1.7.0-openjdk-amd64 --jre-headless') }
+    it { is_expected.to contain_package('java').with_name('openjdk-7-jre-headless') }
+    it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-1.7.0-openjdk-amd64 --jre-headless') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64/') }
  end

  context 'select default for Debian Squeeze' do
    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'squeeze', :operatingsystemrelease => '6.0.5', :architecture => 'amd64',} }
-    it { should contain_package('java').with_name('openjdk-6-jdk') }
-    it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-openjdk-amd64 --jre') }
+    it { is_expected.to contain_package('java').with_name('openjdk-6-jdk') }
+    it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-openjdk-amd64 --jre') }
  end

  context 'select Oracle JRE for Debian Squeeze' do
    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'squeeze', :operatingsystemrelease => '6.0.5', :architecture => 'amd64',} }
    let(:params) { { 'distribution' => 'sun-jre', } }
-    it { should contain_package('java').with_name('sun-java6-jre') }
-    it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-sun --jre') }
+    it { is_expected.to contain_package('java').with_name('sun-java6-jre') }
+    it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-sun --jre') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-6-sun/jre/') }
  end

  context 'select OpenJDK JRE for Debian Squeeze' do
    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'squeeze', :operatingsystemrelease => '6.0.5', :architecture => 'amd64',} }
    let(:params) { { 'distribution' => 'jre', } }
-    it { should contain_package('java').with_name('openjdk-6-jre-headless') }
-    it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-openjdk-amd64 --jre-headless') }
+    it { is_expected.to contain_package('java').with_name('openjdk-6-jre-headless') }
+    it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-openjdk-amd64 --jre-headless') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-6-openjdk/jre/') }
  end

  context 'select random alternative for Debian Wheezy' do
    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', :operatingsystemrelease => '7.1', :architecture => 'amd64',} }
    let(:params) { { 'java_alternative' => 'bananafish' } }
-    it { should contain_package('java').with_name('openjdk-7-jdk') }
-    it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set bananafish --jre') }
+    it { is_expected.to contain_package('java').with_name('openjdk-7-jdk') }
+    it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set bananafish --jre') }
  end

  context 'select jdk for Ubuntu Vivid (15.04)' do
    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Ubuntu', :lsbdistcodename => 'vivid', :operatingsystemrelease => '15.04', :architecture => 'amd64',} }
    let(:params) { { 'distribution' => 'jdk' } }
-    it { should contain_package('java').with_name('openjdk-8-jdk') }
+    it { is_expected.to contain_package('java').with_name('openjdk-8-jdk') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64/') }
  end

  context 'select jre for Ubuntu Vivid (15.04)' do
    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Ubuntu', :lsbdistcodename => 'vivid', :operatingsystemrelease => '15.04', :architecture => 'amd64',} }
    let(:params) { { 'distribution' => 'jre' } }
-    it { should contain_package('java').with_name('openjdk-8-jre-headless') }
+    it { is_expected.to contain_package('java').with_name('openjdk-8-jre-headless') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64/') }
  end

  context 'select openjdk for Amazon Linux' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '3.4.43-43.43.amzn1.x86_64'} }
-    it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '3.4.43-43.43.amzn1.x86_64', :architecture => 'x86_64'} }
+    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-x86_64/') }
  end

  context 'select passed value for Amazon Linux' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '5.3.4.43-43.43.amzn1.x86_64'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '5.3.4.43-43.43.amzn1.x86_64', :architecture => 'x86_64'} }
    let(:params) { { 'distribution' => 'jre' } }
-    it { should contain_package('java').with_name('java-1.7.0-openjdk') }
+    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
  end

  context 'select openjdk for Oracle Linux' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.4'} }
-    it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.4', :architecture => 'x86_64'} }
+    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
  end

  context 'select openjdk for Oracle Linux 6.2' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.2'} }
-    it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.2', :architecture => 'x86_64'} }
+    it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
  end

  context 'select passed value for Oracle Linux' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.3'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.3', :architecture => 'x86_64'} }
    let(:params) { { 'distribution' => 'jre' } }
-    it { should contain_package('java').with_name('java-1.7.0-openjdk') }
+    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
  end

  context 'select passed value for Scientific Linux' do
-    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Scientific', :operatingsystemrelease => '6.4'} }
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Scientific', :operatingsystemrelease => '6.4', :architecture => 'x86_64'} }
    let(:params) { { 'distribution' => 'jre' } }
-    it { should contain_package('java').with_name('java-1.7.0-openjdk') }
+    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0/') }
+  end
+
+  context 'select passed value for Scientific Linux CERN (SLC)' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'SLC', :operatingsystemrelease => '6.4', :architecture => 'x86_64'} }
+    let(:params) { { 'distribution' => 'jre' } }
+    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0/') }
  end

  context 'select default for OpenSUSE 12.3' do
-    let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'OpenSUSE', :operatingsystemrelease => '12.3'}}
+    let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'OpenSUSE', :operatingsystemrelease => '12.3', :architecture => 'x86_64'}}
+    it { is_expected.to contain_package('java').with_name('java-1_7_0-openjdk-devel')}
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/') }
+  end
+
+  context 'select default for SLES 11.3' do
+    let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '11.3', :architecture => 'x86_64'}}
+    it { should contain_package('java').with_name('java-1_6_0-ibm-devel')}
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.6.0-ibm-1.6.0/') }
+  end
+
+  context 'select default for SLES 11.4' do
+    let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '11.4', :architecture => 'x86_64'}}
+    it { should contain_package('java').with_name('java-1_7_1-ibm-devel')}
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-ibm-1.7.0/') }
+  end
+
+  context 'select default for SLES 12.0' do
+    let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '12.0', :operatingsystemmajrelease => '12', :architecture => 'x86_64'}}
    it { should contain_package('java').with_name('java-1_7_0-openjdk-devel')}
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/') }
+  end
+
+  context 'select default for SLES 12.1' do
+    let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '12.1', :operatingsystemmajrelease => '12', :architecture => 'x86_64'}}
+    it { should contain_package('java').with_name('java-1_8_0-openjdk-devel')}
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.8.0-openjdk-1.8.0/') }
  end

  context 'select jdk for OpenBSD' do
-    let(:facts) { {:osfamily => 'OpenBSD'} }
-    it { should contain_package('java').with_name('jdk') }
+    let(:facts) { {:osfamily => 'OpenBSD', :architecture => 'x86_64'} }
+    it { is_expected.to contain_package('java').with_name('jdk') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/local/jdk/') }
  end

  context 'select jre for OpenBSD' do
-    let(:facts) { {:osfamily => 'OpenBSD'} }
+    let(:facts) { {:osfamily => 'OpenBSD', :architecture => 'x86_64'} }
    let(:params) { { 'distribution' => 'jre' } }
-    it { should contain_package('java').with_name('jre') }
+    it { is_expected.to contain_package('java').with_name('jre') }
  end

+  describe 'custom java package' do
+    let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'jessie', :operatingsystemrelease => '8.6', :architecture => 'amd64',} }
+    context 'all params provided' do
+      let(:params) { {
+        'distribution'          => 'custom',
+        'package'               => 'custom_jdk',
+        'java_alternative'      => 'java-custom_jdk',
+        'java_alternative_path' => '/opt/custom_jdk/bin/java',
+        'java_home'             => '/opt/custom_jdk',
+      } }
+
+      it { is_expected.to contain_package('java').with_name('custom_jdk') }
+      it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/opt/custom_jdk') }
+      it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-custom_jdk --jre') }
+
+    end
+    context 'missing parameters' do
+      let(:params) { {
+        'distribution' => 'custom',
+        'package' => 'custom_jdk',
+      } }
+      it do
+        expect { catalogue }.to raise_error Puppet::Error, /is not supported. Missing default values/
+      end
+    end
+  end
+
+
  describe 'incompatible OSs' do
    [
      {
@@ -215,7 +307,7 @@ describe 'java', :type => :class do
      },
    ].each do |facts|
      let(:facts) { facts }
-      it "should fail on #{facts[:operatingsystem]} #{facts[:operatingsystemrelease]}" do
+      it "is_expected.to fail on #{facts[:operatingsystem]} #{facts[:operatingsystemrelease]}" do
        expect { catalogue }.to raise_error Puppet::Error, /unsupported platform/
      end
    end
--- a/spec/defines/oracle_spec.rb
+++ b/spec/defines/oracle_spec.rb
@@ -2,139 +2,195 @@ require 'spec_helper'

 describe 'java::oracle', :type => :define do
    context 'On CentOS 64-bit' do
-      let(:facts) { {:kernel => 'Linux', :architecture => 'x86_64', :osfamily => 'RedHat', :operatingsystem => 'CentOS', :operatingsystemrelease => '6.6', :puppetversion => '3.4.3 (Puppet Enterprise 3.2.3)'} }
+      let(:facts) { { :kernel => 'Linux', :os => {:family => 'RedHat', :architecture => 'x86_64', :name => 'CentOS', :release => {:full => '6.0'}}}}

      context 'Oracle Java SE 6 JDK' do
      let(:params) { {:ensure => 'present', :version => '6', :java_se => 'jdk'} }
      let :title do 'jdk6' end
-        it { should contain_archive('/tmp/jdk-6u45-linux-x64-rpm.bin')}
-        it { should contain_exec('Install Oracle java_se jdk 6').with_command('sh /tmp/jdk-6u45-linux-x64-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jdk*.rpm') }
+        it { is_expected.to contain_archive('/tmp/jdk-6u45-linux-x64-rpm.bin')}
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 6').with_command('sh /tmp/jdk-6u45-linux-x64-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jdk*.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 6').that_requires('Archive[/tmp/jdk-6u45-linux-x64-rpm.bin]') }
      end

      context 'Oracle Java SE 7 JDK' do
        let(:params) { {:ensure => 'present', :version => '7', :java_se => 'jdk'} }
        let :title do 'jdk7' end
-          it { should contain_archive('/tmp/jdk-7u80-linux-x64.rpm')}
-          it { should contain_exec('Install Oracle java_se jdk 7').with_command('rpm --force -iv /tmp/jdk-7u80-linux-x64.rpm') }
+          it { is_expected.to contain_archive('/tmp/jdk-7u80-linux-x64.rpm')}
+          it { is_expected.to contain_exec('Install Oracle java_se jdk 7').with_command('rpm --force -iv /tmp/jdk-7u80-linux-x64.rpm') }
+          it { is_expected.to contain_exec('Install Oracle java_se jdk 7').that_requires('Archive[/tmp/jdk-7u80-linux-x64.rpm]') }
      end

    context 'Oracle Java SE 8 JDK' do
      let(:params) { {:ensure => 'present', :version => '8', :java_se => 'jdk'} }
      let :title do 'jdk8' end
-        it { should contain_archive('/tmp/jdk-8u51-linux-x64.rpm')}
-        it { should contain_exec('Install Oracle java_se jdk 8').with_command('rpm --force -iv /tmp/jdk-8u51-linux-x64.rpm') }
+        it { is_expected.to contain_archive('/tmp/jdk-8u131-linux-x64.rpm')}
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 8').with_command('rpm --force -iv /tmp/jdk-8u131-linux-x64.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 8').that_requires('Archive[/tmp/jdk-8u131-linux-x64.rpm]') }
    end

    context 'Oracle Java SE 6 JRE' do
      let(:params) { {:ensure => 'present', :version => '6', :java_se => 'jre'} }
      let :title do 'jre6' end
-        it { should contain_archive('/tmp/jre-6u45-linux-x64-rpm.bin')}
-        it { should contain_exec('Install Oracle java_se jre 6').with_command('sh /tmp/jre-6u45-linux-x64-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jre*.rpm') }
+        it { is_expected.to contain_archive('/tmp/jre-6u45-linux-x64-rpm.bin')}
+        it { is_expected.to contain_exec('Install Oracle java_se jre 6').with_command('sh /tmp/jre-6u45-linux-x64-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jre*.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jre 6').that_requires('Archive[/tmp/jre-6u45-linux-x64-rpm.bin]') }
    end

    context 'Oracle Java SE 7 JRE' do
      let(:params) { {:ensure => 'present', :version => '7', :java_se => 'jre'} }
      let :title do 'jre7' end
-        it { should contain_archive('/tmp/jre-7u80-linux-x64.rpm')}
-        it { should contain_exec('Install Oracle java_se jre 7').with_command('rpm --force -iv /tmp/jre-7u80-linux-x64.rpm') }
+        it { is_expected.to contain_archive('/tmp/jre-7u80-linux-x64.rpm')}
+        it { is_expected.to contain_exec('Install Oracle java_se jre 7').with_command('rpm --force -iv /tmp/jre-7u80-linux-x64.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jre 7').that_requires('Archive[/tmp/jre-7u80-linux-x64.rpm]') }
    end

    context 'select Oracle Java SE 8 JRE' do
      let(:params) { {:ensure => 'present', :version => '8', :java_se => 'jre'} }
      let :title do 'jre8' end
-        it { should contain_archive('/tmp/jre-8u51-linux-x64.rpm')}
-        it { should contain_exec('Install Oracle java_se jre 8').with_command('rpm --force -iv /tmp/jre-8u51-linux-x64.rpm') }
+        it { is_expected.to contain_archive('/tmp/jre-8u131-linux-x64.rpm')}
+        it { is_expected.to contain_exec('Install Oracle java_se jre 8').with_command('rpm --force -iv /tmp/jre-8u131-linux-x64.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jre 8').that_requires('Archive[/tmp/jre-8u131-linux-x64.rpm]') }
    end

+    context 'Pass URL to url parameter' do
+      let(:params) { {
+        :ensure => 'present',
+        :version_major => '8u131',
+        :version_minor => 'b11',
+        :java_se => 'jdk',
+        :url => 'http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.rpm',
+        :url_hash => 'ignored',
+      } }
+      let :title do 'jdk8' end
+      it { is_expected.to contain_archive('/tmp/jdk-8u131-linux-x64.rpm').with_source('http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.rpm') }
+    end
+
+    context 'Pass a hash to url_hash parameter' do
+      let(:params) { {
+        :ensure => 'present',
+        :version_major => '8u131',
+        :version_minor => 'b11',
+        :java_se => 'jdk',
+        :url_hash => 'abcdef01234567890',
+      } }
+      let :title do 'jdk8' end
+      it { is_expected.to contain_archive('/tmp/jdk-8u131-linux-x64.rpm').with_source('http://download.oracle.com/otn-pub/java/jdk//8u131-b11/abcdef01234567890/jdk-8u131-linux-x64.rpm') }
+    end
  end

  context 'On CentOS 32-bit' do
-    let(:facts) { {:kernel => 'Linux', :architecture => 'i386', :osfamily => 'RedHat', :operatingsystem => 'CentOS', :operatingsystemrelease => '6.6', :puppetversion => '3.4.3 (Puppet Enterprise 3.2.3)'} }
+    let(:facts) { {:kernel => 'Linux',  :os => { :family => 'RedHat', :architecture => 'i386', :name => 'CentOS', :release => { :full => '6.6' } } } }

    context 'select Oracle Java SE 6 JDK on RedHat family, 32-bit' do
      let(:params) { {:ensure => 'present', :version => '6', :java_se => 'jdk'} }
      let :title do 'jdk6' end
-        it { should contain_archive('/tmp/jdk-6u45-linux-i586-rpm.bin')}
-        it { should contain_exec('Install Oracle java_se jdk 6').with_command('sh /tmp/jdk-6u45-linux-i586-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jdk*.rpm') }
+        it { is_expected.to contain_archive('/tmp/jdk-6u45-linux-i586-rpm.bin')}
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 6').with_command('sh /tmp/jdk-6u45-linux-i586-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jdk*.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 6').that_requires('Archive[/tmp/jdk-6u45-linux-i586-rpm.bin]') }
    end

    context 'select Oracle Java SE 7 JDK on RedHat family, 32-bit' do
      let(:params) { {:ensure => 'present', :version => '7', :java_se => 'jdk'} }
      let :title do 'jdk7' end
-        it { should contain_archive('/tmp/jdk-7u80-linux-i586.rpm')}
-        it { should contain_exec('Install Oracle java_se jdk 7').with_command('rpm --force -iv /tmp/jdk-7u80-linux-i586.rpm') }
+        it { is_expected.to contain_archive('/tmp/jdk-7u80-linux-i586.rpm')}
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 7').with_command('rpm --force -iv /tmp/jdk-7u80-linux-i586.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 7').that_requires('Archive[/tmp/jdk-7u80-linux-i586.rpm]') }
    end

    context 'select Oracle Java SE 8 JDK on RedHat family, 32-bit' do
      let(:params) { {:ensure => 'present', :version => '8', :java_se => 'jdk'} }
      let :title do 'jdk8' end
-        it { should contain_archive('/tmp/jdk-8u51-linux-i586.rpm')}
-        it { should contain_exec('Install Oracle java_se jdk 8').with_command('rpm --force -iv /tmp/jdk-8u51-linux-i586.rpm') }
+        it { is_expected.to contain_archive('/tmp/jdk-8u131-linux-i586.rpm')}
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 8').with_command('rpm --force -iv /tmp/jdk-8u131-linux-i586.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 8').that_requires('Archive[/tmp/jdk-8u131-linux-i586.rpm]') }
    end

    context 'select Oracle Java SE 6 JRE on RedHat family, 32-bit' do
      let(:params) { {:ensure => 'present', :version => '6', :java_se => 'jre'} }
      let :title do 'jdk6' end
-        it { should contain_archive('/tmp/jre-6u45-linux-i586-rpm.bin')}
-        it { should contain_exec('Install Oracle java_se jre 6').with_command('sh /tmp/jre-6u45-linux-i586-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jre*.rpm') }
+        it { is_expected.to contain_archive('/tmp/jre-6u45-linux-i586-rpm.bin')}
+        it { is_expected.to contain_exec('Install Oracle java_se jre 6').with_command('sh /tmp/jre-6u45-linux-i586-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jre*.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jre 6').that_requires('Archive[/tmp/jre-6u45-linux-i586-rpm.bin]') }
    end

    context 'select Oracle Java SE 7 JRE on RedHat family, 32-bit' do
      let(:params) { {:ensure => 'present', :version => '7', :java_se => 'jre'} }
      let :title do 'jdk7' end
-        it { should contain_archive('/tmp/jre-7u80-linux-i586.rpm')}
-        it { should contain_exec('Install Oracle java_se jre 7').with_command('rpm --force -iv /tmp/jre-7u80-linux-i586.rpm') }
+        it { is_expected.to contain_archive('/tmp/jre-7u80-linux-i586.rpm')}
+        it { is_expected.to contain_exec('Install Oracle java_se jre 7').with_command('rpm --force -iv /tmp/jre-7u80-linux-i586.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jre 7').that_requires('Archive[/tmp/jre-7u80-linux-i586.rpm]') }
    end

    context 'select Oracle Java SE 8 JRE on RedHat family, 32-bit' do
      let(:params) { {:ensure => 'present', :version => '8', :java_se => 'jre'} }
      let :title do 'jdk8' end
-        it { should contain_archive('/tmp/jre-8u51-linux-i586.rpm')}
-        it { should contain_exec('Install Oracle java_se jre 8').with_command('rpm --force -iv /tmp/jre-8u51-linux-i586.rpm') }
+        it { is_expected.to contain_archive('/tmp/jre-8u131-linux-i586.rpm')}
+        it { is_expected.to contain_exec('Install Oracle java_se jre 8').with_command('rpm --force -iv /tmp/jre-8u131-linux-i586.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jre 8').that_requires('Archive[/tmp/jre-8u131-linux-i586.rpm]') }
    end
  end

-  describe 'incompatible OSs' do
+  describe 'incompatible OSes' do
    [
      {
        # C14706
-        :osfamily               => 'windows',
-        :operatingsystem        => 'windows',
-        :operatingsystemrelease => '8.1',
-        :puppetversion => '3.4.3 (Puppet Enterprise 3.2.3)',
+        :kernel => 'Windows',
+        :os => {
+          :family => 'Windows',
+          :name => 'Windows',
+          :release => {
+            :full => '8.1'
+          }
+        },
      },
      {
        # C14707
-        :osfamily               => 'Darwin',
-        :operatingsystem        => 'Darwin',
-        :operatingsystemrelease => '13.3.0',
-        :puppetversion => '3.4.3 (Puppet Enterprise 3.2.3)',
+        :kernel => 'Darwin',
+        :os => {
+          :family => 'Darwin',
+          :name => 'Darwin',
+          :release => {
+            :full => '13.3.0'
+          }
+        },
      },
      {
        # C14708
-        :osfamily               => 'AIX',
-        :operatingsystem        => 'AIX',
-        :operatingsystemrelease => '7100-02-00-000',
-        :puppetversion => '3.4.3 (Puppet Enterprise 3.2.3)',
+        :kernel => 'AIX',
+        :os => {
+          :family => 'AIX',
+          :name => 'AIX',
+          :release => {
+            :full => '7100-02-00-000'
+          }
+        },
      },
      {
-        # C14708
-        :osfamily               => 'AIX',
-        :operatingsystem        => 'AIX',
-        :operatingsystemrelease => '6100-07-04-1216',
-        :puppetversion => '3.4.3 (Puppet Enterprise 3.2.3)',
+        # C14709
+        :kernel => 'AIX',
+        :os => {
+          :family => 'AIX',
+          :name => 'AIX',
+          :release => {
+            :full => '6100-07-04-1216'
+          }
+        },
      },
      {
-        # C14708
-        :osfamily               => 'AIX',
-        :operatingsystem        => 'AIX',
-        :operatingsystemrelease => '5300-12-01-1016',
-        :puppetversion => '3.4.3 (Puppet Enterprise 3.2.3)',
-      },
+        # C14710
+        :kernel => 'AIX',
+        :os => {
+          :family => 'AIX',
+          :name => 'AIX',
+          :release => {
+            :full => '5300-12-01-1016'
+          }
+        },
+      }
    ].each do |facts|
      let(:facts) { facts }
      let :title do 'jdk' end
-      it "should fail on #{facts[:operatingsystem]} #{facts[:operatingsystemrelease]}" do
+      it "is_expected.to fail on #{facts[:os][:name]} #{facts[:os][:release][:full]}" do
        expect { catalogue }.to raise_error Puppet::Error, /unsupported platform/
      end
    end
--- a/spec/spec.opts
+++ b/spec/spec.opts
@@ -1,6 +0,0 @@
--format
-s
--colour
--loadby
-mtime
--backtrace
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,43 +1,20 @@
 require 'beaker-rspec'
 require 'beaker/puppet_install_helper'
+require 'beaker/module_install_helper'

 run_puppet_install_helper
+install_module_on(hosts)
+install_module_dependencies_on(hosts)

 UNSUPPORTED_PLATFORMS = [ "Darwin", "windows" ]

 unless ENV["RS_PROVISION"] == "no" or ENV["BEAKER_provision"] == "no"
  hosts.each do |host|
-    if host['platform'] =~ /sles-1/i ||  host['platform'] =~ /solaris-1/i
-      get_stdlib = <<-stdlib
-      package{'wget':}
-      exec{'download':
-        command => "wget -P /root/ https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4.3.2.tar.gz --no-check-certificate",
-        path => ['/opt/csw/bin/','/usr/bin/']
-      }
-      stdlib
-      apply_manifest_on(host, get_stdlib)
-      # have to use force otherwise it checks ssl cert even though it is a local file
-      on host, puppet('module install /root/puppetlabs-stdlib-4.3.2.tar.gz --force')
-    else
-      on host, puppet("module install puppetlabs-stdlib")
-      # For test support
-      on host, puppet("module install puppetlabs-apt")
-    end
+    install_puppet_module_via_pmt_on(host, {module_name: 'puppetlabs-apt'})
  end
 end

 RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-
  # Readable test descriptions
  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module
-    hosts.each do |host|
-      copy_module_to(host, :source => proj_root, :module_name => "java")
-    end
-  end
 end
--- a/spec/unit/facter/java_default_home_spec.rb
+++ b/spec/unit/facter/java_default_home_spec.rb
@@ -8,13 +8,33 @@ describe Facter::Util::Fact do

  describe "java_default_home" do
    context 'returns java home path when readlink present' do
-      it do
-        java_path_output = <<-EOS
+      context 'when java is in HOME/jre/bin/java' do
+        it do
+          java_path_output = <<-EOS
 /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
-        EOS
+          EOS
+          Facter::Util::Resolution.expects(:which).with("readlink").returns(true)
+          Facter::Util::Resolution.expects(:exec).with("readlink -e /usr/bin/java").returns(java_path_output)
+          expect(Facter.value(:java_default_home)).to eql "/usr/lib/jvm/java-7-openjdk-amd64"
+        end
+      end
+      context 'when java is in HOME/bin/java' do
+        it do
+          java_path_output = <<-EOS
+/usr/lib/jvm/oracle-java8-jre-amd64/bin/java
+          EOS
+          Facter::Util::Resolution.expects(:which).with("readlink").returns(true)
+          Facter::Util::Resolution.expects(:exec).with("readlink -e /usr/bin/java").returns(java_path_output)
+          expect(Facter.value(:java_default_home)).to eql "/usr/lib/jvm/oracle-java8-jre-amd64"
+        end
+      end
+    end
+    context 'returns nil when readlink is present but java is not' do
+      it do
+        java_path_output = ""
        Facter::Util::Resolution.expects(:which).with("readlink").returns(true)
        Facter::Util::Resolution.expects(:exec).with("readlink -e /usr/bin/java").returns(java_path_output)
-        Facter.value(:java_default_home).should == "/usr/lib/jvm/java-7-openjdk-amd64"
+        expect(Facter.value(:java_default_home)).to be_nil
      end
    end

@@ -22,7 +42,7 @@ describe Facter::Util::Fact do
      it do
        Facter::Util::Resolution.stubs(:exec)
        Facter::Util::Resolution.expects(:which).with("readlink").at_least(1).returns(false)
-        Facter.value(:java_default_home).should be_nil
+        expect(Facter.value(:java_default_home)).to be_nil
      end
    end
  end
--- a/spec/unit/facter/java_libjvm_path_spec.rb
+++ b/spec/unit/facter/java_libjvm_path_spec.rb
@@ -13,7 +13,7 @@ describe Facter::Util::Fact do
    context 'returns libjvm path' do
      context 'on Linux' do
        it do
-          Facter.value(:java_libjvm_path).should == "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server"
+          expect(Facter.value(:java_libjvm_path)).to eql "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server"
        end
      end
    end
--- a/spec/unit/facter/java_version_spec.rb
+++ b/spec/unit/facter/java_version_spec.rb
@@ -14,12 +14,13 @@ describe Facter::Util::Fact do
        let(:facts) { {:operatingsystem => 'OpenBSD'} }
        it do
          java_version_output = <<-EOS
+Picked up JAVA_TOOL_OPTIONS: -Djava.net.preferIPv4Stack=true
 openjdk version "1.7.0_71"
 OpenJDK Runtime Environment (build 1.7.0_71-b14)
 OpenJDK 64-Bit Server VM (build 24.71-b01, mixed mode)
          EOS
          Facter::Util::Resolution.expects(:which).with("java").returns('/usr/local/jdk-1.7.0/jre/bin/java')
-          Facter::Util::Resolution.expects(:exec).with("java -Xmx8m -version 2>&1").returns(java_version_output)
+          Facter::Util::Resolution.expects(:exec).with("java -Xmx12m -version 2>&1").returns(java_version_output)
          expect(Facter.value(:java_version)).to eq("1.7.0_71")
        end
      end
@@ -30,13 +31,14 @@ OpenJDK 64-Bit Server VM (build 24.71-b01, mixed mode)
        let(:facts) { {:operatingsystem => 'Darwin'} }
        it do
          java_version_output = <<-EOS
+Picked up JAVA_TOOL_OPTIONS: -Djava.net.preferIPv4Stack=true
 java version "1.7.0_71"
 Java(TM) SE Runtime Environment (build 1.7.0_71-b14)
 Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode)
          EOS
          Facter::Util::Resolution.expects(:exec).with("/usr/libexec/java_home --failfast 2>&1").returns("/Library/Java/JavaVirtualMachines/jdk1.7.0_71.jdk/Contents/Home")
-          Facter::Util::Resolution.expects(:exec).with("java -Xmx8m -version 2>&1").returns(java_version_output)
-          Facter.value(:java_version).should == "1.7.0_71"
+          Facter::Util::Resolution.expects(:exec).with("java -Xmx12m -version 2>&1").returns(java_version_output)
+          expect(Facter.value(:java_version)).to eql "1.7.0_71"
        end
      end
      context 'on other systems' do
@@ -46,11 +48,13 @@ Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode)
        let(:facts) { {:operatingsystem => 'MyOS'} }
        it do
          java_version_output = <<-EOS
+Picked up JAVA_TOOL_OPTIONS: -Djava.net.preferIPv4Stack=true
 java version "1.7.0_71"
 Java(TM) SE Runtime Environment (build 1.7.0_71-b14)
 Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode)
          EOS
-          Facter::Util::Resolution.expects(:exec).with("java -Xmx8m -version 2>&1").returns(java_version_output)
+          Facter::Util::Resolution.expects(:which).with("java").returns('/path/to/java')
+          Facter::Util::Resolution.expects(:exec).with("java -Xmx12m -version 2>&1").returns(java_version_output)
          expect(Facter.value(:java_version)).to eq("1.7.0_71")
        end
      end
@@ -74,7 +78,7 @@ Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode)
        let(:facts) { {:operatingsystem => 'Darwin'} }
        it do
          Facter::Util::Resolution.expects(:exec).at_least(1).with("/usr/libexec/java_home --failfast 2>&1").returns('Unable to find any JVMs matching version "(null)".')
-          Facter.value(:java_version).should be_nil
+          expect(Facter.value(:java_version)).to be_nil
        end
      end
      context 'on other systems' do