Merge pull request #361 from sheenaajay/releaseprep

(MODULES-9128) Release 4.0.0

.gitattributes

@@ -1,5 +1,5 @@
-#This file is generated by ModuleSync, do not edit.
 *.rb eol=lf
 *.erb eol=lf
 *.pp eol=lf
 *.sh eol=lf
+*.epp eol=lf

.gitignore

@@ -1,24 +1,26 @@
-#This file is generated by ModuleSync, do not edit.
+.git/
-pkg/
-Gemfile.lock
-Gemfile.local
-vendor/
-spec/fixtures/manifests/
-spec/fixtures/modules/
-log/
-junit/
-.vagrant/
-.bundle/
-coverage/
-log/
-.idea/
-.metadata
-*.iml
 .*.sw[op]
+.metadata
 .yardoc
 .yardwarns
+*.iml
+/.bundle/
+/.idea/
+/.vagrant/
+/coverage/
+/bin/
+/doc/
+/Gemfile.local
+/Gemfile.lock
+/junit/
+/log/
+/pkg/
+/spec/fixtures/manifests/
+/spec/fixtures/modules/
+/tmp/
+/vendor/
+/convert_report.txt
+/update_report.txt
 .DS_Store
-tmp/
+.envrc
-vendor/
+/inventory.yaml
-doc/
-

.pdkignore

@@ -0,0 +1,41 @@
+.git/
+.*.sw[op]
+.metadata
+.yardoc
+.yardwarns
+*.iml
+/.bundle/
+/.idea/
+/.vagrant/
+/coverage/
+/bin/
+/doc/
+/Gemfile.local
+/Gemfile.lock
+/junit/
+/log/
+/pkg/
+/spec/fixtures/manifests/
+/spec/fixtures/modules/
+/tmp/
+/vendor/
+/convert_report.txt
+/update_report.txt
+.DS_Store
+.envrc
+/inventory.yaml
+/appveyor.yml
+/.fixtures.yml
+/Gemfile
+/.gitattributes
+/.gitignore
+/.gitlab-ci.yml
+/.pdkignore
+/Rakefile
+/rakelib/
+/.rspec
+/.rubocop.yml
+/.travis.yml
+/.yardopts
+/spec/
+/.vscode/

.puppet-lint.rc

@@ -0,0 +1 @@
+--relative

.rubocop.yml

@@ -1,22 +1,28 @@
 ---
-require:
+require: rubocop-rspec
- - rubocop-rspec
 AllCops:
+  DisplayCopNames: true
   TargetRubyVersion: '2.1'
   Include:
   - "./**/*.rb"
   Exclude:
   - bin/*
   - ".vendor/**/*"
-  - Gemfile
+  - "**/Gemfile"
-  - Rakefile
+  - "**/Rakefile"
   - pkg/**/*
   - spec/fixtures/**/*
   - vendor/**/*
-inherit_from: .rubocop_todo.yml
+  - "**/Puppetfile"
+  - "**/Vagrantfile"
+  - "**/Guardfile"
 Metrics/LineLength:
   Description: People have wide screens, use them.
   Max: 200
+GetText/DecorateString:
+  Description: We don't want to decorate test output.
+  Exclude:
+  - spec/*
 RSpec/BeforeAfterAll:
   Description: Beware of using after(:all) as it may cause state to leak between tests.
     A necessary evil in acceptance testing.
@@ -64,12 +70,24 @@ Style/TrailingCommaInLiteral:
 Style/SymbolArray:
   Description: Using percent style obscures symbolic intent of array's contents.
   EnforcedStyle: brackets
+RSpec/MessageSpies:
+  EnforcedStyle: receive
+Style/Documentation:
+  Exclude:
+  - lib/puppet/parser/functions/**/*
+  - spec/**/*
+Style/WordArray:
+  EnforcedStyle: brackets
 Style/CollectionMethods:
   Enabled: true
 Style/MethodCalledOnDoEndBlock:
   Enabled: true
 Style/StringMethods:
   Enabled: true
+Layout/EndOfLine:
+  Enabled: false
+Layout/IndentHeredoc:
+  Enabled: false
 Metrics/AbcSize:
   Enabled: false
 Metrics/BlockLength:
@@ -88,8 +106,14 @@ Metrics/PerceivedComplexity:
   Enabled: false
 RSpec/DescribeClass:
   Enabled: false
+RSpec/ExampleLength:
+  Enabled: false
 RSpec/MessageExpectation:
   Enabled: false
+RSpec/MultipleExpectations:
+  Enabled: false
+RSpec/NestedGroups:
+  Enabled: false
 Style/AsciiComments:
   Enabled: false
 Style/IfUnlessModifier:

.sync.yml

@@ -1,9 +1,41 @@
 ---
+.gitignore:
+  required:
+    - ---.project
+
+.gitlab-ci.yml:
+  unmanaged: true
+
+.travis.yml:
+  docker_sets:
+    - set: docker/centos-7
+    - set: docker/ubuntu-14.04
+  docker_defaults:
+    bundler_args: ""
+  secure: ""
+  branches:
+    - release
+
 appveyor.yml:
   delete: true
+
+Gemfile:
+  optional:
+    ':development':
+      - gem: 'github_changelog_generator'
+        git: 'https://github.com/skywinder/github-changelog-generator'
+        ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
+        condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
+  required:
+    ':system_tests':
+      - gem: 'puppet-module-posix-system-r#{minor_version}'
+        platforms: ruby
+      - gem: 'puppet-module-win-system-r#{minor_version}'
+        platforms:
+          - mswin
+          - mingw
+          - x64_mingw
+
 spec/spec_helper.rb:
-  allow_deprecations: true
+  mock_with: ':rspec'
-.travis.yml:
+  coverage_report: true
-  extras:
-  - rvm: 2.1.9
-    script: bundle exec rake rubocop

.travis.yml

@@ -1,34 +1,72 @@
-#This file is generated by ModuleSync, do not edit.
 ---
-sudo: false
 language: ruby
 cache: bundler
-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
+  - bundle -v
+  - rm -f Gemfile.lock
+  - gem update --system $RUBYGEMS_VERSION
+  - gem --version
+  - bundle -v
+script:
+  - 'bundle exec rake $CHECK'
+bundler_args: --without system_tests
+rvm:
+  - 2.5.3
+stages:
+  - static
+  - spec
+  - acceptance
+  -
+    if: tag =~ ^v\d
+    name: deploy
 matrix:
   fast_finish: true
   include:
-  - rvm: 2.3.1
+    -
-    dist: trusty
+      bundler_args: 
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
+      dist: trusty
-    script: bundle exec rake beaker
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply
-    services: docker
+      rvm: 2.5.3
-    sudo: required
+      script: bundle exec rake beaker
-  - rvm: 2.3.1
+      services: docker
-    dist: trusty
+      stage: acceptance
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
+      sudo: required
-    script: bundle exec rake beaker
+    -
-    services: docker
+      bundler_args: 
-    sudo: required
+      dist: trusty
-  - rvm: 2.4.1
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
-    bundler_args: --without system_tests
+      rvm: 2.5.3
-    env: PUPPET_GEM_VERSION="~> 5.0"
+      script: bundle exec rake beaker
-  - rvm: 2.1.9
+      services: docker
-    bundler_args: --without system_tests
+      stage: acceptance
-    env: PUPPET_GEM_VERSION="~> 4.0"
+      sudo: required
-  - rvm: 2.1.9
+    -
-    script: bundle exec rake rubocop
+      env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
+      stage: static
+    -
+      env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
+      rvm: 2.4.5
+      stage: spec
+    -
+      env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
+      rvm: 2.5.3
+      stage: spec
+    -
+      env: DEPLOY_TO_FORGE=yes
+      stage: deploy
+branches:
+  only:
+    - master
+    - /^v\d/
+    - release
 notifications:
   email: false
+deploy:
+  provider: puppetforge
+  user: puppet
+  password:
+    secure: ""
+  on:
+    tags: true
+    all_branches: true
+    condition: "$DEPLOY_TO_FORGE = yes"

.yardopts

@@ -0,0 +1 @@
+--markup markdown

CHANGELOG.md

@@ -1,3 +1,90 @@
+# Change log
+
+All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
+
+## [v4.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v4.0.0) (2019-05-16)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/3.3.0...v4.0.0)
+
+### Changed
+
+- pdksync - \(MODULES-8444\) - Raise lower Puppet bound [\#356](https://github.com/puppetlabs/puppetlabs-java/pull/356) ([david22swan](https://github.com/david22swan))
+
+### Added
+
+- \(FM-7921\) - Implement Puppet Strings [\#353](https://github.com/puppetlabs/puppetlabs-java/pull/353) ([david22swan](https://github.com/david22swan))
+- Update default version & java 8 version from 8u192 to 8u201 [\#347](https://github.com/puppetlabs/puppetlabs-java/pull/347) ([valentinsavenko](https://github.com/valentinsavenko))
+- Add ability to override basedir and package type for oracle java [\#345](https://github.com/puppetlabs/puppetlabs-java/pull/345) ([fraenki](https://github.com/fraenki))
+- MODULES-8613: Add option to set a custom JCE download URL [\#344](https://github.com/puppetlabs/puppetlabs-java/pull/344) ([HielkeJ](https://github.com/HielkeJ))
+
+### Fixed
+
+- MODULES-8698: Fix $install\_path on CentOS with tar.gz package type [\#349](https://github.com/puppetlabs/puppetlabs-java/pull/349) ([fraenki](https://github.com/fraenki))
+
+## [3.3.0](https://github.com/puppetlabs/puppetlabs-java/tree/3.3.0) (2019-01-17)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/3.2.0...3.3.0)
+
+### Added
+
+- \(MODULES-8234\) - Add SLES 15 support [\#336](https://github.com/puppetlabs/puppetlabs-java/pull/336) ([eimlav](https://github.com/eimlav))
+- \(MODULES-8234\) - Upgrade Oracle Java version to 8u192 [\#334](https://github.com/puppetlabs/puppetlabs-java/pull/334) ([eimlav](https://github.com/eimlav))
+- Support for installing JCE. Fixes MODULES-1681 [\#326](https://github.com/puppetlabs/puppetlabs-java/pull/326) ([dploeger](https://github.com/dploeger))
+- MODULES-8044: upgrade Oracle Java 8 to 181, make it the default release [\#314](https://github.com/puppetlabs/puppetlabs-java/pull/314) ([ojongerius](https://github.com/ojongerius))
+
+### Fixed
+
+- pdksync - \(FM-7655\) Fix rubygems-update for ruby \< 2.3 [\#338](https://github.com/puppetlabs/puppetlabs-java/pull/338) ([tphoney](https://github.com/tphoney))
+- \(FM-7520\) - Removing Solaris from the support matrix [\#335](https://github.com/puppetlabs/puppetlabs-java/pull/335) ([pmcmaw](https://github.com/pmcmaw))
+- Optimized code for making java::oracle atomic. Fixes MODULES-8085 [\#330](https://github.com/puppetlabs/puppetlabs-java/pull/330) ([dploeger](https://github.com/dploeger))
+- Fix OpenJDK paths on Debian based OS with ARM [\#329](https://github.com/puppetlabs/puppetlabs-java/pull/329) ([mmoll](https://github.com/mmoll))
+- \(MODULES-7050\) - Fix OracleJDK reinstalling on Puppet runs [\#323](https://github.com/puppetlabs/puppetlabs-java/pull/323) ([eimlav](https://github.com/eimlav))
+- \(MODULES-8025\) Switch default for Ubuntu 18.04 to 11 [\#322](https://github.com/puppetlabs/puppetlabs-java/pull/322) ([baurmatt](https://github.com/baurmatt))
+- MODULES-7819 fix set JAVA\_HOME environments on FreeBSD platform [\#315](https://github.com/puppetlabs/puppetlabs-java/pull/315) ([olevole](https://github.com/olevole))
+
+## [3.2.0](https://github.com/puppetlabs/puppetlabs-java/tree/3.2.0) (2018-09-27)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/3.1.0...3.2.0)
+
+### Added
+
+- pdksync - \(MODULES-6805\) metadata.json shows support for puppet 6 [\#317](https://github.com/puppetlabs/puppetlabs-java/pull/317) ([tphoney](https://github.com/tphoney))
+
+## [3.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/3.1.0) (2018-09-06)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/3.0.0...3.1.0)
+
+### Added
+
+- pdksync - \(MODULES-7705\) - Bumping stdlib dependency from \< 5.0.0 to \< 6.0.0 [\#310](https://github.com/puppetlabs/puppetlabs-java/pull/310) ([pmcmaw](https://github.com/pmcmaw))
+
+## [3.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/3.0.0) (2018-08-13)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/2.4.0...3.0.0)
+
+### Changed
+
+- \[FM-6963\] Removal of unsupported OS from java [\#295](https://github.com/puppetlabs/puppetlabs-java/pull/295) ([david22swan](https://github.com/david22swan))
+
+### Added
+
+- \(MODULES-7561\) - Addition of support for Ubuntu 18.04 to java [\#299](https://github.com/puppetlabs/puppetlabs-java/pull/299) ([david22swan](https://github.com/david22swan))
+
+### Fixed
+
+- Remove ensure\_resource to avoid potential conflict [\#287](https://github.com/puppetlabs/puppetlabs-java/pull/287) ([sevencastles](https://github.com/sevencastles))
+
+## 2.4.0
+### Summary
+This release uses the PDK convert functionality which in return makes the module PDK compliant. Also includes a clean up from Rubocop.
+
+#### Changed
+- 1.3.2 PDK convert has been applied [MODULES-6456](https://tickets.puppetlabs.com/browse/MODULES-6456)
+- The modules has undergone a Rubocop cleanup.
+
+#### Fixed
+- $java_home for SLES 11.4 has been updated to the correct location.
+
 ## Supported Release [2.3.0]
 ### Summary
 This release is in order to implement Rubocop changes into the module.
@@ -283,3 +370,6 @@ Jeff McCune <jeff@puppetlabs.com>
 
 [2.3.0]:https://github.com/puppetlabs/puppetlabs-java/compare/2.2.0...2.3.0
 [2.2.0]:https://github.com/puppetlabs/puppetlabs-java/compare/2.1.1...2.2.0
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

Gemfile

@@ -1,76 +1,76 @@
-#This file is generated by ModuleSync, do not edit.
+source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
-
-# 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
-    :gem
-  end
-end
-
-# 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[:@][^#]*)#(.*)/
+  git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?}
-    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
+  file_url_regex = %r{\Afile:\/\/(?<path>.*)}
-  elsif place_or_version =~ /^file:\/\/(.*)/
+
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
+  if place_or_version && (git_url = place_or_version.match(git_url_regex))
+    [fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact
+  elsif place_or_version && (file_url = place_or_version.match(file_url_regex))
+    ['>= 0', { path: File.expand_path(file_url[:path]), require: false }]
   else
-    [place_or_version, { :require => false }]
+    [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]}"
+minor_version = ruby_version_segments[0..1].join('.')
 
 group :development do
-  gem "puppet-module-posix-default-r#{minor_version}",    :require => false, :platforms => "ruby"
+  gem "fast_gettext", '1.1.0',                         require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
-  gem "puppet-module-win-default-r#{minor_version}",      :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
+  gem "fast_gettext",                                  require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
-  gem "puppet-module-posix-dev-r#{minor_version}",        :require => false, :platforms => "ruby"
+  gem "json_pure", '<= 2.0.1',                         require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-  gem "puppet-module-win-dev-r#{minor_version}", '0.0.7', :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
+  gem "json", '= 1.8.1',                               require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
-  gem "json_pure", '<= 2.0.1',                            :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
+  gem "json", '= 2.0.4',                               require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "fast_gettext", '1.1.0',                            :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
+  gem "json", '= 2.1.0',                               require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "fast_gettext",                                     :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
+  gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby]
+  gem "puppet-module-posix-dev-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-win-dev-r#{minor_version}",       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "github_changelog_generator",                    require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 end
-
 group :system_tests do
-  gem "puppet-module-posix-system-r#{minor_version}",                            :require => false, :platforms => "ruby"
+  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 "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 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
+puppet_version = ENV['PUPPET_GEM_VERSION']
+facter_version = ENV['FACTER_GEM_VERSION']
+hiera_version = ENV['HIERA_GEM_VERSION']
 
-# Only explicitly specify Facter/Hiera if a version has been specified.
+gems = {}
-# 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']
 
+gems['puppet'] = location_for(puppet_version)
 
-# Evaluate Gemfile.local if it exists
+# If facter or hiera versions have been specified via the environment
-if File.exists? "#{__FILE__}.local"
+# variables
-  eval(File.read("#{__FILE__}.local"), binding)
+
+gems['facter'] = location_for(facter_version) if facter_version
+gems['hiera'] = location_for(hiera_version) if hiera_version
+
+if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
+  # If we're using a Puppet gem on Windows which handles its own win32-xxx gem
+  # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
+  gems['win32-dir'] =      ['<= 0.4.9', require: false]
+  gems['win32-eventlog'] = ['<= 0.6.5', require: false]
+  gems['win32-process'] =  ['<= 0.7.5', require: false]
+  gems['win32-security'] = ['<= 0.2.5', require: false]
+  gems['win32-service'] =  ['0.8.8', require: false]
 end
 
-# Evaluate ~/.gemfile if it exists
+gems.each do |gem_name, gem_params|
-if File.exists?(File.join(Dir.home, '.gemfile'))
+  gem gem_name, *gem_params
-  eval(File.read(File.join(Dir.home, '.gemfile')), binding)
 end
 
-# vim:ft=ruby
+# Evaluate Gemfile.local and ~/.gemfile if they exist
+extra_gemfiles = [
+  "#{__FILE__}.local",
+  File.join(Dir.home, '.gemfile'),
+]
+
+extra_gemfiles.each do |gemfile|
+  if File.file?(gemfile) && File.readable?(gemfile)
+    eval(File.read(gemfile), binding)
+  end
+end
+# vim: syntax=ruby

HISTORY.md

@@ -0,0 +1,296 @@
+## 2.4.0
+### Summary
+This release uses the PDK convert functionality which in return makes the module PDK compliant. Also includes a clean up from Rubocop.
+
+#### Changed
+- 1.3.2 PDK convert has been applied [MODULES-6456](https://tickets.puppetlabs.com/browse/MODULES-6456)
+- The modules has undergone a Rubocop cleanup.
+
+#### Fixed
+- $java_home for SLES 11.4 has been updated to the correct location.
+
+## Supported Release [2.3.0]
+### Summary
+This release is in order to implement Rubocop changes into the module.
+
+#### Added
+- Several Modulesync changes have been made.
+- Rubocop has been implemented in the module.
+- CentOS 7 is now supported.
+- Red Hat Enterprise Linux (RHEL) 7 is now supported.
+- Ubuntu artful 1710 now supported.
+- Bionic 1804 now supported.
+
+## Supported Release [2.2.0]
+### Summary
+This release is a maintenance release that includes a roll up of minor changes.
+
+#### Added
+- Addition of Ubuntu for Oracle Java.
+- Addition of Debian 9 in supported versions.
+- Addition of OpenBSD case and use `realpath` rather than `readlink` in Java Default Home Facter fact.
+
+#### Removed
+- Removal of OpenBSD as a special case and deprecated `with_env` in Java Version Facter Facter fact.
+
+## 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
+
+A release which has several support additions for different OSes. Also a couple of additional features and a few bug fixes.
+
+#### Features
+- Added Ubuntu 15.10 compatibility.
+- Addition of two facts: java_libjvm_path and java_default_home.
+- Added support for oracle-j2re1.8 and oracle-j2sdk1.8.
+- Adds FreeBSD Support.
+- Exposed the Puppet package resources install_options parameter via a new class parameter named package_options.
+- Debian 8 support.
+- Add support for official Oracle Java SE jdk and jre packages for CentOS.
+- Use java 8 as the default on RHEL > 7.0.
+
+#### Bugfixes
+- Updated fixtures.yml to use git instead of http for stdlib.
+- Updates to current msync configs.
+- Small README updates and syntax error fixes.
+
+## Supported Release 1.4.3
+### Summary
+
+Small release for support of newer PE versions. This increments the version of PE in the metadata.json file.
+
+## 2015-10-07 - Supported Release 1.4.2
+### Summary
+This release fixes the fact to not trigger java every time on OS X when it is not available.
+
+#### Bugfixes
+- Causes java\_version fact to not run `java` when java is not installed on OS X
+
+## 2015-07-16 - Supported Release 1.4.1
+### Summary
+This release updates the metadata for the upcoming release of PE and update params for OEL to match metadata
+
+#### Bugfixes:
+- Add missing OEL to params
+
+## 2015-07-07 - Supported Release 1.4.0
+### Summary
+This release adds several new features, bugfixes, documentation updates, and test improvements.
+
+#### 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:
+- Fixes java_version fact to work on large systems. (MODULES-1749)
+- Improves maintainability of java_version fact.
+- Fixes java package names on Fedora 21+.
+- Fixes java install problems on Puppet 3.7.5 - 3.8.1 (PUP-4520)
+- 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
+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
+- Added RHEL support for alternatives
+- New facts
+  - java_major_version
+  - java_patch_level
+  - java_version
+- Add support for utopic
+
+#### Bugfixes
+- Use `--jre-headless` in the `update-java-alternatives` command when installed from a `headless` package
+
+## 2014-11-11 - Supported Version 1.2.0
+
+### Summary:
+This release adds SLES 12 support and is tested for Future Parser Support
+
+#### Bugfixes:
+- Several readme updates
+- Testcase flexability increased
+
+#### Features:
+- Add SLES 12 support
+- Future Parser tested
+- Validated against PE 3.7  
+
+## 2014-08-25 - Supported Version 1.1.2
+
+### Summary:
+This release begins the support coverage of the puppetlabs-java module.
+
+### Bugfixes:
+- Update java alternative values from deprecated names
+- Readme updated
+- Testing updated
+
+## 2014-05-02 - Version 1.1.1
+
+### Summary:
+
+Add support for new versions of Debian and Ubuntu!
+
+#### Features:
+- Add support for Ubuntu Trusty (14.04)
+- Add support for Debian Jessie (8.x)
+
+## 2014-01-06 - Version 1.1.0
+
+### Summary:
+
+Primarily a release for Ubuntu users!
+
+#### Features:
+- Add support for Ubuntu Saucy (13.10)
+- Add `java_home` parameter for centralized setting of JAVA_HOME.
+- Add Scientific Linux
+
+#### Bugfixes:
+- Plus signs are valid in debian/ubuntu package names.
+
+## 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
+
+#### Detailed Changes
+
+Krzysztof Suszyński <krzysztof.suszynski@coi.gov.pl>
+* Adding support for Oracle Enterprise Linux
+
+Peter Drake <pdrake@allplayers.com>
+* Add support for natty
+
+Robert Munteanu <rmuntean@adobe.com>
+* Add support for OpenSUSE
+
+Martin Jackson <martin@uncommonsense-uk.com>
+* Added support Amazon Linux using facter >= 1.7.x
+
+Gareth Rushgrove <gareth@morethanseven.net>
+Brett Porter <brett@apache.org>
+* Fixes for older versions of CentOS
+* Improvements to module build and tests
+
+Nathan R Valentine <nrvale0@gmail.com>
+* Add support for Ubuntu quantal and raring
+
+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
+Reid Vandewiele <reid@puppetlabs.com> -
+* Refactor, introduce params pattern
+
+## 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>
+* Add Debian based distro (Lucid) support
+
+## 2011-06-02 - Version 0.1.4
+Jeff McCune <jeff@puppetlabs.com>
+* Fix class composition ordering problems
+
+## 2011-05-28 - Version 0.1.3
+Jeff McCune <jeff@puppetlabs.com>
+* Remove stages
+
+## 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
+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>
+* Default to JDK version 6u25
+
+## 2011-05-24 - Version 0.0.1
+Jeff McCune <jeff@puppetlabs.com>
+* Initial release
+
+[2.3.0]:https://github.com/puppetlabs/puppetlabs-java/compare/2.2.0...2.3.0
+[2.2.0]:https://github.com/puppetlabs/puppetlabs-java/compare/2.1.1...2.2.0

NOTICE

@@ -1,6 +1,6 @@
 Puppet Module - puppetlabs-java
 
-Copyright 2017 Puppet, Inc.
+Copyright 2018 Puppet, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.markdown

@@ -70,96 +70,32 @@ java::oracle { 'jdk8' :
 }
 ```
 
+To install Oracle Java to a non-default basedir (defaults: /usr/lib/jvm for Debian; /usr/java for RedHat):
+```puppet
+java::oracle { 'jdk8' :
+  ensure  => 'present',
+  version_major => '8u101',
+  version_minor => 'b13',
+  java_se => 'jdk',
+  basedir => '/custom/java',
+}
+```
+
+To ensure that a custom basedir is a directory before Oracle Java is installed (note: manage separately for custom ownership or perms):
+```puppet
+java::oracle { 'jdk8' :
+  ensure  => 'present',
+  version_major => '8u101',
+  version_minor => 'b13',
+  java_se => 'jdk',
+  manage_basedir => true,
+  basedir => '/custom/java',
+}
+```
+
 ## Reference
 
-### Classes
+For information on the classes and types, see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-java/blob/master/REFERENCE.md). For information on the facts, see below.
-
-#### Public classes
-
-* `java`: Installs and manages the Java package.
-
-#### Private classes
-
-* `java::config`: Configures the Java alternatives.
-
-* `java::params`: Builds a hash of jdk/jre packages for all compatible operating systems.
-
-
-#### Parameters
-
-The following parameters are available in `java`:
-
-##### `distribution`
-
-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`.*
-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.
-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 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
-
-* `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
-
-The following parameters are available in `java::oracle`:
-
-##### `version`
-Version of Java Standard Edition (SE) to install. 6, 7 or 8.
-
-##### `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`
-
-Install or remove the package.
-
-##### `oracle_url`
-
-Official Oracle URL to download the 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)
-
-##### `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
 
@@ -175,7 +111,9 @@ The java module includes a few facts to describe the version of Java installed o
 
 ## Limitations
 
-This module cannot guarantee installation of Java versions that are not available on  platform repositories.
+For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-java/blob/master/metadata.json)
+
+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.
 
@@ -188,12 +126,11 @@ OpenJDK is supported on:
 * Red Hat Enterprise Linux (RHEL) 5, 6, 7
 * CentOS 5, 6, 7
 * Oracle Linux 6, 7
-* Scientific Linux 5, 6
+* Scientific Linux 6
-* Debian 6, 7
+* Debian 8, 9
-* Ubuntu 10.04, 12.04, 14.04
+* Ubuntu 14.04, 16.04, 18.04
 * Solaris 11
-* SLES 11 SP1, SP2, SP3, SP4; SLES 12, SP1, SP2
+* SLES 11, 12
-* OpenBSD 5.6, 5.7
 
 Sun Java is supported on:
 

REFERENCE.md

@@ -0,0 +1,257 @@
+# Reference
+<!-- DO NOT EDIT: This document was generated by Puppet Strings -->
+
+## Table of Contents
+
+**Classes**
+
+_Public Classes_
+
+* [`java`](#java): This module manages the Java runtime package
+
+_Private Classes_
+
+* `java::config`: 
+* `java::params`: This class builds a hash of JDK/JRE packages and (for Debian)
+alternatives.  For wheezy/precise, we provide Oracle JDK/JRE
+options, even though those are not in the package repositories.
+
+**Defined types**
+
+* [`java::oracle`](#javaoracle): Installs Oracle Java. By using this module you agree to the Oracle licensing
+agreement.
+
+## Classes
+
+### java
+
+This module manages the Java runtime package
+
+#### Parameters
+
+The following parameters are available in the `java` class.
+
+##### `distribution`
+
+Data type: `String`
+
+The java distribution to install. Can be one of "jdk" or "jre",
+or other platform-specific options where there are multiple
+implementations available (eg: OpenJDK vs Oracle JDK).
+
+Default value: 'jdk'
+
+##### `version`
+
+Data type: `Pattern[/present|installed|latest|^[.+_0-9a-zA-Z:~-]+$/]`
+
+The version of java to install. By default, this module simply ensures
+that java is present, and does not require a specific version.
+
+Default value: 'present'
+
+##### `package`
+
+Data type: `Optional[String]`
+
+The name of the java package. This is configurable in case a non-standard
+java package is desired.
+
+Default value: `undef`
+
+##### `package_options`
+
+Data type: `Optional[Array]`
+
+Array of strings to pass installation options to the 'package' Puppet resource.
+Options available depend on the 'package' provider for the target OS.
+
+Default value: `undef`
+
+##### `java_alternative`
+
+Data type: `Optional[String]`
+
+The name of the java alternative to use on Debian systems.
+"update-java-alternatives -l" will show which choices are available.
+If you specify a particular package, you will almost always also
+want to specify which java_alternative to choose. If you set
+this, you also need to set the path below.
+
+Default value: `undef`
+
+##### `java_alternative_path`
+
+Data type: `Optional[String]`
+
+The path to the "java" command on Debian systems. Since the
+alternatives system makes it difficult to verify which
+alternative is actually enabled, this is required to ensure the
+correct JVM is enabled.
+
+Default value: `undef`
+
+##### `java_home`
+
+Data type: `Optional[String]`
+
+The path to where the JRE is installed. This will be set as an
+environment variable.
+
+Default value: `undef`
+
+## Defined types
+
+### java::oracle
+
+Defined Type java::oracle
+
+Install one or more versions of Oracle Java.
+
+Uses the following to download the package and automatically accept
+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/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.tar.gz"
+```
+
+#### Parameters
+
+The following parameters are available in the `java::oracle` defined type.
+
+##### `ensure`
+
+Data type: `Any`
+
+Install or remove the package.
+
+Default value: 'present'
+
+##### `version`
+
+Data type: `Any`
+
+Version of Java to install, e.g. '7' or '8'. Default values for major and minor versions will be used.
+
+Default value: '8'
+
+##### `version_major`
+
+Data type: `Any`
+
+Major version which should be installed, e.g. '8u101'. Must be used together with version_minor.
+
+Default value: `undef`
+
+##### `version_minor`
+
+Data type: `Any`
+
+Minor version which should be installed, e.g. 'b12'. Must be used together with version_major.
+
+Default value: `undef`
+
+##### `java_se`
+
+Data type: `Any`
+
+Type of Java Standard Edition to install, jdk or jre.
+
+Default value: 'jdk'
+
+##### `oracle_url`
+
+Data type: `Any`
+
+Official Oracle URL to download binaries from.
+
+Default value: 'http://download.oracle.com/otn-pub/java/jdk/'
+
+##### `proxy_server`
+
+Data type: `Any`
+
+Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
+
+Default value: `undef`
+
+##### `proxy_type`
+
+Data type: `Any`
+
+Proxy server type (none|http|https|ftp). (passed to archive)
+
+Default value: `undef`
+
+##### `url`
+
+Data type: `Any`
+
+Full URL, including oracle_url, release_major, release_minor and package_name, to
+download the Oracle java_se installer. Originally present but not used, activated
+to workaround MODULES-5058.
+
+Default value: `undef`
+
+##### `url_hash`
+
+Data type: `Any`
+
+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.
+
+Default value: `undef`
+
+##### `jce`
+
+Data type: `Any`
+
+Install Oracles Java Cryptographic Extensions into the JRE or JDK
+
+Default value: `false`
+
+##### `basedir`
+
+Data type: `Any`
+
+Directory under which the installation will occur. If not set, defaults to
+/usr/lib/jvm for Debian and /usr/java for RedHat.
+
+Default value: `undef`
+
+##### `manage_basedir`
+
+Data type: `Any`
+
+Whether to manage the basedir directory.  Defaults to false.
+Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter.
+
+Default value: `false`
+
+##### `package_type`
+
+Data type: `Any`
+
+Type of installation package for specified version of java_se. java_se 6 comes
+in a few installation package flavors and we need to account for them.
+Optional forced package types: rpm, rpmbin, tar.gz
+
+Default value: `undef`
+
+##### `manage_symlink`
+
+Data type: `Any`
+
+Whether to manage a symlink that points to the installation directory.  Defaults to false.
+
+Default value: `false`
+
+##### `symlink_name`
+
+Data type: `Any`
+
+The name for the optional symlink in the installation directory.
+
+Default value: `undef`
+

Rakefile

@@ -1,37 +1,76 @@
 require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
+require 'puppet-syntax/tasks/puppet-syntax'
 require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
+require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
+require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?
 
-PuppetLint.configuration.fail_on_warnings = true
+def changelog_user
-PuppetLint.configuration.send('relative')
+  return unless Rake.application.top_level_tasks.include? "changelog"
-
+  returnVal = nil || JSON.load(File.read('metadata.json'))['author']
-desc 'Generate pooler nodesets'
+  raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil?
-task :gen_nodeset do
+  puts "GitHubChangelogGenerator user:#{returnVal}"
-  require 'beaker-hostgenerator'
+  returnVal
-  require 'securerandom'
-  require 'fileutils'
-
-  agent_target = ENV['TEST_TARGET']
-  if ! agent_target
-    STDERR.puts 'TEST_TARGET environment variable is not set'
-    STDERR.puts 'setting to default value of "redhat-64default."'
-    agent_target = 'redhat-64default.'
-  end
-
-  master_target = ENV['MASTER_TEST_TARGET']
-  if ! master_target
-    STDERR.puts 'MASTER_TEST_TARGET environment variable is not set'
-    STDERR.puts 'setting to default value of "redhat7-64mdcl"'
-    master_target = 'redhat7-64mdcl'
-  end
-
-  targets = "#{master_target}-#{agent_target}"
-  cli = BeakerHostGenerator::CLI.new([targets])
-  nodeset_dir = "tmp/nodesets"
-  nodeset = "#{nodeset_dir}/#{targets}-#{SecureRandom.uuid}.yaml"
-  FileUtils.mkdir_p(nodeset_dir)
-  File.open(nodeset, 'w') do |fh|
-    fh.print(cli.execute)
-  end
-  puts nodeset
 end
+
+def changelog_project
+  return unless Rake.application.top_level_tasks.include? "changelog"
+  returnVal = nil || JSON.load(File.read('metadata.json'))['name']
+  raise "unable to find the changelog_project in .sync.yml or the name in metadata.json" if returnVal.nil?
+  puts "GitHubChangelogGenerator project:#{returnVal}"
+  returnVal
+end
+
+def changelog_future_release
+  return unless Rake.application.top_level_tasks.include? "changelog"
+  returnVal = "v%s" % JSON.load(File.read('metadata.json'))['version']
+  raise "unable to find the future_release (version) in metadata.json" if returnVal.nil?
+  puts "GitHubChangelogGenerator future_release:#{returnVal}"
+  returnVal
+end
+
+PuppetLint.configuration.send('disable_relative')
+
+if Bundler.rubygems.find_name('github_changelog_generator').any?
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
+    config.user = "#{changelog_user}"
+    config.project = "#{changelog_project}"
+    config.future_release = "#{changelog_future_release}"
+    config.exclude_labels = ['maintenance']
+    config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
+    config.add_pr_wo_labels = true
+    config.issues = false
+    config.merge_prefix = "### UNCATEGORIZED PRS; GO LABEL THEM"
+    config.configure_sections = {
+      "Changed" => {
+        "prefix" => "### Changed",
+        "labels" => ["backwards-incompatible"],
+      },
+      "Added" => {
+        "prefix" => "### Added",
+        "labels" => ["feature", "enhancement"],
+      },
+      "Fixed" => {
+        "prefix" => "### Fixed",
+        "labels" => ["bugfix"],
+      },
+    }
+  end
+else
+  desc 'Generate a Changelog from GitHub'
+  task :changelog do
+    raise <<EOM
+The changelog tasks depends on unreleased features of the github_changelog_generator gem.
+Please manually add it to your .sync.yml for now, and run `pdk update`:
+---
+Gemfile:
+  optional:
+    ':development':
+      - gem: 'github_changelog_generator'
+        git: 'https://github.com/skywinder/github-changelog-generator'
+        ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
+        condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
+EOM
+  end
+end
+

lib/facter/java_default_home.rb

@@ -11,7 +11,7 @@
 # Notes:
 #   None
 Facter.add(:java_default_home) do
-  confine kernel: %w[Linux OpenBSD]
+  confine kernel: ['Linux', 'OpenBSD']
   java_default_home = nil
   setcode do
     java_bin = Facter::Util::Resolution.which('java').to_s.strip

lib/facter/java_libjvm_path.rb

@@ -11,7 +11,7 @@
 # Notes:
 #   None
 Facter.add(:java_libjvm_path) do
-  confine kernel: %w[Linux OpenBSD]
+  confine kernel: ['Linux', 'OpenBSD']
   setcode do
     java_default_home = Facter.value(:java_default_home)
     java_libjvm_file = Dir.glob("#{java_default_home}/jre/lib/**/libjvm.so")

manifests/config.pp

@@ -1,4 +1,4 @@
-# On Debian systems, if alternatives are set, manually assign them.
+# @api private
 class java::config ( ) {
   case $::osfamily {
     'Debian': {
@@ -44,7 +44,7 @@ class java::config ( ) {
         }
       }
     }
-    'FreeBSD', 'Suse': {
+    'Suse': {
       if $java::use_java_home != undef {
         file_line { 'java-home-environment':
           path  => '/etc/environment',
@@ -53,6 +53,20 @@ class java::config ( ) {
         }
       }
     }
+    'FreeBSD': {
+      if $java::use_java_home != undef {
+        file_line { 'java-home-environment-profile':
+          path  => '/etc/profile',
+          line  => "JAVA_HOME=${$java::use_java_home}; export JAVA_HOME",
+          match => 'JAVA_HOME=',
+        }
+        file_line { 'java-home-environment-cshrc':
+          path  => '/etc/csh.login',
+          line  => "setenv JAVA_HOME ${$java::use_java_home}",
+          match => 'setenv JAVA_HOME',
+        }
+      }
+    }
     'Solaris': {
       if $java::use_java_home != undef {
         file_line { 'java-home-environment':

manifests/init.pp

@@ -1,49 +1,40 @@
-# Class: java
+# @summary
+#   This module manages the Java runtime package
 #
-# This module manages the Java runtime package
+# @param distribution
-#
-# Parameters:
-#
-#  [*distribution*]
 #    The java distribution to install. Can be one of "jdk" or "jre",
 #    or other platform-specific options where there are multiple
 #    implementations available (eg: OpenJDK vs Oracle JDK).
 #
-#  [*version*]
+# @param version
 #    The version of java to install. By default, this module simply ensures
 #    that java is present, and does not require a specific version.
 #
-#  [*package*]
+# @param package
 #    The name of the java package. This is configurable in case a non-standard
 #    java package is desired.
 #
-#  [*package_options*]
+# @param package_options
 #    Array of strings to pass installation options to the 'package' Puppet resource.
 #    Options available depend on the 'package' provider for the target OS.
 #
-#  [*java_alternative*]
+# @param java_alternative
 #    The name of the java alternative to use on Debian systems.
 #    "update-java-alternatives -l" will show which choices are available.
 #    If you specify a particular package, you will almost always also
 #    want to specify which java_alternative to choose. If you set
 #    this, you also need to set the path below.
 #
-#  [*java_alternative_path*]
+# @param java_alternative_path
 #    The path to the "java" command on Debian systems. Since the
 #    alternatives system makes it difficult to verify which
 #    alternative is actually enabled, this is required to ensure the
 #    correct JVM is enabled.
 #
-#  [*java_home*]
+# @param java_home
 #    The path to where the JRE is installed. This will be set as an
 #    environment variable.
 #
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
 class java(
   String $distribution                                              = 'jdk',
   Pattern[/present|installed|latest|^[.+_0-9a-zA-Z:~-]+$/] $version = 'present',

manifests/oracle.pp

@@ -1,132 +1,143 @@
 # Defined Type java::oracle
 #
-# Description
+# @summary
-# Installs Oracle Java. By using this module you agree to the Oracle licensing
+#   Installs Oracle Java. By using this module you agree to the Oracle licensing
-# agreement.
+#   agreement.
 #
 # Install one or more versions of Oracle Java.
 #
-# uses the following to download the package and automatically accept
+# Uses the following to download the package and automatically accept
-# the licensing terms.
+# 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/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.tar.gz"
+#```
 #
-# Parameters
+# @param ensure
-# [*version*]
+#   Install or remove the package.
-# Version of Java to install, e.g. '7' or '8'. Default values for major and minor
-# versions will be used.
 #
-# [*version_major*]
+# @param version
-# Major version which should be installed, e.g. '8u101'. Must be used together with
+#   Version of Java to install, e.g. '7' or '8'. Default values for major and minor versions will be used.
-# version_minor.
 #
-# [*version_minor*]
+# @param version_major
-# Minor version which should be installed, e.g. 'b12'. Must be used together with
+#   Major version which should be installed, e.g. '8u101'. Must be used together with version_minor.
-# version_major.
 #
-# [*java_se*]
+# @param version_minor
-# Type of Java Standard Edition to install, jdk or jre.
+#   Minor version which should be installed, e.g. 'b12'. Must be used together with version_major.
 #
-# [*ensure*]
+# @param java_se
-# Install or remove the package.
+#   Type of Java Standard Edition to install, jdk or jre.
 #
-# [*oracle_url*]
+# @param oracle_url
-# Official Oracle URL to download binaries from.
+#   Official Oracle URL to download binaries from.
 #
-# [*proxy_server*]
+# @param proxy_server
-# Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
+#   Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
 #
-# [*proxy_type*]
+# @param proxy_type
-# Proxy server type (none|http|https|ftp). (passed to archive)
+#   Proxy server type (none|http|https|ftp). (passed to archive)
 #
-# Variables
+# @param url
-# [*release_major*]
+#   Full URL, including oracle_url, release_major, release_minor and package_name, to
-# Major version release number for java_se. Used to construct download URL.
+#   download the Oracle java_se installer. Originally present but not used, activated
+#   to workaround MODULES-5058.
 #
-# [*release_minor*]
+# @param url_hash
-# Minor version release number for java_se. Used to construct download URL.
+#   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.
 #
-# [*install_path*]
+# @param jce
-# Base install path for specified version of java_se. Used to determine if java_se
+#   Install Oracles Java Cryptographic Extensions into the JRE or JDK
-# has already been installed.
 #
-# [*package_type*]
+# @param jce_url
-# Type of installation package for specified version of java_se. java_se 6 comes
+#   Full URL to the jce zip file
-# in a few installation package flavors and we need to account for them.
 #
-# [*os*]
+# @param basedir
-# Oracle java_se OS type.
+#   Directory under which the installation will occur. If not set, defaults to
+#   /usr/lib/jvm for Debian and /usr/java for RedHat.
 #
-# [*destination*]
+# @param manage_basedir
-# Destination directory to save java_se installer to.  Usually /tmp on Linux and
+#   Whether to manage the basedir directory.  Defaults to false.
-# C:\TEMP on Windows.
+#   Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter.
 #
-# [*creates_path*]
+# @param package_type
-# Fully qualified path to java_se after it is installed. Used to determine if
+#   Type of installation package for specified version of java_se. java_se 6 comes
-# java_se is already installed.
+#   in a few installation package flavors and we need to account for them.
+#   Optional forced package types: rpm, rpmbin, tar.gz
 #
-# [*arch*]
+# @param manage_symlink
-# Oracle java_se architecture type.
+#   Whether to manage a symlink that points to the installation directory.  Defaults to false.
 #
-# [*package_name*]
+# @param symlink_name
-# Name of the java_se installation package to download from Oracle's website.
+#   The name for the optional symlink in the installation directory.
-#
-# [*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 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. 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',
+  $ensure         = 'present',
-  $version       = '8',
+  $version        = '8',
-  $version_major = undef,
+  $version_major  = undef,
-  $version_minor = undef,
+  $version_minor  = undef,
-  $java_se       = 'jdk',
+  $java_se        = 'jdk',
-  $oracle_url    = 'http://download.oracle.com/otn-pub/java/jdk/',
+  $oracle_url     = 'http://download.oracle.com/otn-pub/java/jdk/',
-  $proxy_server  = undef,
+  $proxy_server   = undef,
-  $proxy_type    = undef,
+  $proxy_type     = undef,
-  $url           = undef,
+  $url            = undef,
-  $url_hash      = undef,
+  $url_hash       = undef,
+  $jce            = false,
+  $jce_url        = undef,
+  $basedir        = undef,
+  $manage_basedir = false,
+  $package_type   = undef,
+  $manage_symlink = false,
+  $symlink_name   = undef,
 ) {
 
   # archive module is used to download the java package
   include ::archive
 
-  ensure_resource('class', 'stdlib')
-
   # validate java Standard Edition to download
   if $java_se !~ /(jre|jdk)/ {
     fail('Java SE must be either jre or jdk.')
   }
 
+  if $jce {
+    if $jce_url {
+      $jce_download = $jce_url
+      $cookie = undef
+    } else {
+      $jce_download = $version ? {
+        '8'     => 'http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip',
+        '7'     => 'http://download.oracle.com/otn-pub/java/jce/7/UnlimitedJCEPolicyJDK7.zip',
+        '6'     => 'http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip',
+        default => undef
+      }
+      $cookie = 'gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie'
+    }
+  }
+
   # determine Oracle Java major and minor version, and installation path
   if $version_major and $version_minor {
 
+    $label         = $version_major
     $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}"
+      # Required for CentOS systems where Java8 update number is >= 171 to ensure
+      # the package is visible to Puppet. This is only true for installations that
+      # don't use the tar.gz package type.
+      if $facts['os']['family'] == 'RedHat' and $2 >= '171' and $package_type != 'tar.gz' {
+        $install_path = "${java_se}1.${1}.0_${2}-amd64"
+      } else {
+        $install_path = "${java_se}1.${1}.0_${2}"
+      }
     } else {
       $install_path = "${java_se}${release_major}${release_minor}"
     }
   } else {
     # use default versions if no specific major and minor version parameters are provided
+    $label = $version
     case $version {
       '6' : {
         $release_major = '6u45'
@@ -141,16 +152,16 @@ define java::oracle (
         $release_hash  = undef
       }
       '8' : {
-        $release_major = '8u131'
+        $release_major = '8u201'
-        $release_minor = 'b11'
+        $release_minor = 'b09'
-        $install_path = "${java_se}1.8.0_131"
+        $install_path = "${java_se}1.8.0_201"
-        $release_hash  = 'd54c1d3a095b4ff2b6607d096fa80163'
+        $release_hash  = '42970487e3af4f5aa5bca3f542482c60'
       }
       default : {
-        $release_major = '8u131'
+        $release_major = '8u201'
-        $release_minor = 'b11'
+        $release_minor = 'b09'
-        $install_path = "${java_se}1.8.0_131"
+        $install_path = "${java_se}1.8.0_201"
-        $release_hash  = 'd54c1d3a095b4ff2b6607d096fa80163'
+        $release_hash  = '42970487e3af4f5aa5bca3f542482c60'
       }
     }
   }
@@ -161,21 +172,36 @@ define java::oracle (
       case $facts['os']['family'] {
         'RedHat', 'Amazon' : {
           # Oracle Java 6 comes in a special rpmbin format
-          if $version == '6' {
+          if $package_type {
-            $package_type = 'rpmbin'
+            $_package_type = $package_type
+          } elsif $version == '6' {
+            $_package_type = 'rpmbin'
           } else {
-            $package_type = 'rpm'
+            $_package_type = 'rpm'
+          }
+          if $basedir {
+            $_basedir = $basedir
+          } else {
+            $_basedir = '/usr/java'
           }
-          $creates_path = "/usr/java/${install_path}"
         }
         'Debian' : {
-            $package_type = 'tar.gz'
+          if $package_type {
-            $creates_path = "/usr/lib/jvm/${install_path}"
+            $_package_type = $package_type
+          } else {
+            $_package_type = 'tar.gz'
+          }
+          if $basedir {
+            $_basedir = $basedir
+          } else {
+            $_basedir = '/usr/lib/jvm'
+          }
         }
         default : {
           fail ("unsupported platform ${$facts['os']['name']}") }
       }
 
+      $creates_path = "${_basedir}/${install_path}"
       $os = 'linux'
       $destination_dir = '/tmp/'
     }
@@ -183,13 +209,23 @@ define java::oracle (
       fail ( "unsupported platform ${$facts['kernel']}" ) }
   }
 
+  # Install required unzip packages for jce
+  if $jce {
+    ensure_resource('package', 'unzip', { 'ensure' => 'present' })
+  }
+
   # set java architecture nomenclature
-  case $facts['os']['architecture'] {
+  $os_architecture = $facts['os']['architecture'] ? {
+    undef => $facts['architecture'],
+    default => $facts['os']['architecture']
+  }
+
+  case $os_architecture {
     'i386' : { $arch = 'i586' }
     'x86_64' : { $arch = 'x64' }
     'amd64' : { $arch = 'x64' }
     default : {
-      fail ("unsupported platform ${$facts['os']['architecture']}")
+      fail ("unsupported platform ${$os_architecture}")
     }
   }
 
@@ -200,7 +236,7 @@ define java::oracle (
   # 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 {
+  case $_package_type {
     'bin' : {
       $package_name = "${java_se}-${release_major}-${os}-${arch}.bin"
     }
@@ -233,7 +269,7 @@ define java::oracle (
   $destination = "${destination_dir}${package_name}"
   notice ("Destination is ${destination}")
 
-  case $package_type {
+  case $_package_type {
     'bin' : {
       $install_command = "sh ${destination}"
     }
@@ -244,7 +280,7 @@ define java::oracle (
       $install_command = "rpm --force -iv ${destination}"
     }
     'tar.gz' : {
-      $install_command = "tar -zxf ${destination} -C /usr/lib/jvm"
+      $install_command = "tar -zxf ${destination} -C ${_basedir}"
     }
     default : {
       $install_command = "rpm -iv ${destination}"
@@ -265,20 +301,57 @@ define java::oracle (
       }
       case $facts['kernel'] {
         'Linux' : {
-          exec { "Install Oracle java_se ${java_se} ${version}" :
+          case $facts['os']['family'] {
+            'Debian' : {
+              ensure_resource('file', $_basedir, {
+                ensure => directory,
+              })
+              $install_requires = [Archive[$destination], File[$_basedir]]
+            }
+            default : {
+              $install_requires = [Archive[$destination]]
+            }
+          }
+
+          if $manage_basedir {
+            ensure_resource('file', $_basedir, {'ensure' => 'directory', 'before' => Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"]})
+          }
+
+          exec { "Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}" :
             path    => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
             command => $install_command,
             creates => $creates_path,
-            require => Archive[$destination]
+            require => $install_requires
           }
-          case $facts['os']['family'] {
+
-            'Debian' : {
+          if ($manage_symlink and $symlink_name) {
-              file{'/usr/lib/jvm':
+            file { "${_basedir}/${symlink_name}":
-                ensure => directory,
+              ensure  => link,
-                before => Exec["Install Oracle java_se ${java_se} ${version}"]
+              target  => $creates_path,
-              }
+              require => Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"]
+            }
+          }
+
+          if ($jce and $jce_download != undef) {
+            $jce_path = $java_se ? {
+              'jre' => "${creates_path}/lib/security",
+              'jdk' => "${creates_path}/jre/lib/security"
+            }
+            archive { "/tmp/jce-${version}.zip":
+              source        => $jce_download,
+              cookie        => $cookie,
+              extract       => true,
+              extract_path  => $jce_path,
+              extract_flags => '-oj',
+              creates       => "${jce_path}/US_export_policy.jar",
+              cleanup       => false,
+              proxy_server  => $proxy_server,
+              proxy_type    => $proxy_type,
+              require       => [
+                Package['unzip'],
+                Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"]
+              ]
             }
-            default : { }
           }
         }
         default : {
@@ -290,5 +363,4 @@ define java::oracle (
       notice ("Action ${ensure} not supported.")
     }
   }
-
+}
-}

manifests/params.pp

@@ -1,15 +1,9 @@
-# Class: java::params
+# @summary
+#   This class builds a hash of JDK/JRE packages and (for Debian)
+#   alternatives.  For wheezy/precise, we provide Oracle JDK/JRE
+#   options, even though those are not in the package repositories.
 #
-# This class builds a hash of JDK/JRE packages and (for Debian)
+# @api private
-# alternatives.  For wheezy/precise, we provide Oracle JDK/JRE
-# options, even though those are not in the package repositories.
-#
-# For more info on how to package Oracle JDK/JRE, see the Debian wiki:
-# http://wiki.debian.org/JavaPackage
-#
-# Because the alternatives system makes it very difficult to tell
-# which Java alternative is enabled, we hard code the path to bin/java
-# for the config class to test if it is enabled.
 class java::params {
 
   case $::osfamily {
@@ -74,18 +68,23 @@ class java::params {
         'amd64' => 'x64',
         default => $::architecture
       }
+      $openjdk_architecture = $::architecture ? {
+        'aarch64' => 'arm64',
+        'armv7l'  => 'armhf',
+        default   => $::architecture
+      }
       case $::lsbdistcodename {
         'lenny', 'squeeze', 'lucid', 'natty': {
           $java  = {
             'jdk' => {
               'package'          => 'openjdk-6-jdk',
-              'alternative'      => "java-6-openjdk-${::architecture}",
+              'alternative'      => "java-6-openjdk-${openjdk_architecture}",
               'alternative_path' => '/usr/lib/jvm/java-6-openjdk/jre/bin/java',
               'java_home'        => '/usr/lib/jvm/java-6-openjdk/jre/',
             },
             'jre' => {
               'package'          => 'openjdk-6-jre-headless',
-              'alternative'      => "java-6-openjdk-${::architecture}",
+              'alternative'      => "java-6-openjdk-${openjdk_architecture}",
               'alternative_path' => '/usr/lib/jvm/java-6-openjdk/jre/bin/java',
               'java_home'        => '/usr/lib/jvm/java-6-openjdk/jre/',
             },
@@ -107,15 +106,15 @@ class java::params {
           $java =  {
             'jdk' => {
               'package'          => 'openjdk-7-jdk',
-              'alternative'      => "java-1.7.0-openjdk-${::architecture}",
+              'alternative'      => "java-1.7.0-openjdk-${openjdk_architecture}",
-              'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/bin/java",
+              'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${openjdk_architecture}/bin/java",
-              'java_home'        => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/",
+              'java_home'        => "/usr/lib/jvm/java-1.7.0-openjdk-${openjdk_architecture}/",
             },
             'jre' => {
               'package'          => 'openjdk-7-jre-headless',
               'alternative'      => "java-1.7.0-openjdk-${::architecture}",
-              'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/bin/java",
+              'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${openjdk_architecture}/bin/java",
-              'java_home'        => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/",
+              'java_home'        => "/usr/lib/jvm/java-1.7.0-openjdk-${openjdk_architecture}/",
             },
             'oracle-jre' => {
               'package'          => 'oracle-j2re1.7',
@@ -155,19 +154,35 @@ class java::params {
             },
           }
         }
-        'stretch', 'vivid', 'wily', 'xenial', 'yakkety', 'zesty', 'artful', 'bionic': {
+        'stretch', 'vivid', 'wily', 'xenial', 'yakkety', 'zesty', 'artful': {
           $java =  {
             'jdk' => {
               'package'          => 'openjdk-8-jdk',
-              'alternative'      => "java-1.8.0-openjdk-${::architecture}",
+              'alternative'      => "java-1.8.0-openjdk-${openjdk_architecture}",
-              'alternative_path' => "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/bin/java",
+              'alternative_path' => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/bin/java",
-              'java_home'        => "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/",
+              'java_home'        => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/",
             },
             'jre' => {
               'package'          => 'openjdk-8-jre-headless',
-              'alternative'      => "java-1.8.0-openjdk-${::architecture}",
+              'alternative'      => "java-1.8.0-openjdk-${openjdk_architecture}",
-              'alternative_path' => "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/bin/java",
+              'alternative_path' => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/bin/java",
-              'java_home'        => "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/",
+              'java_home'        => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/",
+            }
+          }
+        }
+        'bionic': {
+          $java =  {
+            'jdk' => {
+              'package'          => 'openjdk-11-jdk',
+              'alternative'      => "java-1.11.0-openjdk-${openjdk_architecture}",
+              'alternative_path' => "/usr/lib/jvm/java-1.11.0-openjdk-${openjdk_architecture}/bin/java",
+              'java_home'        => "/usr/lib/jvm/java-1.11.0-openjdk-${openjdk_architecture}/",
+            },
+            'jre' => {
+              'package'          => 'openjdk-11-jre-headless',
+              'alternative'      => "java-1.11.0-openjdk-${openjdk_architecture}",
+              'alternative_path' => "/usr/lib/jvm/java-1.11.0-openjdk-${openjdk_architecture}/bin/java",
+              'java_home'        => "/usr/lib/jvm/java-1.11.0-openjdk-${openjdk_architecture}/",
             }
           }
         }
@@ -224,7 +239,7 @@ class java::params {
           } 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/'
+            $java_home   = '/usr/lib64/jvm/java-1.7.1-ibm-1.7.1/'
           } else {
             $jdk_package = 'java-1_6_0-ibm-devel'
             $jre_package = 'java-1_6_0-ibm'

metadata.json

@@ -1,12 +1,22 @@
 {
   "name": "puppetlabs-java",
-  "version": "2.3.0",
+  "version": "4.0.0",
   "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.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",
+  "dependencies": [
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 4.13.1 < 7.0.0"
+    },
+    {
+      "name": "puppet/archive",
+      "version_requirement": ">= 1.1.0 < 4.0.0"
+    }
+  ],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
@@ -34,22 +44,12 @@
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
-        "5",
         "6"
       ]
     },
-    {
-      "operatingsystem": "Fedora",
-      "operatingsystemrelease": [
-        "20",
-        "21",
-        "22"
-      ]
-    },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
@@ -58,42 +58,26 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "14.04",
-        "16.04"
+        "16.04",
+        "18.04"
       ]
     },
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
-        "11 SP1",
+        "11",
-        "11 SP2",
-        "11 SP3",
-        "11 SP4",
         "12",
-        "12 SP1",
+        "15"
-        "12 SP2"
-      ]
-    },
-    {
-      "operatingsystem": "Solaris",
-      "operatingsystemrelease": [
-        "11"
       ]
     }
   ],
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.7.0 < 6.0.0"
+      "version_requirement": ">= 5.5.10 < 7.0.0"
     }
   ],
-  "dependencies": [
+  "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-    {
+  "template-ref": "heads/master-0-gf778803",
-      "name":"puppetlabs/stdlib",
+  "pdk-version": "1.10.0"
-      "version_requirement": ">= 4.13.1 < 5.0.0"
-    },
-    {
-      "name":"puppet/archive",
-      "version_requirement": ">= 1.1.0 < 3.0.0"
-    }
-  ]
 }

spec/acceptance/install_spec.rb

@@ -1,31 +1,6 @@
 require 'spec_helper_acceptance'
 
-# RedHat, CentOS, Scientific, Oracle prior to 5.0  : Sun Java JDK/JRE 1.6
+include Unix::File
-# RedHat, CentOS, Scientific, Oracle 5.0 < x < 6.3 : OpenJDK Java JDK/JRE 1.6
-# RedHat, CentOS, Scientific, Oracle after 6.3     : OpenJDK Java JDK/JRE 1.7
-# Debian 5/6 & Ubuntu 10.04/11.04                  : OpenJDK Java JDK/JRE 1.6 or Sun Java JDK/JRE 1.6
-# Debian 7/Jesse & Ubuntu 12.04 - 14.04            : OpenJDK Java JDK/JRE 1.7 or Oracle Java JDK/JRE 1.6
-# Solaris (what versions?)                         : Java JDK/JRE 1.7
-# OpenSuSE                                         : OpenJDK Java JDK/JRE 1.7
-# SLES                                             : IBM Java JDK/JRE 1.6
-
-# C14677
-# C14678
-# C14679
-# C14680
-# C14681
-# C14682
-# C14684
-# C14687
-# C14692
-# C14696
-# C14697
-# C14700 check on solaris 11
-# C14701 check on sles 11
-# C14703
-# C14723 Where is oracle linux 5?
-# C14724 Where is oracle linux 5?
-# C14771 Where is redhat 7? Centos 7?
 
 java_class_jre = "class { 'java':\n"\
                  "  distribution => 'jre',\n"\
@@ -33,17 +8,17 @@ java_class_jre = "class { 'java':\n"\
 
 java_class = "class { 'java': }"
 
-sources = "file_line { 'non-free source':\n"\
+_sources = "file_line { 'non-free source':\n"\
           "  path  => '/etc/apt/sources.list',\n"\
           "  match => \"deb http://osmirror.delivery.puppetlabs.net/debian/ ${::lsbdistcodename} main\",\n"\
           "  line  => \"deb http://osmirror.delivery.puppetlabs.net/debian/ ${::lsbdistcodename} main non-free\",\n"\
           '}'
 
-sun_jre = "class { 'java':\n"\
+_sun_jre = "class { 'java':\n"\
           "  distribution => 'sun-jre',\n"\
           '}'
 
-sun_jdk = "class { 'java':\n"\
+_sun_jdk = "class { 'java':\n"\
           "  distribution => 'sun-jdk',\n"\
           '}'
 
@@ -55,10 +30,6 @@ oracle_jdk = "class { 'java':\n"\
              "  distribution => 'oracle-jdk',\n"\
              '}'
 
-incorrect_version = "class { 'java':\n"\
-                    " version => '14.5',\n"\
-                    '}'
-
 blank_version = "class { 'java':\n"\
                 "  version => '',\n"\
                 '}'
@@ -80,59 +51,73 @@ bogus_alternative = "class { 'java':\n"\
                     "  java_alternative_path => '/whatever',\n"\
                     '}'
 
-def apply_manifest_wheezy_case(pp)
+# Oracle installs are disabled by default, because the links to valid oracle installations
-  # With the version of java that ships with pe on debian wheezy, update-alternatives
+# change often. Look the parameters up from the Oracle download URLs at https://java.oracle.com and
-  # throws an error on the first run due to missing alternative for policytool. It still
+# enable the tests:
-  # updates the alternatives for java
+
-  if fact('operatingsystem') == 'Debian' && fact('lsbdistcodename') == 'wheezy'
+oracle_enabled = false
-    apply_manifest(pp)
+oracle_version_major = '8'
-  else
+oracle_version_minor = '201'
-    apply_manifest(pp, catch_failures: true)
+oracle_version_build = '09'
-  end
+oracle_hash = '42970487e3af4f5aa5bca3f542482c60'
-end
+
+install_oracle_jdk_jre = <<EOL
+  java::oracle {
+    'test_oracle_jre':
+      version       => '#{oracle_version_major}',
+      version_major => '#{oracle_version_major}u#{oracle_version_minor}',
+      version_minor => 'b#{oracle_version_build}',
+      url_hash      => '#{oracle_hash}',
+      java_se       => 'jre',
+  }
+  java::oracle {
+    'test_oracle_jdk':
+      version       => '#{oracle_version_major}',
+      version_major => '#{oracle_version_major}u#{oracle_version_minor}',
+      version_minor => 'b#{oracle_version_build}',
+      url_hash      => '#{oracle_hash}',
+      java_se       => 'jdk',
+  }
+EOL
+
+install_oracle_jre_jce = <<EOL
+  java::oracle {
+    'test_oracle_jre':
+      version       => '#{oracle_version_major}',
+      version_major => '#{oracle_version_major}u#{oracle_version_minor}',
+      version_minor => 'b#{oracle_version_build}',
+      url_hash      => '#{oracle_hash}',
+      java_se       => 'jre',
+      jce           => true,
+  }
+
+EOL
+
+install_oracle_jdk_jce = <<EOL
+  java::oracle {
+    'test_oracle_jdk':
+      version       => '#{oracle_version_major}',
+      version_major => '#{oracle_version_major}u#{oracle_version_minor}',
+      version_minor => 'b#{oracle_version_build}',
+      url_hash      => '#{oracle_hash}',
+      java_se       => 'jdk',
+      jce           => true,
+  }
+EOL
 
 context 'installing java jre', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   it 'installs jre' do
-    apply_manifest_wheezy_case(java_class_jre)
+    idempotent_apply(default, java_class_jre)
-    apply_manifest(java_class_jre, catch_changes: true)
   end
 end
 
 context 'installing java jdk', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   it 'installs jdk' do
-    apply_manifest(java_class, catch_failures: true)
+    idempotent_apply(default, java_class)
-    apply_manifest(java_class, catch_changes: true)
   end
 end
 
-# C14686
-context 'sun', if: (fact('operatingsystem') == 'Debian' && fact('operatingsystemrelease').match(%r{(5|6)})) do
-  before :all do
-    apply_manifest(sources)
-    shell('apt-get update')
-    shell('echo "sun-java6-jdk shared/accepted-sun-dlj-v1-1 select true" | debconf-set-selections')
-    shell('echo "sun-java6-jre shared/accepted-sun-dlj-v1-1 select true" | debconf-set-selections')
-  end
-  describe 'jre' do
-    it 'installs sun-jre' do
-      apply_manifest(sun_jre, catch_failures: true)
-      apply_manifest(sun_jre, catch_changes: true)
-    end
-  end
-  describe 'jdk' do
-    it 'installs sun-jdk' do
-      apply_manifest(sun_jdk, catch_failures: true)
-      apply_manifest(sun_jdk, catch_changes: true)
-    end
-  end
-end
-
-# C14704
-# C14705
-# C15006
 context 'oracle', if: (
-  (fact('operatingsystem') == 'Debian') && fact('operatingsystemrelease').match(%r{^7}) ||
-  (fact('operatingsystem') == 'Ubuntu') && fact('operatingsystemrelease').match(%r{^12\.04}) ||
   (fact('operatingsystem') == 'Ubuntu') && fact('operatingsystemrelease').match(%r{^14\.04})
 ) do
   # not supported
@@ -151,38 +136,23 @@ context 'oracle', if: (
   end
 end
 
-context 'failure cases' do
+context 'with failure cases' do
-  # C14711
-  # SLES 10 returns an exit code of 0 on zypper failure
-  unless fact('operatingsystem') == 'SLES' && fact('operatingsystemrelease') < '11'
-    it 'fails to install java with an incorrect version' do
-      apply_manifest(incorrect_version, expect_failures: true)
-    end
-  end
-
-  # C14712
   it 'fails to install java with a blank version' do
     apply_manifest(blank_version, expect_failures: true)
   end
 
-  # C14713
   it 'fails to install java with an incorrect distribution' do
     apply_manifest(incorrect_distro, expect_failures: true)
   end
 
-  # C14714
   it 'fails to install java with a blank distribution' do
     apply_manifest(blank_distro, expect_failures: true)
   end
 
-  # C14715
   it 'fails to install java with an incorrect package' do
     apply_manifest(incorrect_package, expect_failures: true)
   end
 
-  # C14717
-  # C14719
-  # C14725
   it 'fails on debian or RHEL when passed fake java_alternative and path' do
     if fact('osfamily') == 'Debian' || fact('osfamily') == 'RedHat'
       apply_manifest(bogus_alternative, expect_failures: true)
@@ -191,3 +161,33 @@ context 'failure cases' do
     end
   end
 end
+
+context 'java::oracle', if: oracle_enabled, unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+  let(:install_path) do
+    (fact('osfamily') == 'RedHat') ? '/usr/java' : '/usr/lib/jvm'
+  end
+
+  let(:version_suffix) do
+    (fact('osfamily') == 'RedHat') ? '-amd64' : ''
+  end
+
+  it 'installs oracle jdk and jre' do
+    idempotent_apply(default, install_oracle_jdk_jre)
+    jdk_result = shell("test ! -e #{install_path}/jdk1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/jre/lib/security/local_policy.jar")
+    jre_result = shell("test ! -e #{install_path}/jre1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/lib/security/local_policy.jar")
+    expect(jdk_result.exit_code).to eq(0)
+    expect(jre_result.exit_code).to eq(0)
+  end
+
+  it 'installs oracle jdk with jce' do
+    idempotent_apply(default, install_oracle_jdk_jce)
+    result = shell("test -e #{install_path}/jdk1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/jre/lib/security/local_policy.jar")
+    expect(result.exit_code).to eq(0)
+  end
+
+  it 'installs oracle jre with jce' do
+    idempotent_apply(default, install_oracle_jre_jce)
+    result = shell("test -e #{install_path}/jre1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/lib/security/local_policy.jar")
+    expect(result.exit_code).to eq(0)
+  end
+end

spec/classes/java_spec.rb

@@ -1,35 +1,35 @@
 require 'spec_helper'
 
 describe 'java', type: :class do
-  context 'select openjdk for Centos 5.8' do
+  context 'when select openjdk for Centos 5.8' do
     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
+  context 'when select openjdk for Centos 6.3' do
     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
+  context 'when select openjdk for Centos 7.1.1503' do
     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
+  context 'when select openjdk for Centos 6.2' do
     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.not_to contain_exec('update-java-alternatives') }
   end
 
-  context 'select Oracle JRE with alternatives for Centos 6.3' do
+  context 'when select Oracle JRE with alternatives for Centos 6.3' do
     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' } }
 
@@ -38,44 +38,7 @@ describe 'java', type: :class do
     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
+  context 'when select passed value for Centos 5.3' do
-    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', 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', 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', 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', architecture: 'x86_64' } }
-    let(:params) { { 'distribution' => 'jre', 'package_options' => ['--skip-broken'] } }
-
-    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', architecture: 'x86_64' } }
     let(:params) { { 'package' => 'jdk', 'java_home' => '/usr/local/lib/jre' } }
 
@@ -83,138 +46,65 @@ describe 'java', type: :class do
     it { is_expected.not_to contain_exec('update-java-alternatives') }
   end
 
-  context 'select default for Centos 5.3' do
+  context 'when select default for Centos 5.3' do
     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.not_to contain_exec('update-java-alternatives') }
   end
 
-  context 'select default for Debian Wheezy' do
+  context 'when select jdk for Ubuntu Trusty (14.04)' do
-    let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'wheezy', operatingsystemrelease: '7.1', architecture: 'amd64' } }
+    let(:facts) { { osfamily: 'Debian', operatingsystem: 'Ubuntu', lsbdistcodename: 'trusty', operatingsystemrelease: '14.04', architecture: 'amd64' } }
+    let(:params) { { 'distribution' => 'jdk' } }
 
     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
+  context 'when select jre for Ubuntu Trusty (14.04)' do
-    let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'wheezy', operatingsystemrelease: '7.1', architecture: 'amd64' } }
+    let(:facts) { { osfamily: 'Debian', operatingsystem: 'Ubuntu', lsbdistcodename: 'trusty', operatingsystemrelease: '14.04', architecture: 'amd64' } }
-    let(:params) { { 'distribution' => '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 { 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
+  context 'when select jdk for Ubuntu xenial (16.04) on ARM' do
-    let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'squeeze', operatingsystemrelease: '6.0.5', architecture: 'amd64' } }
+    let(:facts) { { osfamily: 'Debian', operatingsystem: 'Ubuntu', lsbdistcodename: 'xenial', operatingsystemrelease: '16.04', architecture: 'armv7l' } }
-
-    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 { 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 { 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 { 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 { 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/') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-armhf/') }
   end
 
-  context 'select jre for Ubuntu Vivid (15.04)' do
+  context 'when select jdk for Ubuntu xenial (16.04) on ARM64' do
-    let(:facts) { { osfamily: 'Debian', operatingsystem: 'Ubuntu', lsbdistcodename: 'vivid', operatingsystemrelease: '15.04', architecture: 'amd64' } }
+    let(:facts) { { osfamily: 'Debian', operatingsystem: 'Ubuntu', lsbdistcodename: 'xenial', operatingsystemrelease: '16.04', architecture: 'aarch64' } }
-    let(:params) { { 'distribution' => 'jre' } }
+    let(:params) { { 'distribution' => 'jdk' } }
 
-    it { is_expected.to contain_package('java').with_name('openjdk-8-jre-headless') }
+    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/') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-arm64/') }
   end
 
-  context 'select openjdk for Amazon Linux' do
+  context 'when select openjdk for Oracle Linux' do
-    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', architecture: 'x86_64' } }
-    let(:params) { { 'distribution' => 'jre' } }
-
-    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', 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
+  context 'when select openjdk for Oracle Linux 6.2' do
     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
+  context 'when select passed value for Oracle Linux' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'OracleLinux', operatingsystemrelease: '6.3', architecture: 'x86_64' } }
     let(:params) { { 'distribution' => 'jre' } }
 
     it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
   end
 
-  context 'select passed value for Scientific Linux' do
+  context 'when select passed value for Scientific Linux' do
     let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Scientific', operatingsystemrelease: '6.4', architecture: 'x86_64' } }
     let(:params) { { 'distribution' => 'jre' } }
 
@@ -222,7 +112,7 @@ describe 'java', type: :class do
     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
+  context 'when 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' } }
 
@@ -230,59 +120,45 @@ describe 'java', type: :class do
     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
+  context 'when select default for OpenSUSE 12.3' do
     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
+  context 'when select default for SLES 11.3' do
     let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '11.3', architecture: 'x86_64' } }
 
     it { is_expected.to 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
+  context 'when select default for SLES 11.4' do
     let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '11.4', architecture: 'x86_64' } }
 
     it { is_expected.to 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/') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.1-ibm-1.7.1/') }
   end
 
-  context 'select default for SLES 12.0' do
+  context 'when select default for SLES 12.0' do
     let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '12.0', operatingsystemmajrelease: '12', 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 12.1' do
+  context 'when select default for SLES 12.1' do
     let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '12.1', operatingsystemmajrelease: '12', 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/lib64/jvm/java-1.8.0-openjdk-1.8.0/') }
   end
 
-  context 'select jdk for OpenBSD' do
-    let(:facts) { { osfamily: 'OpenBSD', architecture: 'x86_64' } }
-
-    it { is_expected.to contain_package('java').with_name('jdk') }
-    it { is_expected.not_to contain_file_line('java-home-environment') }
-  end
-
-  context 'select jre for OpenBSD' do
-    let(:facts) { { osfamily: 'OpenBSD', architecture: 'x86_64' } }
-    let(:params) { { 'distribution' => '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
+    context 'when all params provided' do
       let(:params) do
         {
           'distribution' => 'custom',
@@ -297,7 +173,7 @@ describe 'java', type: :class do
       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
+    context 'with missing parameters' do
       let(:params) do
         {
           'distribution' => 'custom',
@@ -314,31 +190,26 @@ describe 'java', type: :class do
   describe 'incompatible OSs' do
     [
       {
-        # C14706
         osfamily: 'windows',
         operatingsystem: 'windows',
         operatingsystemrelease: '8.1',
       },
       {
-        # C14707
         osfamily: 'Darwin',
         operatingsystem: 'Darwin',
         operatingsystemrelease: '13.3.0',
       },
       {
-        # C14708
         osfamily: 'AIX',
         operatingsystem: 'AIX',
         operatingsystemrelease: '7100-02-00-000',
       },
       {
-        # C14708
         osfamily: 'AIX',
         operatingsystem: 'AIX',
         operatingsystemrelease: '6100-07-04-1216',
       },
       {
-        # C14708
         osfamily: 'AIX',
         operatingsystem: 'AIX',
         operatingsystemrelease: '5300-12-01-1016',

spec/default_facts.yml

@@ -0,0 +1,7 @@
+# Use default_module_facts.yml for module specific facts.
+#
+# Facts specified here will override the values provided by rspec-puppet-facts.
+---
+ipaddress: "172.16.254.254"
+is_pe: false
+macaddress: "AA:AA:AA:AA:AA:AA"

spec/defines/oracle_spec.rb

@@ -1,226 +1,418 @@
 require 'spec_helper'
 
-oracle_url = 'http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.tar.gz'
+oracle_url = 'http://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.tar.gz'
 
 describe 'java::oracle', type: :define do
-  context 'On CentOS 64-bit' do
+  context 'with CentOS 64-bit' do
     let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '6.0' } } } }
 
-    context 'Oracle Java SE 6 JDK' do
+    context 'when Oracle Java SE 6 JDK' do
       let(:params) { { ensure: 'present', version: '6', java_se: 'jdk' } }
       let(:title) { 'jdk6' }
 
       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 6u45 b06').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]') }
+      it { is_expected.to contain_exec('Install Oracle java_se jdk 6 6u45 b06').that_requires('Archive[/tmp/jdk-6u45-linux-x64-rpm.bin]') }
     end
 
-    context 'Oracle Java SE 7 JDK' do
+    context 'when Oracle Java SE 7 JDK' do
       let(:params) { { ensure: 'present', version: '7', java_se: 'jdk' } }
       let(:title) { 'jdk7' }
 
       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 7u80 b15').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]') }
+      it { is_expected.to contain_exec('Install Oracle java_se jdk 7 7u80 b15').that_requires('Archive[/tmp/jdk-7u80-linux-x64.rpm]') }
     end
 
-    context 'Oracle Java SE 8 JDK' do
+    context 'when Oracle Java SE 8 JDK' do
       let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } }
       let(:title) { 'jdk8' }
 
-      it { is_expected.to contain_archive('/tmp/jdk-8u131-linux-x64.rpm') }
+      it { is_expected.to contain_archive('/tmp/jdk-8u201-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 8u201 b09').with_command('rpm --force -iv /tmp/jdk-8u201-linux-x64.rpm') }
-      it { is_expected.to contain_exec('Install Oracle java_se jdk 8').that_requires('Archive[/tmp/jdk-8u131-linux-x64.rpm]') }
+      it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u201 b09').that_requires('Archive[/tmp/jdk-8u201-linux-x64.rpm]') }
     end
 
-    context 'Oracle Java SE 6 JRE' do
+    context 'when Oracle Java SE 6 JRE' do
       let(:params) { { ensure: 'present', version: '6', java_se: 'jre' } }
       let(:title) { 'jre6' }
 
       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 6u45 b06').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]') }
+      it { is_expected.to contain_exec('Install Oracle java_se jre 6 6u45 b06').that_requires('Archive[/tmp/jre-6u45-linux-x64-rpm.bin]') }
     end
 
-    context 'Oracle Java SE 7 JRE' do
+    context 'when Oracle Java SE 7 JRE' do
       let(:params) { { ensure: 'present', version: '7', java_se: 'jre' } }
       let(:title) { 'jre7' }
 
       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 7u80 b15').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]') }
+      it { is_expected.to contain_exec('Install Oracle java_se jre 7 7u80 b15').that_requires('Archive[/tmp/jre-7u80-linux-x64.rpm]') }
     end
 
-    context 'select Oracle Java SE 8 JRE' do
+    context 'when select Oracle Java SE 8 JRE' do
       let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } }
       let(:title) { 'jre8' }
 
-      it { is_expected.to contain_archive('/tmp/jre-8u131-linux-x64.rpm') }
+      it { is_expected.to contain_archive('/tmp/jre-8u201-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 8u201 b09').with_command('rpm --force -iv /tmp/jre-8u201-linux-x64.rpm') }
-      it { is_expected.to contain_exec('Install Oracle java_se jre 8').that_requires('Archive[/tmp/jre-8u131-linux-x64.rpm]') }
+      it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u201 b09').that_requires('Archive[/tmp/jre-8u201-linux-x64.rpm]') }
     end
 
-    context 'Pass URL to url parameter' do
+    context 'when passing URL to url parameter' do
       let(:params) do
         {
           ensure: 'present',
-          version_major: '8u131',
+          version_major: '8u201',
-          version_minor: 'b11',
+          version_minor: 'b09',
           java_se: 'jdk',
-          url: 'http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.rpm',
+          url: 'http://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.rpm',
           url_hash: 'ignored',
         }
       end
       let(:title) { 'jdk8' }
 
       it {
-        is_expected.to contain_archive('/tmp/jdk-8u131-linux-x64.rpm')
+        is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.rpm')
-          .with_source('http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.rpm')
+          .with_source('http://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.rpm')
       }
     end
 
-    context 'Pass a hash to url_hash parameter' do
+    context 'when passing a hash to url_hash parameter' do
       let(:params) do
         {
           ensure: 'present',
-          version_major: '8u131',
+          version_major: '8u201',
-          version_minor: 'b11',
+          version_minor: 'b09',
           java_se: 'jdk',
-          url_hash: 'abcdef01234567890',
+          url_hash: '42970487e3af4f5aa5bca3f542482c60',
         }
       end
       let(:title) { 'jdk8' }
 
-      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') }
+      it {
+        is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.rpm')
+          .with_source('http://download.oracle.com/otn-pub/java/jdk//8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.rpm')
+      }
+    end
+
+    context 'when installing multiple versions' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '8u201',
+          version_minor: 'b09',
+          java_se: 'jdk',
+          url_hash: '42970487e3af4f5aa5bca3f542482c60',
+        }
+      end
+      let(:title) { 'jdk8' }
+
+      let(:pre_condition) do
+        <<-EOL
+        java::oracle {
+          'jdk8121':
+            ensure        => 'present',
+            version_major => '8u121',
+            version_minor => 'b13',
+            java_se       => 'jdk',
+            url_hash      => 'abcdef01234567890',
+        }
+        EOL
+      end
+
+      it { is_expected.to compile }
+    end
+
+    context 'when installing Oracle Java SE 6 JRE with JCE' do
+      let(:params) { { ensure: 'present', jce: true, version: '6', version_major: '6u99', version_minor: '99', java_se: 'jre' } }
+      let(:title) { 'jre6jce' }
+
+      it do
+        is_expected.to contain_archive('/tmp/jce-6.zip').with_source('http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip')
+        is_expected.to contain_archive('/tmp/jce-6.zip').with_extract_path('/usr/java/jre1.6.0_99-amd64/lib/security')
+      end
+    end
+
+    context 'when installing Oracle Java SE 6 JDK with JCE' do
+      let(:params) { { ensure: 'present', jce: true, version: '6', version_major: '6u99', version_minor: '99', java_se: 'jdk' } }
+      let(:title) { 'jre6jce' }
+
+      it do
+        is_expected.to contain_archive('/tmp/jce-6.zip').with_source('http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip')
+        is_expected.to contain_archive('/tmp/jce-6.zip').with_extract_path('/usr/java/jdk1.6.0_99-amd64/jre/lib/security')
+      end
+    end
+
+    context 'when specifying package_type tar.gz and basedir' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version: '6',
+          java_se: 'jdk',
+          basedir: '/usr/java',
+          package_type: 'tar.gz',
+        }
+      end
+      let(:title) { 'jdk6' }
+
+      it { is_expected.to contain_archive('/tmp/jdk-6u45-linux-x64.tar.gz') }
+      it { is_expected.to contain_exec('Install Oracle java_se jdk 6 6u45 b06').with_command('tar -zxf /tmp/jdk-6u45-linux-x64.tar.gz -C /usr/java') }
+      it { is_expected.to contain_exec('Install Oracle java_se jdk 6 6u45 b06').that_requires('Archive[/tmp/jdk-6u45-linux-x64.tar.gz]') }
+    end
+    context 'when manage_basedir is set to true' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version: '6',
+          java_se: 'jdk',
+          basedir: '/usr/java',
+          manage_basedir: true,
+        }
+      end
+      let(:title) { 'jdk6' }
+
+      it { is_expected.to contain_file('/usr/java') }
+    end
+    context 'when manage_symlink is set to true' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version: '6',
+          java_se: 'jdk',
+          basedir: '/usr/java',
+          manage_symlink: true,
+          symlink_name: 'java_home',
+        }
+      end
+      let(:title) { 'jdk6' }
+
+      it { is_expected.to contain_file('/usr/java/java_home') }
     end
   end
 
-  context 'On CentOS 32-bit' do
+  context 'when on CentOS 32-bit' do
     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
+    context 'when selecting Oracle Java SE 6 JDK on RedHat family, 32-bit' do
       let(:params) { { ensure: 'present', version: '6', java_se: 'jdk' } }
       let(:title) { 'jdk6' }
 
       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 6u45 b06').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]') }
+      it { is_expected.to contain_exec('Install Oracle java_se jdk 6 6u45 b06').that_requires('Archive[/tmp/jdk-6u45-linux-i586-rpm.bin]') }
     end
 
-    context 'select Oracle Java SE 7 JDK on RedHat family, 32-bit' do
+    context 'when selecting Oracle Java SE 7 JDK on RedHat family, 32-bit' do
       let(:params) { { ensure: 'present', version: '7', java_se: 'jdk' } }
       let(:title) { 'jdk7' }
 
       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 7u80 b15').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]') }
+      it { is_expected.to contain_exec('Install Oracle java_se jdk 7 7u80 b15').that_requires('Archive[/tmp/jdk-7u80-linux-i586.rpm]') }
     end
 
-    context 'select Oracle Java SE 8 JDK on RedHat family, 32-bit' do
+    context 'when selecting Oracle Java SE 8 JDK on RedHat family, 32-bit' do
       let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } }
       let(:title) { 'jdk8' }
 
-      it { is_expected.to contain_archive('/tmp/jdk-8u131-linux-i586.rpm') }
+      it { is_expected.to contain_archive('/tmp/jdk-8u201-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 8u201 b09').with_command('rpm --force -iv /tmp/jdk-8u201-linux-i586.rpm') }
-      it { is_expected.to contain_exec('Install Oracle java_se jdk 8').that_requires('Archive[/tmp/jdk-8u131-linux-i586.rpm]') }
+      it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u201 b09').that_requires('Archive[/tmp/jdk-8u201-linux-i586.rpm]') }
     end
 
-    context 'select Oracle Java SE 6 JRE on RedHat family, 32-bit' do
+    context 'when selecting Oracle Java SE 6 JRE on RedHat family, 32-bit' do
       let(:params) { { ensure: 'present', version: '6', java_se: 'jre' } }
       let(:title) { 'jdk6' }
 
       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 6u45 b06').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]') }
+      it { is_expected.to contain_exec('Install Oracle java_se jre 6 6u45 b06').that_requires('Archive[/tmp/jre-6u45-linux-i586-rpm.bin]') }
     end
 
-    context 'select Oracle Java SE 7 JRE on RedHat family, 32-bit' do
+    context 'when select Oracle Java SE 7 JRE on RedHat family, 32-bit' do
       let(:params) { { ensure: 'present', version: '7', java_se: 'jre' } }
       let(:title) { 'jdk7' }
 
       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 7u80 b15').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]') }
+      it { is_expected.to contain_exec('Install Oracle java_se jre 7 7u80 b15').that_requires('Archive[/tmp/jre-7u80-linux-i586.rpm]') }
     end
 
-    context 'select Oracle Java SE 8 JRE on RedHat family, 32-bit' do
+    context 'when select Oracle Java SE 8 JRE on RedHat family, 32-bit' do
       let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } }
       let(:title) { 'jdk8' }
 
-      it { is_expected.to contain_archive('/tmp/jre-8u131-linux-i586.rpm') }
+      it { is_expected.to contain_archive('/tmp/jre-8u201-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 8u201 b09').with_command('rpm --force -iv /tmp/jre-8u201-linux-i586.rpm') }
-      it { is_expected.to contain_exec('Install Oracle java_se jre 8').that_requires('Archive[/tmp/jre-8u131-linux-i586.rpm]') }
+      it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u201 b09').that_requires('Archive[/tmp/jre-8u201-linux-i586.rpm]') }
+    end
+
+    context 'when installing multiple versions' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '8u201',
+          version_minor: 'b09',
+          java_se: 'jdk',
+          url_hash: '42970487e3af4f5aa5bca3f542482c60',
+        }
+      end
+      let(:title) { 'jdk8' }
+
+      let(:pre_condition) do
+        <<-EOL
+        java::oracle {
+          'jdk8121':
+            ensure        => 'present',
+            version_major => '8u121',
+            version_minor => 'b13',
+            java_se       => 'jdk',
+            url_hash      => 'abcdef01234567890',
+        }
+        EOL
+      end
+
+      it { is_expected.to compile }
+    end
+
+    context 'when installing Oracle Java SE 6 JRE with JCE' do
+      let(:params) { { ensure: 'present', jce: true, version: '6', version_major: '6u99', version_minor: '99', java_se: 'jre' } }
+      let(:title) { 'jre6jce' }
+
+      it do
+        is_expected.to contain_archive('/tmp/jce-6.zip').with_source('http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip')
+        is_expected.to contain_archive('/tmp/jce-6.zip').with_extract_path('/usr/java/jre1.6.0_99-amd64/lib/security')
+      end
+    end
+
+    context 'when installing Oracle Java SE 6 JDK with JCE' do
+      let(:params) { { ensure: 'present', jce: true, version: '6', version_major: '6u99', version_minor: '99', java_se: 'jdk' } }
+      let(:title) { 'jre6jce' }
+
+      it do
+        is_expected.to contain_archive('/tmp/jce-6.zip').with_source('http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip')
+        is_expected.to contain_archive('/tmp/jce-6.zip').with_extract_path('/usr/java/jdk1.6.0_99-amd64/jre/lib/security')
+      end
     end
   end
 
-  context 'On Ubuntu 64-bit' do
+  context 'with Ubuntu 64-bit' do
     let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '16.04' } } } }
 
-    context 'Oracle Java SE 6 JDK' do
+    context 'when Oracle Java SE 6 JDK' do
       let(:params) { { ensure: 'present', version: '6', java_se: 'jdk' } }
       let(:title) { 'jdk6' }
 
       it { is_expected.to contain_archive('/tmp/jdk-6u45-linux-x64.tar.gz') }
-      it { is_expected.to contain_exec('Install Oracle java_se jdk 6').with_command('tar -zxf /tmp/jdk-6u45-linux-x64.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install Oracle java_se jdk 6 6u45 b06').with_command('tar -zxf /tmp/jdk-6u45-linux-x64.tar.gz -C /usr/lib/jvm') }
-      it { is_expected.to contain_exec('Install Oracle java_se jdk 6').that_requires('Archive[/tmp/jdk-6u45-linux-x64.tar.gz]') }
+      it { is_expected.to contain_exec('Install Oracle java_se jdk 6 6u45 b06').that_requires('Archive[/tmp/jdk-6u45-linux-x64.tar.gz]') }
     end
 
-    context 'Oracle Java SE 7 JDK' do
+    context 'with Oracle Java SE 7 JDK' do
       let(:params) { { ensure: 'present', version: '7', java_se: 'jdk' } }
       let(:title) { 'jdk7' }
 
       it { is_expected.to contain_archive('/tmp/jdk-7u80-linux-x64.tar.gz') }
-      it { is_expected.to contain_exec('Install Oracle java_se jdk 7').with_command('tar -zxf /tmp/jdk-7u80-linux-x64.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install Oracle java_se jdk 7 7u80 b15').with_command('tar -zxf /tmp/jdk-7u80-linux-x64.tar.gz -C /usr/lib/jvm') }
-      it { is_expected.to contain_exec('Install Oracle java_se jdk 7').that_requires('Archive[/tmp/jdk-7u80-linux-x64.tar.gz]') }
+      it { is_expected.to contain_exec('Install Oracle java_se jdk 7 7u80 b15').that_requires('Archive[/tmp/jdk-7u80-linux-x64.tar.gz]') }
     end
 
-    context 'Oracle Java SE 8 JDK' do
+    context 'with Oracle Java SE 8 JDK' do
       let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } }
       let(:title) { 'jdk8' }
 
-      it { is_expected.to contain_archive('/tmp/jdk-8u131-linux-x64.tar.gz') }
+      it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.tar.gz') }
-      it { is_expected.to contain_exec('Install Oracle java_se jdk 8').with_command('tar -zxf /tmp/jdk-8u131-linux-x64.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u201 b09').with_command('tar -zxf /tmp/jdk-8u201-linux-x64.tar.gz -C /usr/lib/jvm') }
-      it { is_expected.to contain_exec('Install Oracle java_se jdk 8').that_requires('Archive[/tmp/jdk-8u131-linux-x64.tar.gz]') }
+      it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u201 b09').that_requires('Archive[/tmp/jdk-8u201-linux-x64.tar.gz]') }
     end
 
-    context 'Oracle Java SE 6 JRE' do
+    context 'with Oracle Java SE 6 JRE' do
       let(:params) { { ensure: 'present', version: '6', java_se: 'jre' } }
       let(:title) { 'jre6' }
 
       it { is_expected.to contain_archive('/tmp/jre-6u45-linux-x64.tar.gz') }
-      it { is_expected.to contain_exec('Install Oracle java_se jre 6').with_command('tar -zxf /tmp/jre-6u45-linux-x64.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install Oracle java_se jre 6 6u45 b06').with_command('tar -zxf /tmp/jre-6u45-linux-x64.tar.gz -C /usr/lib/jvm') }
-      it { is_expected.to contain_exec('Install Oracle java_se jre 6').that_requires('Archive[/tmp/jre-6u45-linux-x64.tar.gz]') }
+      it { is_expected.to contain_exec('Install Oracle java_se jre 6 6u45 b06').that_requires('Archive[/tmp/jre-6u45-linux-x64.tar.gz]') }
     end
 
-    context 'Oracle Java SE 7 JRE' do
+    context 'when Oracle Java SE 7 JRE' do
       let(:params) { { ensure: 'present', version: '7', java_se: 'jre' } }
       let(:title) { 'jre7' }
 
       it { is_expected.to contain_archive('/tmp/jre-7u80-linux-x64.tar.gz') }
-      it { is_expected.to contain_exec('Install Oracle java_se jre 7').with_command('tar -zxf /tmp/jre-7u80-linux-x64.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install Oracle java_se jre 7 7u80 b15').with_command('tar -zxf /tmp/jre-7u80-linux-x64.tar.gz -C /usr/lib/jvm') }
-      it { is_expected.to contain_exec('Install Oracle java_se jre 7').that_requires('Archive[/tmp/jre-7u80-linux-x64.tar.gz]') }
+      it { is_expected.to contain_exec('Install Oracle java_se jre 7 7u80 b15').that_requires('Archive[/tmp/jre-7u80-linux-x64.tar.gz]') }
     end
 
-    context 'select Oracle Java SE 8 JRE' do
+    context 'when Oracle Java SE 8 JRE' do
       let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } }
       let(:title) { 'jre8' }
 
-      it { is_expected.to contain_archive('/tmp/jre-8u131-linux-x64.tar.gz') }
+      it { is_expected.to contain_archive('/tmp/jre-8u201-linux-x64.tar.gz') }
-      it { is_expected.to contain_exec('Install Oracle java_se jre 8').with_command('tar -zxf /tmp/jre-8u131-linux-x64.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u201 b09').with_command('tar -zxf /tmp/jre-8u201-linux-x64.tar.gz -C /usr/lib/jvm') }
-      it { is_expected.to contain_exec('Install Oracle java_se jre 8').that_requires('Archive[/tmp/jre-8u131-linux-x64.tar.gz]') }
+      it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u201 b09').that_requires('Archive[/tmp/jre-8u201-linux-x64.tar.gz]') }
     end
 
-    context 'Pass URL to url parameter' do
+    context 'when passing URL to url parameter' do
-      let(:params) { { ensure: 'present', version_major: '8u131', version_minor: 'b11', java_se: 'jdk', url: oracle_url.to_s } }
+      let(:params) { { ensure: 'present', version_major: '8u201', version_minor: 'b09', java_se: 'jdk', url: oracle_url.to_s } }
       let(:title) { 'jdk8' }
 
-      it { is_expected.to contain_archive('/tmp/jdk-8u131-linux-x64.tar.gz') }
+      it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.tar.gz') }
+    end
+
+    context 'when installing multiple versions' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '8u201',
+          version_minor: 'b09',
+          java_se: 'jdk',
+          url_hash: '42970487e3af4f5aa5bca3f542482c60',
+        }
+      end
+      let(:title) { 'jdk8' }
+
+      let(:pre_condition) do
+        <<-EOL
+        java::oracle {
+          'jdk8121':
+            ensure        => 'present',
+            version_major => '8u121',
+            version_minor => 'b13',
+            java_se       => 'jdk',
+            url_hash      => 'abcdef01234567890',
+        }
+        EOL
+      end
+
+      it { is_expected.to compile }
+    end
+
+    context 'when installing Oracle Java SE 6 JRE with JCE' do
+      let(:params) { { ensure: 'present', jce: true, version: '6', version_major: '6u99', version_minor: '99', java_se: 'jre' } }
+      let(:title) { 'jre6jce' }
+
+      it do
+        is_expected.to contain_archive('/tmp/jce-6.zip').with_source('http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip')
+        is_expected.to contain_archive('/tmp/jce-6.zip').with_extract_path('/usr/lib/jvm/jre1.6.0_99/lib/security')
+      end
+    end
+
+    context 'when installing Oracle Java SE 6 JDK with JCE' do
+      let(:params) { { ensure: 'present', jce: true, version: '6', version_major: '6u99', version_minor: '99', java_se: 'jdk' } }
+      let(:title) { 'jre6jce' }
+
+      it do
+        is_expected.to contain_archive('/tmp/jce-6.zip').with_source('http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip')
+        is_expected.to contain_archive('/tmp/jce-6.zip').with_extract_path('/usr/lib/jvm/jdk1.6.0_99/jre/lib/security')
+      end
     end
   end
   describe 'incompatible OSes' do
     [
       {
-        # C14706
         kernel: 'Windows',
         os: {
           family: 'Windows',
@@ -231,7 +423,6 @@ describe 'java::oracle', type: :define do
         },
       },
       {
-        # C14707
         kernel: 'Darwin',
         os: {
           family: 'Darwin',
@@ -242,7 +433,6 @@ describe 'java::oracle', type: :define do
         },
       },
       {
-        # C14708
         kernel: 'AIX',
         os: {
           family: 'AIX',
@@ -253,7 +443,6 @@ describe 'java::oracle', type: :define do
         },
       },
       {
-        # C14709
         kernel: 'AIX',
         os: {
           family: 'AIX',
@@ -264,7 +453,6 @@ describe 'java::oracle', type: :define do
         },
       },
       {
-        # C14710
         kernel: 'AIX',
         os: {
           family: 'AIX',

spec/spec_helper.rb

@@ -1,9 +1,52 @@
-# This file is generated by ModuleSync, do not edit.
+RSpec.configure do |c|
-require 'puppetlabs_spec_helper/module_spec_helper'
+  c.mock_with :rspec
-
-# put local configuration and setup into spec_helper_local
-begin
-  require 'spec_helper_local'
-rescue LoadError => loaderror
-  puts "Could not require spec_helper_local: #{loaderror.message}"
 end
+
+require 'puppetlabs_spec_helper/module_spec_helper'
+require 'rspec-puppet-facts'
+
+require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb'))
+
+include RspecPuppetFacts
+
+default_facts = {
+  puppetversion: Puppet.version,
+  facterversion: Facter.version,
+}
+
+default_fact_files = [
+  File.expand_path(File.join(File.dirname(__FILE__), 'default_facts.yml')),
+  File.expand_path(File.join(File.dirname(__FILE__), 'default_module_facts.yml')),
+]
+
+default_fact_files.each do |f|
+  next unless File.exist?(f) && File.readable?(f) && File.size?(f)
+
+  begin
+    default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
+  rescue => e
+    RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
+  end
+end
+
+RSpec.configure do |c|
+  c.default_facts = default_facts
+  c.before :each do
+    # set to strictest setting for testing
+    # by default Puppet runs at warning level
+    Puppet.settings[:strict] = :warning
+  end
+  c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
+  c.after(:suite) do
+    RSpec::Puppet::Coverage.report!(0)
+  end
+end
+
+def ensure_module_defined(module_name)
+  module_name.split('::').reduce(Object) do |last_module, next_module|
+    last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module, false)
+    last_module.const_get(next_module, false)
+  end
+end
+
+# 'spec_overrides' from sync.yml will appear below this line

spec/spec_helper_acceptance.rb

@@ -1,12 +1,15 @@
+require 'beaker-pe'
+require 'beaker-puppet'
 require 'beaker-rspec'
 require 'beaker/puppet_install_helper'
 require 'beaker/module_install_helper'
 
 run_puppet_install_helper
+configure_type_defaults_on(hosts)
 install_module_on(hosts)
 install_module_dependencies_on(hosts)
 
-UNSUPPORTED_PLATFORMS = %w[Darwin windows].freeze
+UNSUPPORTED_PLATFORMS = ['Darwin', 'windows'].freeze
 
 unless ENV['RS_PROVISION'] == 'no' || ENV['BEAKER_provision'] == 'no'
   hosts.each do |host|
@@ -18,3 +21,17 @@ RSpec.configure do |c|
   # Readable test descriptions
   c.formatter = :documentation
 end
+
+def idempotent_apply(hosts, manifest, opts = {}, &block)
+  block_on hosts, opts do |host|
+    file_path = host.tmpfile('apply_manifest.pp')
+    create_remote_file(host, file_path, manifest + "\n")
+
+    puppet_apply_opts = { :verbose => nil, 'detailed-exitcodes' => nil }
+    on_options = { acceptable_exit_codes: [0, 2] }
+    on host, puppet('apply', file_path, puppet_apply_opts), on_options, &block
+    puppet_apply_opts2 = { :verbose => nil, 'detailed-exitcodes' => nil }
+    on_options2 = { acceptable_exit_codes: [0] }
+    on host, puppet('apply', file_path, puppet_apply_opts2), on_options2, &block
+  end
+end

spec/spec_helper_local.rb

@@ -0,0 +1,28 @@
+if ENV['COVERAGE'] == 'yes'
+  require 'simplecov'
+  require 'simplecov-console'
+  require 'codecov'
+
+  SimpleCov.formatters = [
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::Console,
+    SimpleCov::Formatter::Codecov,
+  ]
+  SimpleCov.start do
+    track_files 'lib/**/*.rb'
+
+    add_filter '/spec'
+
+    # do not track vendored files
+    add_filter '/vendor'
+    add_filter '/.vendor'
+
+    # do not track gitignored files
+    # this adds about 4 seconds to the coverage check
+    # this could definitely be optimized
+    add_filter do |f|
+      # system returns true if exit status is 0, which with git-check-ignore means file is ignored
+      system("git check-ignore --quiet #{f.filename}")
+    end
+  end
+end

spec/unit/facter/java_default_home_spec.rb

@@ -15,18 +15,18 @@ end
 
 def symlink_and_test(symlink_path, java_home)
   File.symlink(symlink_path, './java_test')
-  Facter::Util::Resolution.expects(:which).with('java').returns('./java_test')
+  expect(Facter::Util::Resolution).to receive(:which).with('java').and_return('./java_test')
-  File.expects(:realpath).with('./java_test').returns(symlink_path)
+  expect(File).to receive(:realpath).with('./java_test').and_return(symlink_path)
   expect(Facter.value(:java_default_home)).to eql java_home
 end
 
 describe 'java_default_home' do
   before(:each) do
     Facter.clear
-    Facter.fact(:kernel).stubs(:value).returns('Linux')
+    allow(Facter.fact(:kernel)).to receive(:value).once.and_return('Linux')
   end
 
-  context 'returns java home path when java found in PATH' do
+  context 'when java found in PATH' do
     context 'when java is in /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java' do
       it do
         unlink_and_delete('./java_test')
@@ -44,10 +44,10 @@ describe 'java_default_home' do
     end
   end
 
-  context 'returns nil when java not present' do
+  context 'when java not present, return nil' do
     it do
-      Facter::Util::Resolution.stubs(:exec)
+      allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls
-      Facter::Util::Resolution.expects(:which).with('java').at_least(1).returns(false)
+      expect(Facter::Util::Resolution).to receive(:which).with('java').at_least(1).and_return(nil)
       expect(Facter.value(:java_default_home)).to be_nil
     end
   end

spec/unit/facter/java_libjvm_path_spec.rb

@@ -1,17 +1,25 @@
 require 'spec_helper'
 
 describe 'java_libjvm_path' do
+  let(:java_default_home) { '/usr/lib/jvm/java-8-openjdk-amd64' }
+
   before(:each) do
     Facter.clear
-    Facter.fact(:kernel).stubs(:value).returns('Linux')
+    allow(Facter.fact(:kernel)).to receive(:value).once.and_return('Linux')
-    java_default_home = '/usr/lib/jvm/java-8-openjdk-amd64'
+    allow(Facter.fact(:java_default_home)).to receive(:value).once.and_return(java_default_home)
-    Facter.fact(:java_default_home).stubs(:value).returns(java_default_home)
-    Dir.stubs(:glob).with("#{java_default_home}/jre/lib/**/libjvm.so").returns(['/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/libjvm.so'])
   end
 
-  context 'returns libjvm path on Linux' do
+  context 'when libjvm exists' do
     it do
+      allow(Dir).to receive(:glob).with("#{java_default_home}/jre/lib/**/libjvm.so").and_return(['/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/libjvm.so'])
       expect(Facter.value(:java_libjvm_path)).to eql '/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server'
     end
   end
+
+  context 'when libjvm does not exist' do
+    it do
+      allow(Dir).to receive(:glob).with("#{java_default_home}/jre/lib/**/libjvm.so").and_return([])
+      expect(Facter.value(:java_libjvm_path)).to be nil
+    end
+  end
 end

spec/unit/facter/java_major_version_spec.rb

@@ -5,18 +5,18 @@ describe 'java_major_version' do
     Facter.clear
   end
 
-  context 'returns major version when java_version fact present' do
+  context 'when java_version fact present, returns major version' do
     before :each do
-      Facter.fact(:java_version).stubs(:value).returns('1.7.0_71')
+      allow(Facter.fact(:java_version)).to receive(:value).and_return('1.7.0_71')
     end
     it do
       expect(Facter.fact(:java_major_version).value).to eq('7')
     end
   end
 
-  context 'returns nil when java not present' do
+  context 'when java not present, returns nil' do
     before :each do
-      Facter.fact(:java_version).stubs(:value).returns(nil)
+      allow(Facter.fact(:java_version)).to receive(:value).and_return('nil')
     end
     it do
       expect(Facter.fact(:java_major_version).value).to be_nil

spec/unit/facter/java_patch_level_spec.rb

@@ -5,18 +5,18 @@ describe 'java_patch_level' do
     Facter.clear
   end
 
-  context 'if java is installed returns java patch version extracted from java_version fact' do
+  context 'when java is installed returns java patch version extracted from java_version fact' do
     before :each do
-      Facter.fact(:java_version).stubs(:value).returns('1.7.0_71')
+      allow(Facter.fact(:java_version)).to receive(:value).and_return('1.7.0_71')
     end
     it do
       expect(Facter.fact(:java_patch_level).value).to eq('71')
     end
   end
 
-  context 'if java is not installed returns nil' do
+  context 'when java is not installed returns nil' do
     before :each do
-      Facter.fact(:java_version).stubs(:value).returns(nil)
+      allow(Facter.fact(:java_version)).to receive(:value).and_return('nil')
     end
     it do
       expect(Facter.fact(:java_patch_level).value).to be_nil

spec/unit/facter/java_version_spec.rb

@@ -15,76 +15,76 @@ describe 'java_version' do
     Facter.clear
   end
 
-  context 'returns java version when java present' do
+  context 'when java present, returns java version' do
     context 'on OpenBSD', with_env: true do
       before(:each) do
-        Facter.fact(:operatingsystem).stubs(:value).returns('OpenBSD')
+        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('OpenBSD')
       end
       let(:facts) { { operatingsystem: 'OpenBSD' } }
 
       it do
-        Facter::Util::Resolution.expects(:which).with('java').returns('/usr/local/jdk-1.7.0/jre/bin/java')
+        expect(Facter::Util::Resolution).to receive(:which).with('java').and_return('/usr/local/jdk-1.7.0/jre/bin/java')
-        Facter::Util::Resolution.expects(:exec).with('java -Xmx12m -version 2>&1').returns(openjdk_7_output)
+        expect(Facter::Util::Resolution).to receive(:exec).with('java -Xmx12m -version 2>&1').and_return(openjdk_7_output)
         expect(Facter.value(:java_version)).to eq('1.7.0_71')
       end
     end
-    context 'on Darwin' do
+    context 'when on Darwin' do
       before(:each) do
-        Facter.fact(:operatingsystem).stubs(:value).returns('Darwin')
+        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Darwin')
       end
       let(:facts) { { operatingsystem: 'Darwin' } }
 
       it do
-        Facter::Util::Resolution.expects(:exec).with('/usr/libexec/java_home --failfast 2>&1').returns('/Library/Java/JavaVirtualMachines/jdk1.7.0_71.jdk/Contents/Home')
+        expect(Facter::Util::Resolution).to receive(:exec).with('/usr/libexec/java_home --failfast 2>&1').and_return('/Library/Java/JavaVirtualMachines/jdk1.7.0_71.jdk/Contents/Home')
-        Facter::Util::Resolution.expects(:exec).with('java -Xmx12m -version 2>&1').returns(jdk_7_hotspot_output)
+        expect(Facter::Util::Resolution).to receive(:exec).with('java -Xmx12m -version 2>&1').and_return(jdk_7_hotspot_output)
         expect(Facter.value(:java_version)).to eql '1.7.0_71'
       end
     end
-    context 'on other systems' do
+    context 'when on other systems' do
       before(:each) do
-        Facter.fact(:operatingsystem).stubs(:value).returns('MyOS')
+        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('MyOS')
       end
       let(:facts) { { operatingsystem: 'MyOS' } }
 
       it do
-        Facter::Util::Resolution.expects(:which).with('java').returns('/path/to/java')
+        expect(Facter::Util::Resolution).to receive(:which).with('java').and_return('/path/to/java')
-        Facter::Util::Resolution.expects(:exec).with('java -Xmx12m -version 2>&1').returns(jdk_7_hotspot_output)
+        expect(Facter::Util::Resolution).to receive(:exec).with('java -Xmx12m -version 2>&1').and_return(jdk_7_hotspot_output)
         expect(Facter.value(:java_version)).to eq('1.7.0_71')
       end
     end
   end
 
-  context 'returns nil when java not present' do
+  context 'when java not present, returns nil' do
     context 'on OpenBSD', with_env: true do
       before(:each) do
-        Facter.fact(:operatingsystem).stubs(:value).returns('OpenBSD')
+        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('OpenBSD')
       end
       let(:facts) { { operatingsystem: 'OpenBSD' } }
 
       it do
-        Facter::Util::Resolution.stubs(:exec)
+        allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls
         expect(Facter.value(:java_version)).to be_nil
       end
     end
-    context 'on Darwin' do
+    context 'when on Darwin' do
       before(:each) do
-        Facter.fact(:operatingsystem).stubs(:value).returns('Darwin')
+        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Darwin')
       end
       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)".')
+        expect(Facter::Util::Resolution).to receive(:exec).with('/usr/libexec/java_home --failfast 2>&1').at_least(1).and_return('Unable to find any JVMs matching version "(null)".')
         expect(Facter.value(:java_version)).to be_nil
       end
     end
-    context 'on other systems' do
+    context 'when on other systems' do
       before(:each) do
-        Facter.fact(:operatingsystem).stubs(:value).returns('MyOS')
+        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('MyOS')
       end
       let(:facts) { { operatingsystem: 'MyOS' } }
 
       it do
-        Facter::Util::Resolution.expects(:which).at_least(1).with('java').returns(false)
+        expect(Facter::Util::Resolution).to receive(:which).at_least(1).with('java').and_return(false)
         expect(Facter.value(:java_version)).to be_nil
       end
     end