Release version 6.2.0

Merge pull request #411 from carabasdaniel/master
[IAC-545] Skip acceptance tests for AdoptOpenJDK on SLES
2020-02-18 14:31:44 +00:00 · 2020-02-18 14:25:16 +00:00 · 2020-02-18 15:35:38 +02:00 · 2020-02-17 14:27:47 +00:00 · 2020-02-14 14:37:07 +00:00 · 2020-02-14 14:29:32 +00:00
46 changed files with 1766 additions and 979 deletions
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,6 +1,9 @@
 fixtures:
  repositories:
-    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-    archive: "git://github.com/voxpupuli/puppet-archive.git"
+    archive: "https://github.com/voxpupuli/puppet-archive.git"
+    facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
+    stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
+    puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
+    provision: 'https://github.com/puppetlabs/provision.git'
  symlinks:
    java: "#{source_dir}"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -0,0 +1,54 @@
+name: "release"
+
+on: 
+  push:
+    branches:
+      - 'release'
+
+jobs:
+  LitmusAcceptance:
+    env:
+      HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
+      HONEYCOMB_DATASET: litmus tests
+    runs-on: self-hosted
+
+    strategy:
+      matrix:
+        ruby_version: [2.5.x]
+        puppet_gem_version: [~> 6.0]
+        platform: [release_checks]
+        agent_family: ['puppet5', 'puppet6']
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Litmus Parallel
+      uses: puppetlabs/action-litmus_parallel@master
+      with:
+        platform: ${{ matrix.platform }}
+        agent_family: ${{ matrix.agent_family }}
+
+  Spec:
+    runs-on: self-hosted
+
+    strategy:
+      matrix:
+        check: [parallel_spec, 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop']
+        ruby_version: [2.4.x, 2.5.x]
+        puppet_gem_version: [~> 5.0, ~> 6.0]
+        exclude:
+        - puppet_gem_version: ~> 5.0
+          check: 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
+        - ruby_version: 2.4.x
+          puppet_gem_version: ~> 6.0
+        - ruby_version: 2.5.x
+          puppet_gem_version: ~> 5.0
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Spec Tests
+      uses: puppetlabs/action-litmus_spec@master
+      with:
+        puppet_gem_versionm: ${{ matrix.puppet_gem_version }}
+        check: ${{ matrix.check }}
--- a/.gitignore
+++ b/.gitignore
@@ -22,5 +22,6 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+.project
 .envrc
 /inventory.yaml
--- a/.pdkignore
+++ b/.pdkignore
@@ -22,6 +22,7 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+.project
 .envrc
 /inventory.yaml
 /appveyor.yml
--- a/.project
+++ b/.project
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>puppetlabs-java</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,7 @@
 ---
-require: rubocop-rspec
+require:
+- rubocop-rspec
+- rubocop-i18n
 AllCops:
  DisplayCopNames: true
  TargetRubyVersion: '2.1'
@@ -19,10 +21,13 @@ AllCops:
 Metrics/LineLength:
  Description: People have wide screens, use them.
  Max: 200
+GetText:
+  Enabled: false
 GetText/DecorateString:
  Description: We don't want to decorate test output.
  Exclude:
-  - spec/*
+  - spec/**/*
+  Enabled: false
 RSpec/BeforeAfterAll:
  Description: Beware of using after(:all) as it may cause state to leak between tests.
    A necessary evil in acceptance testing.
@@ -84,6 +89,12 @@ Style/MethodCalledOnDoEndBlock:
  Enabled: true
 Style/StringMethods:
  Enabled: true
+GetText/DecorateFunctionMessage:
+  Enabled: false
+GetText/DecorateStringFormattingUsingInterpolation:
+  Enabled: false
+GetText/DecorateStringFormattingUsingPercent:
+  Enabled: false
 Layout/EndOfLine:
  Enabled: false
 Layout/IndentHeredoc:
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,41 +1,34 @@
 ---
-.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: ""
+".gitlab-ci.yml":
+  delete: true
+".travis.yml":
+  global_env: 
+    - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
+  deploy_to_forge:
+    enabled: false
  branches:
-    - release
-
+  - release
+  use_litmus: true
+  litmus:
+    provision_list:
+      - travis_deb
+      - travis_ub
+      - travis_el6
+      - travis_el7
+      - ---travis_el
+  simplecov: true
+  notifications:
+    slack:
+      secure: Wf7Wz3KC0G9ngPiDcOIpSqcCfdvwKQqZdNH/z3GMcj/OipMAdyFSAVnBvikIl7L1c0LMU9ATEpub+jYzViT7RZywaNyer6SRAfs6MIgAYo4xxF/mOnDHAxXeUYAsBXXL4sS3NX2XWMPa9ZWUeuUQKth8O4STWgAX298QZLyYx5k=
 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
-
+    ":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')
 spec/spec_helper.rb:
-  mock_with: ':rspec'
+  mock_with: ":rspec"
  coverage_report: true
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,45 +1,128 @@
 ---
+os: linux
+dist: xenial
 language: ruby
 cache: bundler
 before_install:
  - bundle -v
  - rm -f Gemfile.lock
-  - gem update --system $RUBYGEMS_VERSION
+  - "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
+  - "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
+  - "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
+  - '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
  - gem --version
  - bundle -v
 script:
-  - 'bundle exec rake $CHECK'
+  - 'SIMPLECOV=yes bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
  - 2.5.3
+env:
+  global:
+    - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
 stages:
  - static
  - spec
  - acceptance
-  -
-    if: tag =~ ^v\d
-    name: deploy
-matrix:
+jobs:
  fast_finish: true
  include:
    -
+      before_script:
+      - "bundle exec rake 'litmus:provision_list[travis_deb]'"
+      - "bundle exec rake 'litmus:install_agent[puppet5]'"
+      - "bundle exec rake litmus:install_module"
      bundler_args: 
      dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply
+      env: PLATFORMS=travis_deb_puppet5
      rvm: 2.5.3
-      script: bundle exec rake beaker
+      script: ["bundle exec rake litmus:acceptance:parallel"]
      services: docker
      stage: acceptance
-      sudo: required
    -
+      before_script:
+      - "bundle exec rake 'litmus:provision_list[travis_ub]'"
+      - "bundle exec rake 'litmus:install_agent[puppet5]'"
+      - "bundle exec rake litmus:install_module"
      bundler_args: 
      dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
+      env: PLATFORMS=travis_ub_puppet5
      rvm: 2.5.3
-      script: bundle exec rake beaker
+      script: ["bundle exec rake litmus:acceptance:parallel"]
+      services: docker
+      stage: acceptance
+    -
+      before_script:
+      - "bundle exec rake 'litmus:provision_list[travis_el6]'"
+      - "bundle exec rake 'litmus:install_agent[puppet5]'"
+      - "bundle exec rake litmus:install_module"
+      bundler_args: 
+      dist: trusty
+      env: PLATFORMS=travis_el6_puppet5
+      rvm: 2.5.3
+      script: ["bundle exec rake litmus:acceptance:parallel"]
+      services: docker
+      stage: acceptance
+    -
+      before_script:
+      - "bundle exec rake 'litmus:provision_list[travis_el7]'"
+      - "bundle exec rake 'litmus:install_agent[puppet5]'"
+      - "bundle exec rake litmus:install_module"
+      bundler_args: 
+      dist: trusty
+      env: PLATFORMS=travis_el7_puppet5
+      rvm: 2.5.3
+      script: ["bundle exec rake litmus:acceptance:parallel"]
+      services: docker
+      stage: acceptance
+    -
+      before_script:
+      - "bundle exec rake 'litmus:provision_list[travis_deb]'"
+      - "bundle exec rake 'litmus:install_agent[puppet6]'"
+      - "bundle exec rake litmus:install_module"
+      bundler_args: 
+      dist: trusty
+      env: PLATFORMS=travis_deb_puppet6
+      rvm: 2.5.3
+      script: ["bundle exec rake litmus:acceptance:parallel"]
+      services: docker
+      stage: acceptance
+    -
+      before_script:
+      - "bundle exec rake 'litmus:provision_list[travis_ub]'"
+      - "bundle exec rake 'litmus:install_agent[puppet6]'"
+      - "bundle exec rake litmus:install_module"
+      bundler_args: 
+      dist: trusty
+      env: PLATFORMS=travis_ub_puppet6
+      rvm: 2.5.3
+      script: ["bundle exec rake litmus:acceptance:parallel"]
+      services: docker
+      stage: acceptance
+    -
+      before_script:
+      - "bundle exec rake 'litmus:provision_list[travis_el6]'"
+      - "bundle exec rake 'litmus:install_agent[puppet6]'"
+      - "bundle exec rake litmus:install_module"
+      bundler_args: 
+      dist: trusty
+      env: PLATFORMS=travis_el6_puppet6
+      rvm: 2.5.3
+      script: ["bundle exec rake litmus:acceptance:parallel"]
+      services: docker
+      stage: acceptance
+    -
+      before_script:
+      - "bundle exec rake 'litmus:provision_list[travis_el7]'"
+      - "bundle exec rake 'litmus:install_agent[puppet6]'"
+      - "bundle exec rake litmus:install_module"
+      bundler_args: 
+      dist: trusty
+      env: PLATFORMS=travis_el7_puppet6
+      rvm: 2.5.3
+      script: ["bundle exec rake litmus:acceptance:parallel"]
      services: docker
      stage: acceptance
-      sudo: required
    -
      env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
      stage: static
@@ -51,9 +134,6 @@ matrix:
      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
@@ -61,12 +141,5 @@ branches:
    - release
 notifications:
  email: false
-deploy:
-  provider: puppetforge
-  user: puppet
-  password:
-    secure: ""
-  on:
-    tags: true
-    all_branches: true
-    condition: "$DEPLOY_TO_FORGE = yes"
+  slack:
+    secure: Wf7Wz3KC0G9ngPiDcOIpSqcCfdvwKQqZdNH/z3GMcj/OipMAdyFSAVnBvikIl7L1c0LMU9ATEpub+jYzViT7RZywaNyer6SRAfs6MIgAYo4xxF/mOnDHAxXeUYAsBXXL4sS3NX2XWMPa9ZWUeuUQKth8O4STWgAX298QZLyYx5k=
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -0,0 +1,6 @@
+{
+  "recommendations": [
+    "jpogran.puppet-vscode",
+    "rebornix.Ruby"
+  ]
+}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,58 @@

 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).

+## [v6.2.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.2.0) (2020-02-18)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.1.0...v6.2.0)
+
+### Added
+
+- Support AdoptOpenJDK [\#370](https://github.com/puppetlabs/puppetlabs-java/pull/370) ([timdeluxe](https://github.com/timdeluxe))
+
+### Fixed
+
+- Replace legacy facts by modern facts [\#406](https://github.com/puppetlabs/puppetlabs-java/pull/406) ([hdeheer](https://github.com/hdeheer))
+
+## [v6.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.1.0) (2020-02-03)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.0.0...v6.1.0)
+
+## [v6.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.0.0) (2019-11-11)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v5.0.1...v6.0.0)
+
+### Added
+
+- \(FM-8676\) Add CentOS 8 to supported OS list [\#399](https://github.com/puppetlabs/puppetlabs-java/pull/399) ([david22swan](https://github.com/david22swan))
+- FM-8403 - add support Debain10 [\#387](https://github.com/puppetlabs/puppetlabs-java/pull/387) ([lionce](https://github.com/lionce))
+
+### Fixed
+
+- we need to check if java\_default\_home has a value before we attempt t… [\#391](https://github.com/puppetlabs/puppetlabs-java/pull/391) ([robmbrooks](https://github.com/robmbrooks))
+- Add support for java 11, the default in debian buster 10 [\#386](https://github.com/puppetlabs/puppetlabs-java/pull/386) ([jhooyberghs](https://github.com/jhooyberghs))
+
+## [v5.0.1](https://github.com/puppetlabs/puppetlabs-java/tree/v5.0.1) (2019-08-05)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v5.0.0...v5.0.1)
+
+## [v5.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v5.0.0) (2019-07-29)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v4.1.0...v5.0.0)
+
+### Changed
+
+- \[FM-8320\] Remove Oracle download [\#372](https://github.com/puppetlabs/puppetlabs-java/pull/372) ([carabasdaniel](https://github.com/carabasdaniel))
+
+### Added
+
+- \(FM-8223\) converted to use litmus [\#376](https://github.com/puppetlabs/puppetlabs-java/pull/376) ([tphoney](https://github.com/tphoney))
+- Add buster support, default to 11 [\#369](https://github.com/puppetlabs/puppetlabs-java/pull/369) ([mhjacks](https://github.com/mhjacks))
+
+### Fixed
+
+- \(FM-8343\) use release numbers not lsbdistcodename [\#375](https://github.com/puppetlabs/puppetlabs-java/pull/375) ([tphoney](https://github.com/tphoney))
+- Revert "Add support for debian buster" [\#374](https://github.com/puppetlabs/puppetlabs-java/pull/374) ([tphoney](https://github.com/tphoney))
+
 ## [v4.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/v4.1.0) (2019-05-29)

 [Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v4.0.0...v4.1.0)
@@ -20,6 +72,7 @@ All notable changes to this project will be documented in this file. The format

 ### Added

+- Add support for debian buster [\#364](https://github.com/puppetlabs/puppetlabs-java/pull/364) ([TomRitserveldt](https://github.com/TomRitserveldt))
 - \(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))
--- a/2
+++ b/2
@@ -0,0 +1,2 @@
+# Setting ownership to the modules team
+* @puppetlabs/modules
--- a/27
+++ b/27
@@ -17,21 +17,18 @@ ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = ruby_version_segments[0..1].join('.')

 group :development do
-  gem "fast_gettext", '1.1.0',                         require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
-  gem "fast_gettext",                                  require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
-  gem "json_pure", '<= 2.0.1',                         require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-  gem "json", '= 1.8.1',                               require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
-  gem "json", '= 2.0.4',                               require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  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 "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-win-system-r#{minor_version}",   require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "fast_gettext", '1.1.0',                                   require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
+  gem "fast_gettext",                                            require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
+  gem "json_pure", '<= 2.0.1',                                   require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
+  gem "json", '= 1.8.1',                                         require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
+  gem "json", '= 2.0.4',                                         require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  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 "rb-readline", '= 0.5.5',                                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
+  gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4',     require: false, platforms: [:ruby]
+  gem "puppet-module-win-default-r#{minor_version}", '~> 0.4',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       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

 puppet_version = ENV['PUPPET_GEM_VERSION']
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,6 +0,0 @@
-## Maintenance
-
-Maintainers:
-  - Puppet Forge Modules Team `forge-modules |at| puppet |dot| com`
-
-Tickets: https://tickets.puppet.com/browse/MODULES. Make sure to set component to `java`.
--- a/README.markdown
+++ b/README.markdown
@@ -43,51 +43,63 @@ class { 'java' :
 }
 ```

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

+To install Java to a non-default basedir (defaults: /usr/lib/jvm for Debian; /usr/java for RedHat):
 ```puppet
-java::oracle { 'jdk6' :
+java::download { 'jdk8' :
  ensure  => 'present',
-  version => '6',
-  java_se => 'jdk',
-}
-
-java::oracle { 'jdk8' :
-  ensure  => 'present',
-  version => '8',
-  java_se => 'jdk',
-}
-```
-
-To install a specific release of a Java version, e.g. 8u101-b13, provide both parameters `version_major` and `version_minor` as follows:
-
-```puppet
-java::oracle { 'jdk8' :
-  ensure  => 'present',
-  version_major => '8u101',
-  version_minor => 'b13',
-  java_se => 'jdk',
-}
-```
-
-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',
+  url     => 'http://myjava.repository/java.tgz",
  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):
+The defined type `java::adopt` installs one or more versions of AdoptOpenJDK Java. `java::adopt` depends on [puppet/archive](https://github.com/voxpupuli/puppet-archive).
+
 ```puppet
-java::oracle { 'jdk8' :
+java::adopt { 'jdk8' :
  ensure  => 'present',
-  version_major => '8u101',
-  version_minor => 'b13',
-  java_se => 'jdk',
+  version => '8',
+  java => 'jdk',
+}
+
+java::adopt { 'jdk11' :
+  ensure  => 'present',
+  version => '11',
+  java => 'jdk',
+}
+```
+#TODO
+To install a specific release of a AdoptOpenJDK Java version, e.g. 8u202-b08, provide both parameters `version_major` and `version_minor` as follows:
+
+```puppet
+java::adopt { 'jdk8' :
+  ensure  => 'present',
+  version_major => '8u202',
+  version_minor => 'b08',
+  java => 'jdk',
+}
+```
+
+To install AdoptOpenJDK Java to a non-default basedir (defaults: /usr/lib/jvm for Debian; /usr/java for RedHat):
+```puppet
+java::adopt { 'jdk8' :
+  ensure  => 'present',
+  version_major => '8u202',
+  version_minor => 'b08',
+  java => 'jdk',
+  basedir => '/custom/java',
+}
+```
+
+To ensure that a custom basedir is a directory before AdoptOpenJDK Java is installed (note: manage separately for custom ownership or perms):
+```puppet
+java::adopt { 'jdk8' :
+  ensure  => 'present',
+  version_major => '8u202',
+  version_minor => 'b08',
+  java => 'jdk',
  manage_basedir => true,
  basedir => '/custom/java',
 }
@@ -142,6 +154,13 @@ Oracle Java is supported on:
 * CentOS 7
 * Red Hat Enterprise Linux (RHEL) 7

+AdoptOpenJDK Java is supported on:
+
+* CentOS
+* Red Hat Enterprise Linux (RHEL)
+* Amazon Linux
+* Debian
+
 ### Known issues

 Where Oracle change the format of the URLs to different installer packages, the curl to fetch the package may fail with a HTTP/404 error. In this case, passing a full known good URL using the `url` parameter will allow the module to still be able to install specific versions of the JRE/JDK. Note the `version_major` and `version_minor` parameters must be passed and must match the version downloaded using the known URL in the `url` parameter. 
@@ -153,18 +172,6 @@ the binaries to a standard directory. Because of that, the path to this location
 is hardcoded in the `java_version` fact. Whenever you upgrade Java to a newer
 version, you have to update the path in this fact.

-#### FreeBSD
-
-By default on FreeBSD, Puppet versions prior to 4.0 throw an error saying `pkgng` is not the default provider. To fix this, install the [zleslie/pkgng module](https://forge.puppetlabs.com/zleslie/pkgng) and set it as the default package provider:
-
-```puppet
-Package {
-  provider => 'pkgng',
-}
-```
-
-On Puppet 4.0 and later, `pkgng` is included within Puppet and is the default package provider.
-
 ## Development

 Puppet modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. To contribute to Puppet projects, see our [module contribution guide.](https://docs.puppetlabs.com/forge/contributing.html)
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -18,8 +18,8 @@ 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.
+* [`java::adopt`](#javaadopt): Defined Type java::adopt  Description Installs OpenJDK Java built with AdoptOpenJDK with the Hotspot JVM.  Install one or more versions of Ad
+* [`java::download`](#javadownload): Installs Java from a url location.

 ## Classes

@@ -102,23 +102,213 @@ Default value: `undef`

 ## Defined types

-### java::oracle
+### java::adopt

-Defined Type java::oracle
+Defined Type java::adopt

-Install one or more versions of Oracle Java.
+Description
+Installs OpenJDK Java built with AdoptOpenJDK with the Hotspot JVM.

-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"
-```
+Install one or more versions of AdoptOpenJDK Java.
+
+Currently only Linux RedHat, Amazon and Debian are supported.
+
+Parameters
+[*version*]
+Version of Java to install, e.g. '8' or '9'. Default values for major and minor
+versions will be used.
+
+[*version_major*]
+Major version which should be installed, e.g. '8u101' or '9.0.4'. Must be used together with
+version_minor.
+
+[*version_minor*]
+Minor version which should be installed, e.g. 'b12' (for version = '8') or '11' (for version != '8').
+Must be used together with version_major.
+
+[*java_edition*]
+Type of Java Edition to install, jdk or jre.
+
+[*ensure*]
+Install or remove the package.
+
+[*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)
+
+[*basedir*]
+Directory under which the installation will occur. If not set, defaults to
+/usr/lib/jvm for Debian and /usr/java for RedHat.
+
+[*manage_basedir*]
+Whether to manage the basedir directory.  Defaults to false.
+Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter.
+
+[*package_type*]
+Type of installation package for specified version of java. java 6 comes
+in a few installation package flavors and we need to account for them.
+Optional forced package types: rpm, rpmbin, tar.gz
+
+Variables
+[*release_major*]
+Major version release number for java. Used to construct download URL.
+
+[*release_minor*]
+Minor version release number for java. Used to construct download URL.
+
+[*install_path*]
+Base install path for specified version of java. Used to determine if java
+has already been installed.
+
+[*os*]
+java OS type.
+
+[*destination*]
+Destination directory to save java installer to.  Usually /tmp on Linux and
+C:\TEMP on Windows.
+
+[*creates_path*]
+Fully qualified path to java after it is installed. Used to determine if
+java is already installed.
+
+[*arch*]
+java architecture type.
+
+[*package_name*]
+Name of the java installation package to download from github.
+
+[*install_command*]
+Installation command used to install java. 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.
+
+[*spacer*]
+Spacer to be used in github download url. In major version 8 this is a simple dash
+in later versions they use a crazy plus sign, which needs to be used in urlencoded
+format
+
+[*download_folder_prefix*]
+Download folder name begins differently depending on the release. After major release
+8, they have given it a dash. Be aware that even if you want to have a JRE, the folder
+still begins with "jdk"
+
+[*release_minor_url*]
+filled depending on major release. Until major release 8 the minor part needs to be given
+with a 'b' for build, in later versions it is a underscore or a plus sign, which needs
+to be stripped for the download url and is replaced with the given spaces (see above)
+
+[*_package_type*]
+Helper variable which gets filled depending on parameter package_type
+
+[*_basedir*]
+Helper variable which gets filled depending on parameter basedir
+
+[*_version*]
+Helper variable which gets filled depending on parameter version
+
+[*_version_int*]
+Helper variable which gets the value of $_version converted to integer
+
+[*_append_jre*]
+Helper variable which gets filled with the string "-jre" if jre was selected to build the correct install path
+
+[*_release_minor_package_name*]
+Helper variable which gets filled with the right minor string depending on the major version

 #### Parameters

-The following parameters are available in the `java::oracle` defined type.
+The following parameters are available in the `java::adopt` defined type.
+
+##### `ensure`
+
+Data type: `Any`
+
+
+
+Default value: 'present'
+
+##### `version`
+
+Data type: `Any`
+
+
+
+Default value: '8'
+
+##### `version_major`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+##### `version_minor`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+##### `java`
+
+Data type: `Any`
+
+
+
+Default value: 'jdk'
+
+##### `proxy_server`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+##### `proxy_type`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+##### `basedir`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+##### `manage_basedir`
+
+Data type: `Any`
+
+
+
+Default value: `true`
+
+##### `package_type`
+
+Data type: `Any`
+
+
+
+Default value: `undef`
+
+### java::download
+
+Defined Type java::download
+
+#### Parameters
+
+The following parameters are available in the `java::download` defined type.

 ##### `ensure`

@@ -160,14 +350,6 @@ 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`
@@ -188,18 +370,7 @@ Default value: `undef`

 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.
+Full URL

 Default value: `undef`

@@ -211,6 +382,14 @@ Install Oracles Java Cryptographic Extensions into the JRE or JDK

 Default value: `false`

+##### `jce_url`
+
+Data type: `Any`
+
+Full URL to the jce zip file
+
+Default value: `undef`
+
 ##### `basedir`

 Data type: `Any`
--- a/16
+++ b/16
@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
 require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
@@ -14,8 +17,17 @@ 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?
+
+  returnVal = nil
+  returnVal ||= begin
+    metadata_source = JSON.load(File.read('metadata.json'))['source']
+    metadata_source_match = metadata_source && metadata_source.match(%r{.*\/([^\/]*?)(?:\.git)?\Z})
+
+    metadata_source_match && metadata_source_match[1]
+  end
+
+  raise "unable to find the changelog_project in .sync.yml or calculate it from the source in metadata.json" if returnVal.nil?
+
  puts "GitHubChangelogGenerator project:#{returnVal}"
  returnVal
 end
--- a/distelli-manifest.yml
+++ b/distelli-manifest.yml
@@ -0,0 +1,25 @@
+team-modules/puppetlabs-java:
+  PreBuild:
+    - source /opt/rh/rh-ruby25/enable
+    - echo "--- LETS update BUNDLER ---"
+    - bundle install --path vendor/bundle --jobs 3
+  Build:
+    - echo "--- PROVISIONING ---"
+    - source /opt/rh/rh-ruby25/enable
+    - bundle exec rake litmus:provision_list[release_checks]
+    - cat inventory.yaml
+    - echo "--- AGENT INSTALLATION ---"
+    - bundle exec rake litmus:install_agent
+    - echo "--- MODULE INSTALLATION ---"
+    - bundle exec rake litmus:install_module
+    - echo "--- TESTS RUNNING ---"
+    - bundle exec rake litmus:acceptance:parallel
+  AfterBuildSuccess:
+    - source /opt/rh/rh-ruby25/enable
+    - bundle exec rake litmus:tear_down
+  AfterBuildFailure:
+    - source /opt/rh/rh-ruby25/enable
+    - bundle exec rake litmus:tear_down
+  CommitData:
+    - RepoType: Git
+    - RepoPath: .
--- a/examples/alternative.pp
+++ b/examples/alternative.pp
@@ -1,5 +1,5 @@
 class { 'java':
  package               => 'jdk-8u25-linux-x64',
  java_alternative      => 'jdk1.8.0_25',
-  java_alternative_path => '/usr/java/jdk1.8.0_25/jre/bin/java'
+  java_alternative_path => '/usr/java/jdk1.8.0_25/jre/bin/java',
 }
--- a/lib/facter/java_libjvm_path.rb
+++ b/lib/facter/java_libjvm_path.rb
@@ -7,6 +7,7 @@
 #
 # Caveats:
 #   Needs to list files recursively. Returns the first match
+#   Needs working java_major_version fact
 #
 # Notes:
 #   None
@@ -14,11 +15,18 @@ Facter.add(:java_libjvm_path) do
  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")
-    if java_libjvm_file.nil? || java_libjvm_file.empty?
-      nil
-    else
-      File.dirname(java_libjvm_file[0])
+    java_major_version = Facter.value(:java_major_version)
+    unless java_major_version.nil?
+      java_libjvm_file = if java_major_version.to_i >= 11
+                           Dir.glob("#{java_default_home}/lib/**/libjvm.so")
+                         else
+                           Dir.glob("#{java_default_home}/jre/lib/**/libjvm.so")
+                         end
+      if java_libjvm_file.nil? || java_libjvm_file.empty?
+        nil
+      else
+        File.dirname(java_libjvm_file[0])
+      end
    end
  end
 end
--- a/lib/facter/java_major_version.rb
+++ b/lib/facter/java_major_version.rb
@@ -16,7 +16,13 @@ Facter.add(:java_major_version) do
  java_major_version = nil
  setcode do
    java_version = Facter.value(:java_version)
-    java_major_version = java_version.strip.split('_')[0].split('.')[1] unless java_version.nil?
+    unless java_version.nil?
+      java_major_version = if java_version.strip[0..1] == '1.'
+                             java_version.strip.split('_')[0].split('.')[1]
+                           else
+                             java_version.strip.split('.')[0]
+                           end
+    end
  end
  java_major_version
 end
--- a/lib/facter/java_patch_level.rb
+++ b/lib/facter/java_patch_level.rb
@@ -3,7 +3,7 @@
 # Purpose: get Java's patch level
 #
 # Resolution:
-#   Uses java_version fact splits on the patch number (after _)
+#   Uses java_version fact splits on the patch number (after _ for 1.x and patch number for semver'ed javas)
 #
 # Caveats:
 #   none
@@ -14,7 +14,13 @@ Facter.add(:java_patch_level) do
  java_patch_level = nil
  setcode do
    java_version = Facter.value(:java_version)
-    java_patch_level = java_version.strip.split('_')[1] unless java_version.nil?
+    unless java_version.nil?
+      if java_version.strip[0..1] == '1.'
+        java_patch_level = java_version.strip.split('_')[1] unless java_version.nil?
+      else
+        java_patch_level = java_version.strip.split('.')[2] unless java_version.nil?
+      end
+    end
  end
  java_patch_level
 end
--- a/lib/facter/java_version.rb
+++ b/lib/facter/java_version.rb
@@ -4,7 +4,7 @@
 #
 # Resolution:
 #   Tests for presence of java, returns nil if not present
-#   returns output of "java -version" and splits on \n + '"'
+#   returns output of "java -version" and splits on '"'
 #
 # Caveats:
 #   none
@@ -24,7 +24,7 @@ Facter.add(:java_version) do
    unless ['darwin'].include? Facter.value(:operatingsystem).downcase
      version = nil
      if Facter::Util::Resolution.which('java')
-        Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = $LAST_MATCH_INFO[1] if %r{^.+ version \"(.+)\"$} =~ line }
+        Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = Regexp.last_match(1) if %r{^.+ version \"(.+)\"} =~ line }
      end
      version
    end
@@ -37,7 +37,7 @@ Facter.add(:java_version) do
  setcode do
    unless %r{Unable to find any JVMs matching version} =~ Facter::Util::Resolution.exec('/usr/libexec/java_home --failfast 2>&1')
      version = nil
-      Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = $LAST_MATCH_INFO[1] if %r{^.+ version \"(.+)\"$} =~ line }
+      Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = Regexp.last_match(1) if %r{^.+ version \"(.+)\"} =~ line }
      version
    end
  end
--- a/manifests/adopt.pp
+++ b/manifests/adopt.pp
@@ -0,0 +1,371 @@
+# Defined Type java::adopt
+#
+# Description
+# Installs OpenJDK Java built with AdoptOpenJDK with the Hotspot JVM.
+#
+# Install one or more versions of AdoptOpenJDK Java.
+#
+# Currently only Linux RedHat, Amazon and Debian are supported.
+#
+# Parameters
+# [*version*]
+# Version of Java to install, e.g. '8' or '9'. Default values for major and minor
+# versions will be used.
+#
+# [*version_major*]
+# Major version which should be installed, e.g. '8u101' or '9.0.4'. Must be used together with
+# version_minor.
+#
+# [*version_minor*]
+# Minor version which should be installed, e.g. 'b12' (for version = '8') or '11' (for version != '8').
+# Must be used together with version_major.
+#
+# [*java_edition*]
+# Type of Java Edition to install, jdk or jre.
+#
+# [*ensure*]
+# Install or remove the package.
+#
+# [*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)
+#
+# [*basedir*]
+# Directory under which the installation will occur. If not set, defaults to
+# /usr/lib/jvm for Debian and /usr/java for RedHat.
+#
+# [*manage_basedir*]
+# Whether to manage the basedir directory.  Defaults to false.
+# Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter.
+#
+# [*package_type*]
+# Type of installation package for specified version of java. java 6 comes
+# in a few installation package flavors and we need to account for them.
+# Optional forced package types: rpm, rpmbin, tar.gz
+#
+# Variables
+# [*release_major*]
+# Major version release number for java. Used to construct download URL.
+#
+# [*release_minor*]
+# Minor version release number for java. Used to construct download URL.
+#
+# [*install_path*]
+# Base install path for specified version of java. Used to determine if java
+# has already been installed.
+#
+# [*os*]
+# java OS type.
+#
+# [*destination*]
+# Destination directory to save java installer to.  Usually /tmp on Linux and
+# C:\TEMP on Windows.
+#
+# [*creates_path*]
+# Fully qualified path to java after it is installed. Used to determine if
+# java is already installed.
+#
+# [*arch*]
+# java architecture type.
+#
+# [*package_name*]
+# Name of the java installation package to download from github.
+#
+# [*install_command*]
+# Installation command used to install java. 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.
+#
+# [*spacer*]
+# Spacer to be used in github download url. In major version 8 this is a simple dash
+# in later versions they use a crazy plus sign, which needs to be used in urlencoded
+# format
+#
+# [*download_folder_prefix*]
+# Download folder name begins differently depending on the release. After major release
+# 8, they have given it a dash. Be aware that even if you want to have a JRE, the folder
+# still begins with "jdk"
+#
+# [*release_minor_url*]
+# filled depending on major release. Until major release 8 the minor part needs to be given
+# with a 'b' for build, in later versions it is a underscore or a plus sign, which needs
+# to be stripped for the download url and is replaced with the given spaces (see above)
+#
+# [*_package_type*]
+# Helper variable which gets filled depending on parameter package_type
+#
+# [*_basedir*]
+# Helper variable which gets filled depending on parameter basedir
+#
+# [*_version*]
+# Helper variable which gets filled depending on parameter version
+#
+# [*_version_int*]
+# Helper variable which gets the value of $_version converted to integer
+#
+# [*_append_jre*]
+# Helper variable which gets filled with the string "-jre" if jre was selected to build the correct install path
+#
+# [*_release_minor_package_name*]
+# Helper variable which gets filled with the right minor string depending on the major version
+#
+define java::adopt (
+  $ensure         = 'present',
+  $version        = '8',
+  $version_major  = undef,
+  $version_minor  = undef,
+  $java           = 'jdk',
+  $proxy_server   = undef,
+  $proxy_type     = undef,
+  $basedir        = undef,
+  $manage_basedir = true,
+  $package_type   = undef,
+) {
+
+  # archive module is used to download the java package
+  include ::archive
+
+  # validate java Standard Edition to download
+  if $java !~ /(jre|jdk)/ {
+    fail('java must be either jre or jdk.')
+  }
+
+  # determine AdoptOpenJDK Java major and minor version, and installation path
+  if $version_major and $version_minor {
+
+    $release_major = $version_major
+    $release_minor = $version_minor
+
+    if ( $version_major[0] == '8' or $version_major[0] == '9' ) {
+      $_version = $version_major[0]
+    } else {
+      $_version = $version_major[0,2]
+    }
+
+    $_version_int = Numeric($_version)
+
+    if ( $java == 'jre' ) {
+      $_append_jre = '-jre'
+    } else {
+      $_append_jre = ''
+    }
+
+    # extracted folders look like this:
+    #  jdk8u202-b08
+    #  jdk-9.0.4+11
+    #  jdk-10.0.2+13
+    #  jdk-11.0.2+9
+    #  jdk-12.0.1+12
+    #  jdk8u202-b08-jre
+    #  jdk-9.0.4+11-jre
+    # hence we need to check for the major version and build the install path according to it
+    if ( $_version_int == 8 ) {
+      $install_path = "jdk${release_major}-${release_minor}${_append_jre}"
+    } elsif ( $_version_int > 8 ) {
+      $install_path = "jdk-${release_major}+${release_minor}${_append_jre}"
+    } else {
+      fail ("unsupported version ${_version}")
+    }
+
+  } else {
+    $_version = $version
+    $_version_int = Numeric($_version)
+    # use default versions if no specific major and minor version parameters are provided
+    case $version {
+      '8' : {
+        $release_major = '8u202'
+        $release_minor = 'b08'
+        $install_path = "${java}8u202-b08"
+      }
+      '9' : {
+        $release_major = '9.0.4'
+        $release_minor = '11'
+        $install_path = "${java}-9.0.4+11"
+      }
+      # minor release is given with +<number>, however package etc. works with underscore, so we use underscore here
+      '10' : {
+        $release_major = '10.0.2'
+        $release_minor = '13'
+        $install_path = "${java}-10.0.2+13"
+      }
+      '11' : {
+        $release_major = '11.0.2'
+        $release_minor = '9'
+        $install_path = "${java}-11.0.2+9"
+      }
+      # minor release is given with +<number>, however package etc. works with underscore, so we use underscore here
+      '12' : {
+        $release_major = '12.0.1'
+        $release_minor = '12'
+        $install_path = "${java}-12.0.1+12"
+      }
+      default : {
+        $release_major = '8u202'
+        $release_minor = 'b08'
+        $install_path = "${java}8u202-b08"
+      }
+    }
+  }
+
+  # determine package type (exe/tar/rpm), destination directory based on OS
+  case $facts['kernel'] {
+    'Linux' : {
+      case $facts['os']['family'] {
+        'RedHat', 'Amazon' : {
+          if $package_type {
+            $_package_type = $package_type
+          } else {
+            $_package_type = 'tar.gz'
+          }
+          if $basedir {
+            $_basedir = $basedir
+          } else {
+            $_basedir = '/usr/java'
+          }
+        }
+        'Debian' : {
+          if $package_type {
+            $_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/'
+    }
+    default : {
+      fail ( "unsupported platform ${$facts['kernel']}" ) }
+  }
+
+  # set java architecture nomenclature
+  $os_architecture = $facts['os']['architecture'] ? {
+    undef => $facts['architecture'],
+    default => $facts['os']['architecture']
+  }
+
+  case $os_architecture {
+    'i386' : { $arch = 'x86-32' }
+    'x86_64' : { $arch = 'x64' }
+    'amd64' : { $arch = 'x64' }
+    default : {
+      fail ("unsupported platform ${$os_architecture}")
+    }
+  }
+
+  # package name and path for download from github
+  #
+  # following are build based on this real life example full URLs:
+  #
+  # https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u202-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz
+  # https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9.0.4%2B11/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
+  # https://github.com/AdoptOpenJDK/openjdk10-binaries/releases/download/jdk-10.0.2%2B13/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz
+  # https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz
+  # https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.1%2B12/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz
+  # jre just replaces jdk with jre in the archive name, but not in the path name!
+  # https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9.0.4%2B11/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz
+
+  if ( $_version_int == 8 ) {
+    $_release_minor_package_name = $release_minor
+  } else {
+    $_release_minor_package_name = "_${release_minor}"
+  }
+
+  case $_package_type {
+    'tar.gz': {
+      $package_name = "OpenJDK${_version}U-${java}_${arch}_${os}_hotspot_${release_major}${_release_minor_package_name}.tar.gz"
+    }
+    default: {
+      $package_name = "OpenJDK${_version}U-${java}_${arch}_${os}_hotspot_${release_major}${_release_minor_package_name}.tar.gz"
+    }
+  }
+
+  # naming convention changed after major version 8, setting variables to consider that
+  # download_folder_prefix always begins with "jdk", even for jre! see comments for package_name above
+  if ( $_version_int == 8 ) {
+    $spacer = '-'
+    $download_folder_prefix = 'jdk'
+  } else {
+    $spacer = '%2B'
+    $download_folder_prefix = 'jdk-'
+  }
+  $source = "https://github.com/AdoptOpenJDK/openjdk${_version}-binaries/releases/download/${download_folder_prefix}${release_major}${spacer}${release_minor}/${package_name}"
+
+  # full path to the installer
+  $destination = "${destination_dir}${package_name}"
+  notice ("Destination is ${destination}")
+
+  case $_package_type {
+    'tar.gz' : {
+      $install_command = "tar -zxf ${destination} -C ${_basedir}"
+    }
+    default : {
+      $install_command = "tar -zxf ${destination} -C ${_basedir}"
+    }
+  }
+
+  case $ensure {
+    'present' : {
+      archive { $destination :
+        ensure       => present,
+        source       => $source,
+        extract_path => '/tmp',
+        cleanup      => false,
+        creates      => $creates_path,
+        proxy_server => $proxy_server,
+        proxy_type   => $proxy_type,
+      }
+      case $facts['kernel'] {
+        'Linux' : {
+          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 {
+            if (!defined(File[$_basedir])) {
+              file { $_basedir:
+                ensure => 'directory',
+                before => Exec["Install AdoptOpenJDK java ${java} ${_version} ${release_major} ${release_minor}"],
+              }
+            }
+          }
+
+          exec { "Install AdoptOpenJDK java ${java} ${_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 => $install_requires
+          }
+
+        }
+        default : {
+          fail ("unsupported platform ${$facts['kernel']}")
+        }
+      }
+    }
+    default : {
+      notice ("Action ${ensure} not supported.")
+    }
+  }
+
+}
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -1,6 +1,6 @@
 # @api private
 class java::config ( ) {
-  case $::osfamily {
+  case $facts['os']['family'] {
    'Debian': {
      if $java::use_java_alternative != undef and $java::use_java_alternative_path != undef {
        exec { 'update-java-alternatives':
@@ -26,7 +26,7 @@ class java::config ( ) {
            path    => '/usr/bin:/usr/sbin:/bin:/sbin',
            command => "alternatives --install /usr/bin/java java ${$java::use_java_alternative_path} 20000" ,
            unless  => "alternatives --display java | grep -q ${$java::use_java_alternative_path}",
-            before  => Exec['update-java-alternatives']
+            before  => Exec['update-java-alternatives'],
          }
        }

--- a/manifests/download.pp
+++ b/manifests/download.pp
@@ -1,18 +1,8 @@
-# Defined Type java::oracle
+# Defined Type java::download
 #
 # @summary
-#   Installs Oracle Java. By using this module you agree to the Oracle licensing
-#   agreement.
+#   Installs Java from a url location.
 #
-# 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"
-#```
 #
 # @param ensure
 #   Install or remove the package.
@@ -29,9 +19,6 @@
 # @param java_se
 #   Type of Java Standard Edition to install, jdk or jre.
 #
-# @param oracle_url
-#   Official Oracle URL to download binaries from.
-#
 # @param proxy_server
 #   Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
 #
@@ -39,13 +26,7 @@
 #   Proxy server type (none|http|https|ftp). (passed to archive)
 #
 # @param 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.
-#
-# @param 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.
+#   Full URL
 #
 # @param jce
 #   Install Oracles Java Cryptographic Extensions into the JRE or JDK
@@ -72,17 +53,15 @@
 # @param symlink_name
 #   The name for the optional symlink in the installation directory.
 #
-define java::oracle (
+define java::download(
  $ensure         = 'present',
  $version        = '8',
  $version_major  = undef,
  $version_minor  = undef,
  $java_se        = 'jdk',
-  $oracle_url     = 'http://download.oracle.com/otn-pub/java/jdk/',
  $proxy_server   = undef,
  $proxy_type     = undef,
  $url            = undef,
-  $url_hash       = undef,
  $jce            = false,
  $jce_url        = undef,
  $basedir        = undef,
@@ -93,7 +72,7 @@ define java::oracle (
 ) {

  # archive module is used to download the java package
-  include ::archive
+  include archive

  # validate java Standard Edition to download
  if $java_se !~ /(jre|jdk)/ {
@@ -103,31 +82,23 @@ define java::oracle (
  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'
+      fail('JCE URL must be specified')
    }
  }

-  # determine Oracle Java major and minor version, and installation path
+  # determine 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+)/ {
      # 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' {
+      if $facts['os']['family'] == 'RedHat' and Numeric($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}"
@@ -143,25 +114,21 @@ define java::oracle (
        $release_major = '6u45'
        $release_minor = 'b06'
        $install_path = "${java_se}1.6.0_45"
-        $release_hash  = undef
      }
      '7' : {
        $release_major = '7u80'
        $release_minor = 'b15'
        $install_path = "${java_se}1.7.0_80"
-        $release_hash  = undef
      }
      '8' : {
        $release_major = '8u201'
        $release_minor = 'b09'
        $install_path = "${java_se}1.8.0_201"
-        $release_hash  = '42970487e3af4f5aa5bca3f542482c60'
      }
      default : {
        $release_major = '8u201'
        $release_minor = 'b09'
        $install_path = "${java_se}1.8.0_201"
-        $release_hash  = '42970487e3af4f5aa5bca3f542482c60'
      }
    }
  }
@@ -216,7 +183,7 @@ define java::oracle (

  # set java architecture nomenclature
  $os_architecture = $facts['os']['architecture'] ? {
-    undef => $facts['architecture'],
+    undef => $facts['os']['architecture'],
    default => $facts['os']['architecture']
  }

@@ -235,7 +202,7 @@ define java::oracle (
  # JaveSE 6 distributed in .bin format
  # 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
+  # package name to use in destination directory for the installer
  case $_package_type {
    'bin' : {
      $package_name = "${java_se}-${release_major}-${os}-${arch}.bin"
@@ -258,11 +225,8 @@ define java::oracle (
  if $url {
    $source = $url
  }
-  elsif $release_hash != undef {
-    $source = "${oracle_url}/${release_major}-${release_minor}/${release_hash}/${package_name}"
-  }
  else {
-    $source = "${oracle_url}/${release_major}-${release_minor}/${package_name}"
+    fail('Url must be specified')
  }

  # full path to the installer
@@ -292,7 +256,6 @@ define java::oracle (
      archive { $destination :
        ensure       => present,
        source       => $source,
-        cookie       => 'gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie',
        extract_path => '/tmp',
        cleanup      => false,
        creates      => $creates_path,
@@ -321,14 +284,14 @@ define java::oracle (
            path    => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
            command => $install_command,
            creates => $creates_path,
-            require => $install_requires
+            require => $install_requires,
          }

          if ($manage_symlink and $symlink_name) {
            file { "${_basedir}/${symlink_name}":
              ensure  => link,
              target  => $creates_path,
-              require => Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"]
+              require => Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"],
            }
          }

@@ -339,7 +302,6 @@ define java::oracle (
            }
            archive { "/tmp/jce-${version}.zip":
              source        => $jce_download,
-              cookie        => $cookie,
              extract       => true,
              extract_path  => $jce_path,
              extract_flags => '-oj',
@@ -350,7 +312,7 @@ define java::oracle (
              require       => [
                Package['unzip'],
                Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"]
-              ]
+              ],
            }
          }
        }
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -101,7 +101,7 @@ class java(
      $use_java_package_name == undef or $use_java_alternative == undef or
      $use_java_alternative_path == undef or $use_java_home == undef
    ) and (
-      ! has_key($::java::params::java, $distribution)
+      ! has_key($java::params::java, $distribution)
    )) {
    fail("Java distribution ${distribution} is not supported. Missing default values.")
  }
@@ -111,7 +111,7 @@ class java(
    default    => '--jre'
  }

-  if $::osfamily == 'Debian' {
+  if $facts['os']['family'] == 'Debian' {
    # Needed for update-java-alternatives
    package { 'java-common':
      ensure => present,
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -6,23 +6,23 @@
 # @api private
 class java::params {

-  case $::osfamily {
+  case $facts['os']['family'] {
    'RedHat': {
-      case $::operatingsystem {
+      case $facts['os']['name'] {
        'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC', 'CloudLinux': {
-          if (versioncmp($::operatingsystemrelease, '5.0') < 0) {
+          if (versioncmp($facts['os']['release']['full'], '5.0') < 0) {
            $jdk_package = 'java-1.6.0-sun-devel'
            $jre_package = 'java-1.6.0-sun'
            $java_home   = '/usr/lib/jvm/java-1.6.0-sun/jre/'
          }
          # See cde7046 for why >= 5.0 < 6.3
-          elsif (versioncmp($::operatingsystemrelease, '6.3') < 0) {
+          elsif (versioncmp($facts['os']['release']['full'], '6.3') < 0) {
            $jdk_package = 'java-1.6.0-openjdk-devel'
            $jre_package = 'java-1.6.0-openjdk'
            $java_home   = '/usr/lib/jvm/java-1.6.0/'
          }
          # See PR#160 / c8e46b5 for why >= 6.3 < 7.1
-          elsif (versioncmp($::operatingsystemrelease, '7.1') < 0) {
+          elsif (versioncmp($facts['os']['release']['full'], '7.1') < 0) {
            $jdk_package = 'java-1.7.0-openjdk-devel'
            $jre_package = 'java-1.7.0-openjdk'
            $java_home   = '/usr/lib/jvm/java-1.7.0/'
@@ -34,23 +34,23 @@ class java::params {
          }
        }
        'Fedora': {
-          if (versioncmp($::operatingsystemrelease, '21') < 0) {
+          if (versioncmp($facts['os']['release']['full'], '21') < 0) {
            $jdk_package = 'java-1.7.0-openjdk-devel'
            $jre_package = 'java-1.7.0-openjdk'
-            $java_home   = "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/"
+            $java_home   = "/usr/lib/jvm/java-1.7.0-openjdk-${facts['os']['architecture']}/"
          }
          else {
            $jdk_package = 'java-1.8.0-openjdk-devel'
            $jre_package = 'java-1.8.0-openjdk'
-            $java_home   = "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/"
+            $java_home   = "/usr/lib/jvm/java-1.8.0-openjdk-${facts['os']['architecture']}/"
          }
        }
        'Amazon': {
          $jdk_package = 'java-1.7.0-openjdk-devel'
          $jre_package = 'java-1.7.0-openjdk'
-          $java_home   = "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/"
+          $java_home   = "/usr/lib/jvm/java-1.7.0-openjdk-${facts['os']['architecture']}/"
        }
-        default: { fail("unsupported os ${::operatingsystem}") }
+        default: { fail("unsupported os ${facts['os']['name']}") }
      }
      $java = {
        'jdk' => {
@@ -64,45 +64,17 @@ class java::params {
      }
    }
    'Debian': {
-      $oracle_architecture = $::architecture ? {
+      $oracle_architecture = $facts['os']['architecture'] ? {
        'amd64' => 'x64',
-        default => $::architecture
+        default => $facts['os']['architecture']
      }
-      $openjdk_architecture = $::architecture ? {
+      $openjdk_architecture = $facts['os']['architecture'] ? {
        'aarch64' => 'arm64',
        'armv7l'  => 'armhf',
-        default   => $::architecture
+        default   => $facts['os']['architecture']
      }
-      case $::lsbdistcodename {
-        'lenny', 'squeeze', 'lucid', 'natty': {
-          $java  = {
-            'jdk' => {
-              'package'          => 'openjdk-6-jdk',
-              '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-${openjdk_architecture}",
-              'alternative_path' => '/usr/lib/jvm/java-6-openjdk/jre/bin/java',
-              'java_home'        => '/usr/lib/jvm/java-6-openjdk/jre/',
-            },
-            'sun-jre' => {
-              'package'          => 'sun-java6-jre',
-              'alternative'      => 'java-6-sun',
-              'alternative_path' => '/usr/lib/jvm/java-6-sun/jre/bin/java',
-              'java_home'        => '/usr/lib/jvm/java-6-sun/jre/',
-            },
-            'sun-jdk' => {
-              'package'          => 'sun-java6-jdk',
-              'alternative'      => 'java-6-sun',
-              'alternative_path' => '/usr/lib/jvm/java-6-sun/jre/bin/java',
-              'java_home'        => '/usr/lib/jvm/java-6-sun/jre/',
-            },
-          }
-        }
-        'wheezy', 'jessie', 'precise', 'quantal', 'raring', 'saucy', 'trusty', 'utopic': {
+      case $facts['os']['release']['major'] {
+        '7', '8', '14.04': {
          $java =  {
            'jdk' => {
              'package'          => 'openjdk-7-jdk',
@@ -112,7 +84,7 @@ class java::params {
            },
            'jre' => {
              'package'          => 'openjdk-7-jre-headless',
-              'alternative'      => "java-1.7.0-openjdk-${::architecture}",
+              'alternative'      => "java-1.7.0-openjdk-${facts['os']['architecture']}",
              'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${openjdk_architecture}/bin/java",
              'java_home'        => "/usr/lib/jvm/java-1.7.0-openjdk-${openjdk_architecture}/",
            },
@@ -154,7 +126,7 @@ class java::params {
            },
          }
        }
-        'stretch', 'vivid', 'wily', 'xenial', 'yakkety', 'zesty', 'artful': {
+        '9', '15.04', '15.10', '16.04', '16.10', '17.04', '17.10': {
          $java =  {
            'jdk' => {
              'package'          => 'openjdk-8-jdk',
@@ -167,10 +139,10 @@ class java::params {
              'alternative'      => "java-1.8.0-openjdk-${openjdk_architecture}",
              'alternative_path' => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/bin/java",
              'java_home'        => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/",
-            }
+            },
          }
        }
-        'bionic': {
+        '10', '18.04', '18.10', '19.04', '19.10': {
          $java =  {
            'jdk' => {
              'package'          => 'openjdk-11-jdk',
@@ -183,10 +155,10 @@ class java::params {
              '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}/",
-            }
+            },
          }
        }
-        default: { fail("unsupported release ${::lsbdistcodename}") }
+        default: { fail("unsupported release ${facts['os']['release']['major']}") }
      }
    }
    'OpenBSD': {
@@ -226,17 +198,17 @@ class java::params {
      }
    }
    'Suse': {
-      case $::operatingsystem {
+      case $facts['os']['name'] {
        'SLES': {
-          if (versioncmp($::operatingsystemrelease, '12.1') >= 0) {
+          if (versioncmp($facts['os']['release']['full'], '12.1') >= 0) {
            $jdk_package = 'java-1_8_0-openjdk-devel'
            $jre_package = 'java-1_8_0-openjdk'
            $java_home   = '/usr/lib64/jvm/java-1.8.0-openjdk-1.8.0/'
-          } elsif (versioncmp($::operatingsystemrelease, '12') >= 0) {
+          } elsif (versioncmp($facts['os']['release']['full'], '12') >= 0) {
            $jdk_package = 'java-1_7_0-openjdk-devel'
            $jre_package = 'java-1_7_0-openjdk'
            $java_home   = '/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/'
-          } elsif (versioncmp($::operatingsystemrelease, '11.4') >= 0) {
+          } elsif (versioncmp($facts['os']['release']['full'], '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.1-ibm-1.7.1/'
@@ -283,6 +255,6 @@ class java::params {
        },
      }
    }
-    default: { fail("unsupported platform ${::osfamily}") }
+    default: { fail("unsupported platform ${facts['os']['family']}") }
  }
 }
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
  "name": "puppetlabs-java",
-  "version": "4.1.0",
+  "version": "6.2.0",
  "author": "puppetlabs",
  "summary": "Installs the correct Java package on various platforms.",
  "license": "Apache-2.0",
@@ -32,7 +32,8 @@
      "operatingsystemrelease": [
        "5",
        "6",
-        "7"
+        "7",
+        "8"
      ]
    },
    {
@@ -52,7 +53,8 @@
      "operatingsystem": "Debian",
      "operatingsystemrelease": [
        "8",
-        "9"
+        "9",
+        "10"
      ]
    },
    {
@@ -79,6 +81,6 @@
    }
  ],
  "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-gf778803",
-  "pdk-version": "1.10.0"
+  "template-ref": "heads/master-0-g88c96ab",
+  "pdk-version": "1.16.0"
 }
--- a/provision.yaml
+++ b/provision.yaml
@@ -0,0 +1,22 @@
+---
+default:
+  provisioner: docker 
+  images: ['waffleimage/debian8']
+vagrant:
+  provisioner: vagrant
+  images: ['centos/7', 'generic/ubuntu1804']
+travis_deb:
+  provisioner: docker
+  images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/debian10']
+travis_ub:
+  provisioner: docker
+  images: ['waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
+travis_el6:
+  provisioner: docker
+  images: ['waffleimage/centos6', 'waffleimage/oraclelinux6', 'waffleimage/scientificlinux6']
+travis_el7:
+  provisioner: docker
+  images: ['waffleimage/centos7', 'waffleimage/oraclelinux7', 'waffleimage/scientificlinux7']
+release_checks:
+  provisioner: vmpooler
+  images: ['redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']
--- a/spec/acceptance/install_spec.rb
+++ b/spec/acceptance/install_spec.rb
@@ -1,6 +1,5 @@
 require 'spec_helper_acceptance'
-
-include Unix::File
+require 'pry'

 java_class_jre = "class { 'java':\n"\
                 "  distribution => 'jre',\n"\
@@ -22,14 +21,6 @@ _sun_jdk = "class { 'java':\n"\
          "  distribution => 'sun-jdk',\n"\
          '}'

-oracle_jre = "class { 'java':\n"\
-             "  distribution => 'oracle-jre',\n"\
-             '}'
-
-oracle_jdk = "class { 'java':\n"\
-             "  distribution => 'oracle-jdk',\n"\
-             '}'
-
 blank_version = "class { 'java':\n"\
                "  version => '',\n"\
                '}'
@@ -105,34 +96,57 @@ install_oracle_jdk_jce = <<EOL
  }
 EOL

-context 'installing java jre', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+# AdoptOpenJDK URLs are quite generic, so tests are enabled by default
+# We need to test version 8 and >8 (here we use 9), because namings are different after version 8
+
+adopt_enabled = true unless os[:family].casecmp('SLES').zero?
+adopt_version8_major = '8'
+adopt_version8_minor = '202'
+adopt_version8_build = '08'
+adopt_version9_major = '9'
+adopt_version9_full = '9.0.4'
+adopt_version9_build = '11'
+
+install_adopt_jdk_jre = <<EOL
+  java::adopt {
+    'test_adopt_jre_version8':
+      version       => '#{adopt_version8_major}',
+      version_major => '#{adopt_version8_major}u#{adopt_version8_minor}',
+      version_minor => 'b#{adopt_version8_build}',
+      java          => 'jre',
+  }
+  java::adopt {
+    'test_adopt_jdk_version8':
+      version       => '#{adopt_version8_major}',
+      version_major => '#{adopt_version8_major}u#{adopt_version8_minor}',
+      version_minor => 'b#{adopt_version8_build}',
+      java          => 'jdk',
+  }
+  java::adopt {
+    'test_adopt_jre_version9':
+      version       => '#{adopt_version9_major}',
+      version_major => '#{adopt_version9_full}',
+      version_minor => '#{adopt_version9_build}',
+      java          => 'jre',
+  }
+  java::adopt {
+    'test_adopt_jdk_version9':
+      version       => '#{adopt_version9_major}',
+      version_major => '#{adopt_version9_full}',
+      version_minor => '#{adopt_version9_build}',
+      java          => 'jdk',
+  }
+EOL
+
+context 'installing java jre', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
  it 'installs jre' do
-    idempotent_apply(default, java_class_jre)
+    idempotent_apply(java_class_jre)
  end
 end

-context 'installing java jdk', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+context 'installing java jdk', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
  it 'installs jdk' do
-    idempotent_apply(default, java_class)
-  end
-end
-
-context 'oracle', if: (
-  (fact('operatingsystem') == 'Ubuntu') && fact('operatingsystemrelease').match(%r{^14\.04})
-) do
-  # not supported
-  # The package is not available from any sources, but if a customer
-  # custom-builds the package using java-package and adds it to a local
-  # repository, that is the intention of this version ability
-  describe 'jre' do
-    it 'installs oracle-jre' do
-      apply_manifest(oracle_jre, expect_failures: true)
-    end
-  end
-  describe 'jdk' do
-    it 'installs oracle-jdk' do
-      apply_manifest(oracle_jdk, expect_failures: true)
-    end
+    idempotent_apply(java_class)
  end
 end

@@ -154,25 +168,25 @@ context 'with failure cases' do
  end

  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)
-    else
+    if os[:family] == 'sles'
      apply_manifest(bogus_alternative, catch_failures: true)
+    else
+      apply_manifest(bogus_alternative, expect_failures: true)
    end
  end
 end

-context 'java::oracle', if: oracle_enabled, unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+context 'java::oracle', if: oracle_enabled, unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
  let(:install_path) do
-    (fact('osfamily') == 'RedHat') ? '/usr/java' : '/usr/lib/jvm'
+    (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm'
  end

  let(:version_suffix) do
-    (fact('osfamily') == 'RedHat') ? '-amd64' : ''
+    (os[:family] == 'redhat') ? '-amd64' : ''
  end

  it 'installs oracle jdk and jre' do
-    idempotent_apply(default, install_oracle_jdk_jre)
+    idempotent_apply(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)
@@ -180,14 +194,28 @@ context 'java::oracle', if: oracle_enabled, unless: UNSUPPORTED_PLATFORMS.includ
  end

  it 'installs oracle jdk with jce' do
-    idempotent_apply(default, install_oracle_jdk_jce)
+    idempotent_apply(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)
+    idempotent_apply(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
+
+context 'java::adopt', if: adopt_enabled, unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
+  let(:install_path) do
+    (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm'
+  end
+
+  let(:version_suffix) do
+    (os[:family] == 'redhat') ? '-amd64' : ''
+  end
+
+  it 'installs adopt jdk and jre' do
+    idempotent_apply(install_adopt_jdk_jre)
+  end
+end
--- a/spec/acceptance/nodesets/centos-7-x64.yml
+++ b/spec/acceptance/nodesets/centos-7-x64.yml
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-7-x64:
-    roles:
-      - agent
-      - default
-    platform: el-7-x86_64
-    hypervisor: vagrant
-    box: puppetlabs/centos-7.2-64-nocm
-CONFIG:
-  type: foss
--- a/spec/acceptance/nodesets/debian-8-x64.yml
+++ b/spec/acceptance/nodesets/debian-8-x64.yml
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-8-x64:
-    roles:
-      - agent
-      - default
-    platform: debian-8-amd64
-    hypervisor: vagrant
-    box: puppetlabs/debian-8.2-64-nocm
-CONFIG:
-  type: foss
--- a/spec/acceptance/nodesets/default.yml
+++ b/spec/acceptance/nodesets/default.yml
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-1404-x64:
-    roles:
-      - agent
-      - default
-    platform: ubuntu-14.04-amd64
-    hypervisor: vagrant
-    box: puppetlabs/ubuntu-14.04-64-nocm
-CONFIG:
-  type: foss
--- a/spec/acceptance/nodesets/docker/centos-7.yml
+++ b/spec/acceptance/nodesets/docker/centos-7.yml
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-7-x64:
-    platform: el-7-x86_64
-    hypervisor: docker
-    image: centos:7
-    docker_preserve_image: true
-    docker_cmd: '["/usr/sbin/init"]'
-    # install various tools required to get the image up to usable levels
-    docker_image_commands:
-      - 'yum install -y crontabs tar wget openssl sysvinit-tools iproute which initscripts'
-CONFIG:
-  trace_limit: 200
--- a/spec/acceptance/nodesets/docker/debian-8.yml
+++ b/spec/acceptance/nodesets/docker/debian-8.yml
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-8-x64:
-    platform: debian-8-amd64
-    hypervisor: docker
-    image: debian:8
-    docker_preserve_image: true
-    docker_cmd: '["/sbin/init"]'
-    docker_image_commands:
-      - 'apt-get update && apt-get install -y net-tools wget locales strace lsof && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen'
-CONFIG:
-  trace_limit: 200
--- a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml
+++ b/spec/acceptance/nodesets/docker/ubuntu-14.04.yml
@@ -1,12 +0,0 @@
-HOSTS:
-  ubuntu-1404-x64:
-    platform: ubuntu-14.04-amd64
-    hypervisor: docker
-    image: ubuntu:14.04
-    docker_preserve_image: true
-    docker_cmd: '["/sbin/init"]'
-    docker_image_commands:
-      # ensure that upstart is booting correctly in the container
-      - 'rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl && apt-get update && apt-get install -y net-tools wget && locale-gen en_US.UTF-8'
-CONFIG:
-  trace_limit: 200
--- a/spec/classes/java_spec.rb
+++ b/spec/classes/java_spec.rb
@@ -1,36 +1,36 @@
 require 'spec_helper'

 describe 'java', type: :class do
-  context 'when select openjdk for Centos 5.8' do
-    let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '5.8', architecture: 'x86_64' } }
+  context 'when select openjdk for CentOS 5.8' do
+    let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '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 'when select openjdk for Centos 6.3' do
-    let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '6.3', architecture: 'x86_64' } }
+  context 'when select openjdk for CentOS 6.3' do
+    let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '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 'when select openjdk for Centos 7.1.1503' do
-    let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '7.1.1503', architecture: 'x86_64' } }
+  context 'when select openjdk for CentOS 7.1.1503' do
+    let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '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 'when select openjdk for Centos 6.2' do
-    let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '6.2', architecture: 'x86_64' } }
+  context 'when select openjdk for CentOS 6.2' do
+    let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '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 'when select Oracle JRE with alternatives for Centos 6.3' do
-    let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '6.3', architecture: 'x86_64' } }
+  context 'when select Oracle JRE with alternatives for CentOS 6.3' do
+    let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '6.3' }, architecture: 'x86_64' } } }
    let(:params) { { 'package' => 'jre', 'java_alternative' => '/usr/bin/java', 'java_alternative_path' => '/usr/java/jre1.7.0_67/bin/java' } }

    it { is_expected.to contain_package('java').with_name('jre') }
@@ -38,23 +38,39 @@ 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 'when select passed value for Centos 5.3' do
-    let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '5.3', architecture: 'x86_64' } }
+  context 'when select passed value for CentOS 5.3' do
+    let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '5.3' }, architecture: 'x86_64' } } }
    let(:params) { { 'package' => 'jdk', 'java_home' => '/usr/local/lib/jre' } }

    it { is_expected.to contain_package('java').with_name('jdk') }
    it { is_expected.not_to contain_exec('update-java-alternatives') }
  end

-  context 'when select default for Centos 5.3' do
-    let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '5.3', architecture: 'x86_64' } }
+  context 'when select default for CentOS 5.3' do
+    let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '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 'when select jdk for Debian Buster (10.0)' do
+    let(:facts) { { os: { family: 'Debian', name: 'Debian', lsb: { distcodename: 'buster' }, release: { major: '10' }, architecture: 'amd64' } } }
+    let(:params) { { 'distribution' => 'jdk' } }
+
+    it { is_expected.to contain_package('java').with_name('openjdk-11-jdk') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64/') }
+  end
+
+  context 'when select jre for Debian Buster (10.0)' do
+    let(:facts) { { os: { family: 'Debian', name: 'Debian', lsb: { distcodename: 'buster' }, release: { major: '10' }, architecture: 'amd64' } } }
+    let(:params) { { 'distribution' => 'jre' } }
+
+    it { is_expected.to contain_package('java').with_name('openjdk-11-jre-headless') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64/') }
+  end
+
  context 'when select jdk for Ubuntu Trusty (14.04)' do
-    let(:facts) { { osfamily: 'Debian', operatingsystem: 'Ubuntu', lsbdistcodename: 'trusty', operatingsystemrelease: '14.04', architecture: 'amd64' } }
+    let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'trusty' }, release: { major: '14.04' }, architecture: 'amd64' } } }
    let(:params) { { 'distribution' => 'jdk' } }

    it { is_expected.to contain_package('java').with_name('openjdk-7-jdk') }
@@ -62,7 +78,7 @@ describe 'java', type: :class do
  end

  context 'when select jre for Ubuntu Trusty (14.04)' do
-    let(:facts) { { osfamily: 'Debian', operatingsystem: 'Ubuntu', lsbdistcodename: 'trusty', operatingsystemrelease: '14.04', architecture: 'amd64' } }
+    let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'trusty' }, release: { major: '14.04' }, architecture: 'amd64' } } }
    let(:params) { { 'distribution' => 'jre' } }

    it { is_expected.to contain_package('java').with_name('openjdk-7-jre-headless') }
@@ -70,7 +86,7 @@ describe 'java', type: :class do
  end

  context 'when select jdk for Ubuntu xenial (16.04) on ARM' do
-    let(:facts) { { osfamily: 'Debian', operatingsystem: 'Ubuntu', lsbdistcodename: 'xenial', operatingsystemrelease: '16.04', architecture: 'armv7l' } }
+    let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'xenial' }, release: { major: '16.04' }, architecture: 'armv7l' } } }
    let(:params) { { 'distribution' => 'jdk' } }

    it { is_expected.to contain_package('java').with_name('openjdk-8-jdk') }
@@ -78,7 +94,7 @@ describe 'java', type: :class do
  end

  context 'when select jdk for Ubuntu xenial (16.04) on ARM64' do
-    let(:facts) { { osfamily: 'Debian', operatingsystem: 'Ubuntu', lsbdistcodename: 'xenial', operatingsystemrelease: '16.04', architecture: 'aarch64' } }
+    let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'xenial' }, release: { major: '16.04' }, architecture: 'aarch64' } } }
    let(:params) { { 'distribution' => 'jdk' } }

    it { is_expected.to contain_package('java').with_name('openjdk-8-jdk') }
@@ -86,26 +102,26 @@ describe 'java', type: :class do
  end

  context 'when select openjdk for Oracle Linux' do
-    let(:facts) { { osfamily: 'RedHat', operatingsystem: 'OracleLinux', operatingsystemrelease: '6.4', architecture: 'x86_64' } }
+    let(:facts) { { os: { family: 'RedHat', name: 'OracleLinux', release: { full: '6.4' }, architecture: 'x86_64' } } }

    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
  end

  context 'when select openjdk for Oracle Linux 6.2' do
-    let(:facts) { { osfamily: 'RedHat', operatingsystem: 'OracleLinux', operatingsystemrelease: '6.2', architecture: 'x86_64' } }
+    let(:facts) { { os: { family: 'RedHat', name: 'OracleLinux', release: { full: '6.2' }, architecture: 'x86_64' } } }

    it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
  end

  context 'when select passed value for Oracle Linux' do
-    let(:facts) { { osfamily: 'RedHat', operatingsystem: 'OracleLinux', operatingsystemrelease: '6.3', architecture: 'x86_64' } }
+    let(:facts) { { os: { family: 'RedHat', name: 'OracleLinux', release: { full: '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 'when select passed value for Scientific Linux' do
-    let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Scientific', operatingsystemrelease: '6.4', architecture: 'x86_64' } }
+    let(:facts) { { os: { family: 'RedHat', name: 'Scientific', release: { full: '6.4' }, architecture: 'x86_64' } } }
    let(:params) { { 'distribution' => 'jre' } }

    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
@@ -113,7 +129,7 @@ describe 'java', type: :class do
  end

  context 'when select passed value for Scientific Linux CERN (SLC)' do
-    let(:facts) { { osfamily: 'RedHat', operatingsystem: 'SLC', operatingsystemrelease: '6.4', architecture: 'x86_64' } }
+    let(:facts) { { os: { family: 'RedHat', name: 'SLC', release: { full: '6.4' }, architecture: 'x86_64' } } }
    let(:params) { { 'distribution' => 'jre' } }

    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
@@ -121,47 +137,47 @@ describe 'java', type: :class do
  end

  context 'when select default for OpenSUSE 12.3' do
-    let(:facts) { { osfamily: 'Suse', operatingsystem: 'OpenSUSE', operatingsystemrelease: '12.3', architecture: 'x86_64' } }
+    let(:facts) { { os: { family: 'Suse', name: 'OpenSUSE', release: { major: '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 'when select default for SLES 11.3' do
-    let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '11.3', architecture: 'x86_64' } }
+    let(:facts) { { os: { family: 'Suse', name: 'SLES', release: { full: '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 'when select default for SLES 11.4' do
-    let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '11.4', architecture: 'x86_64' } }
+    let(:facts) { { os: { family: 'Suse', name: 'SLES', release: { full: '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.1-ibm-1.7.1/') }
  end

  context 'when select default for SLES 12.0' do
-    let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '12.0', operatingsystemmajrelease: '12', architecture: 'x86_64' } }
+    let(:facts) { { os: { family: 'Suse', name: 'SLES', release: { full: '12.0', major: '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 'when select default for SLES 12.1' do
-    let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '12.1', operatingsystemmajrelease: '12', architecture: 'x86_64' } }
+    let(:facts) { { os: { family: 'Suse', name: 'SLES', release: { full: '12.1', major: '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

  describe 'custom java package' do
-    let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'jessie', operatingsystemrelease: '8.6', architecture: 'amd64' } }
+    let(:facts) { { os: { family: 'Debian', name: 'Debian', lsb: { distcodename: 'jessie' }, release: { major: '8' }, architecture: 'amd64' } } }

    context 'when all params provided' do
      let(:params) do
        {
-          'distribution' => 'custom',
+          'distribution'          => 'custom',
          'package'               => 'custom_jdk',
          'java_alternative'      => 'java-custom_jdk',
          'java_alternative_path' => '/opt/custom_jdk/bin/java',
@@ -190,34 +206,44 @@ describe 'java', type: :class do
  describe 'incompatible OSs' do
    [
      {
-        osfamily: 'windows',
-        operatingsystem: 'windows',
-        operatingsystemrelease: '8.1',
+        os: {
+          family: 'windows',
+          name: 'windows',
+          release: { full: '8.1' },
+        },
      },
      {
-        osfamily: 'Darwin',
-        operatingsystem: 'Darwin',
-        operatingsystemrelease: '13.3.0',
+        os: {
+          family: 'Darwin',
+          name: 'Darwin',
+          release: { full: '13.3.0' },
+        },
      },
      {
-        osfamily: 'AIX',
-        operatingsystem: 'AIX',
-        operatingsystemrelease: '7100-02-00-000',
+        os: {
+          family: 'AIX',
+          name: 'AIX',
+          release: { full: '7100-02-00-000' },
+        },
      },
      {
-        osfamily: 'AIX',
-        operatingsystem: 'AIX',
-        operatingsystemrelease: '6100-07-04-1216',
+        os: {
+          family: 'AIX',
+          name: 'AIX',
+          release: { full: '6100-07-04-1216' },
+        },
      },
      {
-        osfamily: 'AIX',
-        operatingsystem: 'AIX',
-        operatingsystemrelease: '5300-12-01-1016',
+        os: {
+          family: 'AIX',
+          name: 'AIX',
+          release: { full: '5300-12-01-1016' },
+        },
      },
    ].each do |facts|
      let(:facts) { facts }

-      it "is_expected.to fail on #{facts[:operatingsystem]} #{facts[:operatingsystemrelease]}" do
+      it "is_expected.to fail on #{facts[:os][:name]} #{facts[:os][:release][:full]}" do
        expect { catalogue }.to raise_error Puppet::Error, %r{unsupported platform}
      end
    end
--- a/spec/default_facts.yml
+++ b/spec/default_facts.yml
@@ -3,5 +3,6 @@
 # Facts specified here will override the values provided by rspec-puppet-facts.
 ---
 ipaddress: "172.16.254.254"
+ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
 is_pe: false
 macaddress: "AA:AA:AA:AA:AA:AA"
--- a/spec/defines/adopt_spec.rb
+++ b/spec/defines/adopt_spec.rb
@@ -0,0 +1,335 @@
+require 'spec_helper'
+
+describe 'java::adopt', type: :define do
+  context 'with CentOS 64-bit' do
+    let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '6.0' } } } }
+
+    context 'when AdoptOpenJDK Java 8 JDK' do
+      let(:params) { { ensure: 'present', version: '8', java: 'jdk' } }
+      let(:title) { 'jdk8' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 8 8u202 b08').with_command('tar -zxf /tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz -C /usr/java') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 8 8u202 b08').that_requires('Archive[/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz]') }
+    end
+
+    context 'when AdoptOpenJDK Java 9 JDK' do
+      let(:params) { { ensure: 'present', version: '9', java: 'jdk' } }
+      let(:title) { 'jdk9' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 9 9.0.4 11').with_command('tar -zxf /tmp/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz -C /usr/java') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 9 9.0.4 11').that_requires('Archive[/tmp/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz]') }
+    end
+
+    context 'when AdoptOpenJDK Java 10 JDK' do
+      let(:params) { { ensure: 'present', version: '10', java: 'jdk' } }
+      let(:title) { 'jdk10' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 10 10.0.2 13').with_command('tar -zxf /tmp/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz -C /usr/java') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 10 10.0.2 13').that_requires('Archive[/tmp/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz]') }
+    end
+
+    context 'when AdoptOpenJDK Java 11 JDK' do
+      let(:params) { { ensure: 'present', version: '11', java: 'jdk' } }
+      let(:title) { 'jdk11' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 11 11.0.2 9').with_command('tar -zxf /tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz -C /usr/java') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 11 11.0.2 9').that_requires('Archive[/tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz]') }
+    end
+
+    context 'when AdoptOpenJDK Java 12 JDK' do
+      let(:params) { { ensure: 'present', version: '12', java: 'jdk' } }
+      let(:title) { 'jdk12' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 12 12.0.1 12').with_command('tar -zxf /tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz -C /usr/java') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 12 12.0.1 12').that_requires('Archive[/tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz]') }
+    end
+
+    context 'when AdoptOpenJDK Java 8 JRE' do
+      let(:params) { { ensure: 'present', version: '8', java: 'jre' } }
+      let(:title) { 'jre8' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 8 8u202 b08').with_command('tar -zxf /tmp/OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz -C /usr/java') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 8 8u202 b08').that_requires('Archive[/tmp/OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz]') }
+    end
+
+    context 'when AdoptOpenJDK Java 9 JRE' do
+      let(:params) { { ensure: 'present', version: '9', java: 'jre' } }
+      let(:title) { 'jre9' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 9 9.0.4 11').with_command('tar -zxf /tmp/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz -C /usr/java') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 9 9.0.4 11').that_requires('Archive[/tmp/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz]') }
+    end
+
+    context 'when AdoptOpenJDK Java 10 JRE' do
+      let(:params) { { ensure: 'present', version: '10', java: 'jre' } }
+      let(:title) { 'jre11' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK10U-jre_x64_linux_hotspot_10.0.2_13.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 10 10.0.2 13').with_command('tar -zxf /tmp/OpenJDK10U-jre_x64_linux_hotspot_10.0.2_13.tar.gz -C /usr/java') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 10 10.0.2 13').that_requires('Archive[/tmp/OpenJDK10U-jre_x64_linux_hotspot_10.0.2_13.tar.gz]') }
+    end
+
+    context 'when AdoptOpenJDK Java 11 JRE' do
+      let(:params) { { ensure: 'present', version: '11', java: 'jre' } }
+      let(:title) { 'jre11' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 11 11.0.2 9').with_command('tar -zxf /tmp/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz -C /usr/java') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 11 11.0.2 9').that_requires('Archive[/tmp/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz]') }
+    end
+
+    context 'when AdoptOpenJDK Java 12 JRE' do
+      let(:params) { { ensure: 'present', version: '12', java: 'jre' } }
+      let(:title) { 'jre12' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK12U-jre_x64_linux_hotspot_12.0.1_12.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 12 12.0.1 12').with_command('tar -zxf /tmp/OpenJDK12U-jre_x64_linux_hotspot_12.0.1_12.tar.gz -C /usr/java') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 12 12.0.1 12').that_requires('Archive[/tmp/OpenJDK12U-jre_x64_linux_hotspot_12.0.1_12.tar.gz]') }
+    end
+
+    context 'when installing multiple versions' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '8u202',
+          version_minor: 'b08',
+          java: 'jdk',
+        }
+      end
+      let(:title) { 'jdk8' }
+
+      let(:pre_condition) do
+        <<-EOL
+        java::adopt {
+          'jdk8172':
+            ensure        => 'present',
+            version_major => '8u172',
+            version_minor => 'b11',
+            java          => 'jdk',
+        }
+        EOL
+      end
+
+      it { is_expected.to compile }
+    end
+
+    context 'when specifying package_type tar.gz and basedir' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version: '8',
+          java: 'jdk',
+          basedir: '/usr/java',
+          package_type: 'tar.gz',
+        }
+      end
+      let(:title) { 'jdk8' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 8 8u202 b08').with_command('tar -zxf /tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz -C /usr/java') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 8 8u202 b08').that_requires('Archive[/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz]') }
+    end
+    context 'when manage_basedir is set to true' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version: '8',
+          java: 'jdk',
+          basedir: '/usr/java',
+          manage_basedir: true,
+        }
+      end
+      let(:title) { 'jdk8' }
+
+      it { is_expected.to contain_file('/usr/java') }
+    end
+  end
+
+  context 'with Ubuntu 64-bit' do
+    let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '16.04' } } } }
+
+    context 'when AdoptOpenJDK Java 8 JDK' do
+      let(:params) { { ensure: 'present', version: '8', java: 'jdk' } }
+      let(:title) { 'jdk8' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 8 8u202 b08').with_command('tar -zxf /tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 8 8u202 b08').that_requires('Archive[/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz]') }
+    end
+
+    context 'when AdoptOpenJDK Java 9 JDK' do
+      let(:params) { { ensure: 'present', version: '9', java: 'jdk' } }
+      let(:title) { 'jdk9' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 9 9.0.4 11').with_command('tar -zxf /tmp/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 9 9.0.4 11').that_requires('Archive[/tmp/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz]') }
+    end
+
+    context 'when AdoptOpenJDK Java 10 JDK' do
+      let(:params) { { ensure: 'present', version: '10', java: 'jdk' } }
+      let(:title) { 'jdk10' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 10 10.0.2 13').with_command('tar -zxf /tmp/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 10 10.0.2 13').that_requires('Archive[/tmp/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz]') }
+    end
+
+    context 'when AdoptOpenJDK Java 11 JDK' do
+      let(:params) { { ensure: 'present', version: '11', java: 'jdk' } }
+      let(:title) { 'jdk11' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 11 11.0.2 9').with_command('tar -zxf /tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 11 11.0.2 9').that_requires('Archive[/tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz]') }
+    end
+
+    context 'when AdoptOpenJDK Java 12 JDK' do
+      let(:params) { { ensure: 'present', version: '12', java: 'jdk' } }
+      let(:title) { 'jdk12' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 12 12.0.1 12').with_command('tar -zxf /tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 12 12.0.1 12').that_requires('Archive[/tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz]') }
+    end
+
+    context 'when AdoptOpenJDK Java 8 JRE' do
+      let(:params) { { ensure: 'present', version: '8', java: 'jre' } }
+      let(:title) { 'jre8' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 8 8u202 b08').with_command('tar -zxf /tmp/OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 8 8u202 b08').that_requires('Archive[/tmp/OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz]') }
+    end
+
+    context 'when AdoptOpenJDK Java 9 JRE' do
+      let(:params) { { ensure: 'present', version: '9', java: 'jre' } }
+      let(:title) { 'jre9' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 9 9.0.4 11').with_command('tar -zxf /tmp/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 9 9.0.4 11').that_requires('Archive[/tmp/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz]') }
+    end
+
+    context 'when AdoptOpenJDK Java 10 JRE' do
+      let(:params) { { ensure: 'present', version: '10', java: 'jre' } }
+      let(:title) { 'jre11' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK10U-jre_x64_linux_hotspot_10.0.2_13.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 10 10.0.2 13').with_command('tar -zxf /tmp/OpenJDK10U-jre_x64_linux_hotspot_10.0.2_13.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 10 10.0.2 13').that_requires('Archive[/tmp/OpenJDK10U-jre_x64_linux_hotspot_10.0.2_13.tar.gz]') }
+    end
+
+    context 'when AdoptOpenJDK Java 11 JRE' do
+      let(:params) { { ensure: 'present', version: '11', java: 'jre' } }
+      let(:title) { 'jre11' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 11 11.0.2 9').with_command('tar -zxf /tmp/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 11 11.0.2 9').that_requires('Archive[/tmp/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz]') }
+    end
+
+    context 'when AdoptOpenJDK Java 12 JRE' do
+      let(:params) { { ensure: 'present', version: '12', java: 'jre' } }
+      let(:title) { 'jre12' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK12U-jre_x64_linux_hotspot_12.0.1_12.tar.gz') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 12 12.0.1 12').with_command('tar -zxf /tmp/OpenJDK12U-jre_x64_linux_hotspot_12.0.1_12.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 12 12.0.1 12').that_requires('Archive[/tmp/OpenJDK12U-jre_x64_linux_hotspot_12.0.1_12.tar.gz]') }
+    end
+
+    context 'when installing multiple versions' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '8u202',
+          version_minor: 'b08',
+          java: 'jdk',
+        }
+      end
+      let(:title) { 'jdk8' }
+
+      let(:pre_condition) do
+        <<-EOL
+        java::adopt {
+          'jdk8172':
+            ensure        => 'present',
+            version_major => '8u172',
+            version_minor => 'b11',
+            java          => 'jdk',
+        }
+        EOL
+      end
+
+      it { is_expected.to compile }
+    end
+  end
+  describe 'incompatible OSes' do
+    [
+      {
+        kernel: 'Windows',
+        os: {
+          family: 'Windows',
+          name: 'Windows',
+          release: {
+            full: '8.1',
+          },
+        },
+      },
+      {
+        kernel: 'Darwin',
+        os: {
+          family: 'Darwin',
+          name: 'Darwin',
+          release: {
+            full: '13.3.0',
+          },
+        },
+      },
+      {
+        kernel: 'AIX',
+        os: {
+          family: 'AIX',
+          name: 'AIX',
+          release: {
+            full: '7100-02-00-000',
+          },
+        },
+      },
+      {
+        kernel: 'AIX',
+        os: {
+          family: 'AIX',
+          name: 'AIX',
+          release: {
+            full: '6100-07-04-1216',
+          },
+        },
+      },
+      {
+        kernel: 'AIX',
+        os: {
+          family: 'AIX',
+          name: 'AIX',
+          release: {
+            full: '5300-12-01-1016',
+          },
+        },
+      },
+    ].each do |facts|
+      let(:facts) { facts }
+      let(:title) { 'jdk' }
+
+      it "is_expected.to fail on #{facts[:os][:name]} #{facts[:os][:release][:full]}" do
+        expect { catalogue }.to raise_error Puppet::Error, %r{unsupported platform}
+      end
+    end
+  end
+end
--- a/spec/defines/download_spec.rb
+++ b/spec/defines/download_spec.rb
@@ -0,0 +1,143 @@
+require 'spec_helper'
+
+describe 'java::download', type: :define do
+  let(:url) { 'http://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.tar.gz' }
+
+  context 'with CentOS 64-bit' do
+    let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '6.0' } } } }
+
+    context 'when passing URL to url parameter' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '8u201',
+          version_minor: 'b09',
+          java_se: 'jdk',
+          url: url,
+        }
+      end
+      let(:title) { 'jdk8' }
+
+      it {
+        is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.rpm')
+      }
+    end
+
+    context 'when no url provided' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '8u201',
+          version_minor: 'b09',
+          java_se: 'jdk',
+        }
+      end
+      let(:title) { 'jdk8' }
+
+      it {
+        is_expected.to raise_error Puppet::Error
+      }
+    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',
+          url: url,
+        }
+      end
+      let(:title) { 'jdk6' }
+
+      it { is_expected.to contain_file('/usr/java/java_home') }
+    end
+  end
+
+  context 'with Ubuntu 64-bit' do
+    let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '16.04' } } } }
+
+    context 'when passing URL to url parameter' do
+      let(:params) { { ensure: 'present', version_major: '8u201', version_minor: 'b09', java_se: 'jdk', url: url } }
+      let(:title) { 'jdk8' }
+
+      it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.tar.gz') }
+    end
+  end
+
+  context 'with Debian 64-bit' do
+    let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Debian', release: { full: '10.0' } } } }
+
+    context 'when passing URL to url parameter' do
+      let(:params) { { ensure: 'present', version_major: '8u201', version_minor: 'b09', java_se: 'jdk', url: url } }
+      let(:title) { 'jdk8' }
+
+      it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.tar.gz') }
+    end
+  end
+
+  describe 'incompatible OSes' do
+    [
+      {
+        kernel: 'Windows',
+        os: {
+          family: 'Windows',
+          name: 'Windows',
+          release: {
+            full: '8.1',
+          },
+        },
+      },
+      {
+        kernel: 'Darwin',
+        os: {
+          family: 'Darwin',
+          name: 'Darwin',
+          release: {
+            full: '13.3.0',
+          },
+        },
+      },
+      {
+        kernel: 'AIX',
+        os: {
+          family: 'AIX',
+          name: 'AIX',
+          release: {
+            full: '7100-02-00-000',
+          },
+        },
+      },
+      {
+        kernel: 'AIX',
+        os: {
+          family: 'AIX',
+          name: 'AIX',
+          release: {
+            full: '6100-07-04-1216',
+          },
+        },
+      },
+      {
+        kernel: 'AIX',
+        os: {
+          family: 'AIX',
+          name: 'AIX',
+          release: {
+            full: '5300-12-01-1016',
+          },
+        },
+      },
+    ].each do |facts|
+      let(:facts) { facts }
+      let(:title) { 'jdk' }
+
+      it "is_expected.to fail on #{facts[:os][:name]} #{facts[:os][:release][:full]}" do
+        expect { catalogue }.to raise_error Puppet::Error, %r{unsupported platform}
+      end
+    end
+  end
+end
--- a/spec/defines/oracle_spec.rb
+++ b/spec/defines/oracle_spec.rb
@@ -1,474 +0,0 @@
-require 'spec_helper'
-
-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 'with CentOS 64-bit' do
-    let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '6.0' } } } }
-
-    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 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 6u45 b06').that_requires('Archive[/tmp/jdk-6u45-linux-x64-rpm.bin]') }
-    end
-
-    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 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 7u80 b15').that_requires('Archive[/tmp/jdk-7u80-linux-x64.rpm]') }
-    end
-
-    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-8u201-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 8u201 b09').that_requires('Archive[/tmp/jdk-8u201-linux-x64.rpm]') }
-    end
-
-    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 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 6u45 b06').that_requires('Archive[/tmp/jre-6u45-linux-x64-rpm.bin]') }
-    end
-
-    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 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 7u80 b15').that_requires('Archive[/tmp/jre-7u80-linux-x64.rpm]') }
-    end
-
-    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-8u201-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 8u201 b09').that_requires('Archive[/tmp/jre-8u201-linux-x64.rpm]') }
-    end
-
-    context 'when passing URL to url parameter' do
-      let(:params) do
-        {
-          ensure: 'present',
-          version_major: '8u201',
-          version_minor: 'b09',
-          java_se: 'jdk',
-          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-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 passing a hash to url_hash parameter' do
-      let(:params) do
-        {
-          ensure: 'present',
-          version_major: '8u201',
-          version_minor: 'b09',
-          java_se: 'jdk',
-          url_hash: '42970487e3af4f5aa5bca3f542482c60',
-        }
-      end
-      let(:title) { 'jdk8' }
-
-      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 'when on CentOS 32-bit' do
-    let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'i386', name: 'CentOS', release: { full: '6.6' } } } }
-
-    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 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 6u45 b06').that_requires('Archive[/tmp/jdk-6u45-linux-i586-rpm.bin]') }
-    end
-
-    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 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 7u80 b15').that_requires('Archive[/tmp/jdk-7u80-linux-i586.rpm]') }
-    end
-
-    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-8u201-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 8u201 b09').that_requires('Archive[/tmp/jdk-8u201-linux-i586.rpm]') }
-    end
-
-    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 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 6u45 b06').that_requires('Archive[/tmp/jre-6u45-linux-i586-rpm.bin]') }
-    end
-
-    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 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 7u80 b15').that_requires('Archive[/tmp/jre-7u80-linux-i586.rpm]') }
-    end
-
-    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-8u201-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 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 'with Ubuntu 64-bit' do
-    let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '16.04' } } } }
-
-    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 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 6u45 b06').that_requires('Archive[/tmp/jdk-6u45-linux-x64.tar.gz]') }
-    end
-
-    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 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 7u80 b15').that_requires('Archive[/tmp/jdk-7u80-linux-x64.tar.gz]') }
-    end
-
-    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-8u201-linux-x64.tar.gz') }
-      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 8u201 b09').that_requires('Archive[/tmp/jdk-8u201-linux-x64.tar.gz]') }
-    end
-
-    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 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 6u45 b06').that_requires('Archive[/tmp/jre-6u45-linux-x64.tar.gz]') }
-    end
-
-    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 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 7u80 b15').that_requires('Archive[/tmp/jre-7u80-linux-x64.tar.gz]') }
-    end
-
-    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-8u201-linux-x64.tar.gz') }
-      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 8u201 b09').that_requires('Archive[/tmp/jre-8u201-linux-x64.tar.gz]') }
-    end
-
-    context 'when passing URL to url parameter' do
-      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-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
-    [
-      {
-        kernel: 'Windows',
-        os: {
-          family: 'Windows',
-          name: 'Windows',
-          release: {
-            full: '8.1',
-          },
-        },
-      },
-      {
-        kernel: 'Darwin',
-        os: {
-          family: 'Darwin',
-          name: 'Darwin',
-          release: {
-            full: '13.3.0',
-          },
-        },
-      },
-      {
-        kernel: 'AIX',
-        os: {
-          family: 'AIX',
-          name: 'AIX',
-          release: {
-            full: '7100-02-00-000',
-          },
-        },
-      },
-      {
-        kernel: 'AIX',
-        os: {
-          family: 'AIX',
-          name: 'AIX',
-          release: {
-            full: '6100-07-04-1216',
-          },
-        },
-      },
-      {
-        kernel: 'AIX',
-        os: {
-          family: 'AIX',
-          name: 'AIX',
-          release: {
-            full: '5300-12-01-1016',
-          },
-        },
-      },
-    ].each do |facts|
-      let(:facts) { facts }
-      let(:title) { 'jdk' }
-
-      it "is_expected.to fail on #{facts[:os][:name]} #{facts[:os][:release][:full]}" do
-        expect { catalogue }.to raise_error Puppet::Error, %r{unsupported platform}
-      end
-    end
-  end
-end
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.configure do |c|
  c.mock_with :rspec
 end
@@ -29,6 +31,11 @@ default_fact_files.each do |f|
  end
 end

+# read default_facts and merge them over what is provided by facterdb
+default_facts.each do |fact, value|
+  add_custom_fact fact, value
+end
+
 RSpec.configure do |c|
  c.default_facts = default_facts
  c.before :each do
@@ -42,6 +49,8 @@ RSpec.configure do |c|
  end
 end

+# Ensures that a module is defined
+# @param module_name Name of the module
 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)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,37 +1,82 @@
-require 'beaker-pe'
-require 'beaker-puppet'
-require 'beaker-rspec'
-require 'beaker/puppet_install_helper'
-require 'beaker/module_install_helper'
+# frozen_string_literal: true

-run_puppet_install_helper
-configure_type_defaults_on(hosts)
-install_module_on(hosts)
-install_module_dependencies_on(hosts)
+require 'serverspec'
+require 'puppet_litmus'
+require 'spec_helper_acceptance_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_acceptance_local.rb'))
+include PuppetLitmus

-UNSUPPORTED_PLATFORMS = ['Darwin', 'windows'].freeze
+if ENV['TARGET_HOST'].nil? || ENV['TARGET_HOST'] == 'localhost'
+  puts 'Running tests against this machine !'
+  if Gem.win_platform?
+    set :backend, :cmd
+  else
+    set :backend, :exec
+  end
+else
+  # load inventory
+  inventory_hash = inventory_hash_from_inventory_file
+  node_config = config_from_node(inventory_hash, ENV['TARGET_HOST'])

-unless ENV['RS_PROVISION'] == 'no' || ENV['BEAKER_provision'] == 'no'
-  hosts.each do |host|
-    install_puppet_module_via_pmt_on(host, module_name: 'puppetlabs-apt')
-  end
-end
-
-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
+  if target_in_group(inventory_hash, ENV['TARGET_HOST'], 'docker_nodes')
+    host = ENV['TARGET_HOST']
+    set :backend, :docker
+    set :docker_container, host
+  elsif target_in_group(inventory_hash, ENV['TARGET_HOST'], 'ssh_nodes')
+    set :backend, :ssh
+    options = Net::SSH::Config.for(host)
+    options[:user] = node_config.dig('ssh', 'user') unless node_config.dig('ssh', 'user').nil?
+    options[:port] = node_config.dig('ssh', 'port') unless node_config.dig('ssh', 'port').nil?
+    options[:keys] = node_config.dig('ssh', 'private-key') unless node_config.dig('ssh', 'private-key').nil?
+    options[:password] = node_config.dig('ssh', 'password') unless node_config.dig('ssh', 'password').nil?
+    # Support both net-ssh 4 and 5.
+    # rubocop:disable Metrics/BlockNesting
+    options[:verify_host_key] = if node_config.dig('ssh', 'host-key-check').nil?
+                                  # Fall back to SSH behavior. This variable will only be set in net-ssh 5.3+.
+                                  if @strict_host_key_checking.nil? || @strict_host_key_checking
+                                    Net::SSH::Verifiers::Always.new
+                                  else
+                                    # SSH's behavior with StrictHostKeyChecking=no: adds new keys to known_hosts.
+                                    # If known_hosts points to /dev/null, then equivalent to :never where it
+                                    # accepts any key beacuse they're all new.
+                                    Net::SSH::Verifiers::AcceptNewOrLocalTunnel.new
+                                  end
+                                elsif node_config.dig('ssh', 'host-key-check')
+                                  if defined?(Net::SSH::Verifiers::Always)
+                                    Net::SSH::Verifiers::Always.new
+                                  else
+                                    Net::SSH::Verifiers::Secure.new
+                                  end
+                                elsif defined?(Net::SSH::Verifiers::Never)
+                                  Net::SSH::Verifiers::Never.new
+                                else
+                                  Net::SSH::Verifiers::Null.new
+                                end
+    # rubocop:enable Metrics/BlockNesting
+    host = if ENV['TARGET_HOST'].include?(':')
+             ENV['TARGET_HOST'].split(':').first
+           else
+             ENV['TARGET_HOST']
+           end
+    set :host,        options[:host_name] || host
+    set :ssh_options, options
+    set :request_pty, true
+  elsif target_in_group(inventory_hash, ENV['TARGET_HOST'], 'winrm_nodes')
+    require 'winrm'
+
+    set :backend, :winrm
+    set :os, family: 'windows'
+    user = node_config.dig('winrm', 'user') unless node_config.dig('winrm', 'user').nil?
+    pass = node_config.dig('winrm', 'password') unless node_config.dig('winrm', 'password').nil?
+    endpoint = "http://#{ENV['TARGET_HOST']}:5985/wsman"
+
+    opts = {
+      user: user,
+      password: pass,
+      endpoint: endpoint,
+      operation_timeout: 300,
+    }
+
+    winrm = WinRM::Connection.new opts
+    Specinfra.configuration.winrm = winrm
  end
 end
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -0,0 +1 @@
+UNSUPPORTED_PLATFORMS = ['darwin', 'windows'].freeze
--- a/spec/unit/facter/java_libjvm_path_spec.rb
+++ b/spec/unit/facter/java_libjvm_path_spec.rb
@@ -5,12 +5,13 @@ describe 'java_libjvm_path' do

  before(:each) do
    Facter.clear
-    allow(Facter.fact(:kernel)).to receive(:value).once.and_return('Linux')
-    allow(Facter.fact(:java_default_home)).to receive(:value).once.and_return(java_default_home)
+    allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux')
+    allow(Facter.fact(:java_default_home)).to receive(:value).and_return(java_default_home)
  end

  context 'when libjvm exists' do
    it do
+      allow(Facter.fact(:java_major_version)).to receive(:value).and_return(8)
      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
@@ -18,7 +19,7 @@ describe 'java_libjvm_path' do

  context 'when libjvm does not exist' do
    it do
-      allow(Dir).to receive(:glob).with("#{java_default_home}/jre/lib/**/libjvm.so").and_return([])
+      allow(Dir).to receive(:glob).with("#{java_default_home}/lib/**/libjvm.so").and_return([])
      expect(Facter.value(:java_libjvm_path)).to be nil
    end
  end
--- a/spec/unit/facter/java_major_version_spec.rb
+++ b/spec/unit/facter/java_major_version_spec.rb
@@ -16,7 +16,7 @@ describe 'java_major_version' do

  context 'when java not present, returns nil' do
    before :each do
-      allow(Facter.fact(:java_version)).to receive(:value).and_return('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
Author	SHA1	Message	Date
Auto-release	86a66d5732	Release version 6.2.0	2020-02-18 14:31:44 +00:00
sheenaajay	cc50bff4e2	Merge pull request #411 from carabasdaniel/master [IAC-545] Skip acceptance tests for AdoptOpenJDK on SLES	2020-02-18 14:25:16 +00:00
Daniel Carabas	35dba98f4b	Skip acceptance tests for AdoptOpenJDK on SLES	2020-02-18 15:35:38 +02:00
cmccrisken-puppet	35dcaf1cb5	Merge pull request #410 from puppetlabs/pdksync_IAC-215-2 pdksync - (IAC-215) - Implement use_litmus:true	2020-02-17 14:27:47 +00:00
David Swan	2e72a1e255	(IAC-215) - Pdk Update	2020-02-14 14:37:07 +00:00
David Swan	84654700bc	(IAC-215) - Implement use_litmus:true	2020-02-14 14:29:32 +00:00
sheenaajay	9651f5e630	Merge pull request #370 from timdeluxe/adoptopenjdk Support AdoptOpenJDK	2020-02-13 11:12:36 +00:00
Daniel Carabas	1cdeba11f1	Fix unit tests	2020-02-13 11:46:28 +02:00
daianamezdrea	11c314814e	Merge pull request #406 from hdeheer/modern_facts Replace legacy facts by modern facts	2020-02-11 14:09:02 +02:00
david22swan	358d1e85d0	Merge pull request #408 from puppetlabs/pdksync_pdksync-honeycombsetup (IAC-365) updating tokens and dataset for honeycomb	2020-02-06 16:29:27 +00:00
sheena	415f1283d2	(IAC-365) updating tokens and dataset for honeycomb	2020-02-06 13:41:12 +00:00
Michael T Lombardi (He/Him)	db27f84760	Merge pull request #407 from puppetlabs/release (maint) Merge back for release version 6.1.0	2020-02-03 15:43:05 -06:00
Auto-release	e54f5b4f08	Release version 6.1.0	2020-02-03 16:07:00 +00:00
Hubert de Heer	93cc972768	Replace legacy facts by modern facts Fix minor puppet-lint issues.	2020-02-03 13:27:36 +01:00
lionce	84546ca9a7	Rebase with master, fix conflicts and rubocop issues	2020-01-16 15:39:32 +02:00
lionce	c4c56cd6c5	Merge pull request #405 from puppetlabs/pdksync_deb10 pdksync - (FM-8581) - Debian 10 added to travis and provision file refactored	2020-01-15 12:40:50 +02:00
Tim Eilers	61ace5ea01	Fixing several facts due to different version scheme and locations in specific java versions	2020-01-14 14:19:14 +02:00
Tim Eilers	4f52cee832	Fixing java_version fact, because OpenJDK puts a date after version	2020-01-14 14:17:18 +02:00
Tim Eilers	4dbf9321eb	Fix basedir management (correctly avoid duplicate resource declarations)	2020-01-14 14:15:52 +02:00
Tim Eilers	da548082fe	Clean up code according to rubocop checks	2020-01-14 14:15:52 +02:00
Tim Eilers	c0748f164f	Refactor and improve code with experience from testing. Add spec and acceptance tests for new code. Extend documentation for new AdoptOpenJDK feature.	2020-01-14 14:15:51 +02:00
Tim Eilers	a88f01321d	Fixing install path for default values for jdk 8 and improving comparison when version was given as integer	2020-01-14 11:08:54 +02:00
Tim Eilers	4c336b3ca7	Fixing downloadfolder prefix for AdoptOpenJDK installation	2020-01-14 11:08:54 +02:00
Tim Eilers	f44bc27a17	Adding defined type for AdoptOpenJDK installation	2020-01-14 11:08:54 +02:00
David Swan	6cda8ef5ba	(FM-8581) - Debian 10 added to travis and provision file refactored	2020-01-13 12:07:04 +00:00
david22swan	0a77898e3d	Merge pull request #404 from puppetlabs/pdksync_travis-updates pdksync - (maint) travis updates: bundler and slack	2019-12-17 09:41:48 +00:00
David Schmitt	2b641fd530	(maint) update travis to notify puppet slack	2019-12-16 20:57:22 +00:00
David Schmitt	1bfe4da05a	(maint) update travis to not use bundle update --system	2019-12-16 20:14:40 +00:00
Molly Waggett	6bdf734416	(maint) Remove MAINTAINERS file	2019-12-10 10:14:10 -08:00
david22swan	c288dbec0e	Merge pull request #403 from puppetlabs/pdksync_pdksync-disableforge pdksync - "MODULES-10236 disable deploy_to_forge for the module"	2019-12-09 15:59:33 +00:00
sheena	aa255af5ad	MODULES-10236 disable deploy_to_forge for the module	2019-12-06 14:39:12 +00:00
lionce	69a75c8e6a	Merge pull request #402 from puppetlabs/pdksync_pdksync-addubuntu14 pdksync - "MODULES-10242 Add ubuntu14 support back to the modules"	2019-12-06 14:48:03 +02:00
sheena	60a4af1843	MODULES-10242 Add ubuntu14 support back to the modules	2019-12-06 11:24:25 +00:00
Daniel Carabas	4ad9ec6191	Add Github Actions release workflow	2019-12-03 12:37:39 +02:00
cmccrisken-puppet	0a09bce58f	Merge pull request #401 from puppetlabs/pdksync_simplecov (MODULES-10120) enable simplecov; update to PDK 1.14.1; minor cleanups	2019-11-29 12:28:43 +00:00
David Schmitt	26e9bcfc1a	(maint) Update to PDK 1.14.1	2019-11-27 18:31:35 +00:00
David Schmitt	a57d124d7d	(maint) enable simplecov for ruby codecoverage testing	2019-11-25 18:25:27 +00:00
David Schmitt	e300649623	(maint) update gitignore and pdkignore for .project file removal	2019-11-21 18:16:13 +00:00
David Schmitt	d30c38266b	(maint) remove obsolete gepetto .project files	2019-11-21 18:06:18 +00:00
David Schmitt	4610ca34a8	(maint) mark .gitlab-ci.yml as deleted	2019-11-21 17:18:40 +00:00
David Schmitt	fb850647a8	(maint) sort and canonicalise .sync.yml	2019-11-21 17:17:50 +00:00
lionce	0d23711e7d	Merge pull request #400 from puppetlabs/release Merge back release version v6.0.0	2019-11-11 16:23:06 +02:00
lionce	a0bab6cf38	Release version 6.0.0	2019-11-11 15:31:38 +02:00
lionce	8b451e161c	Merge pull request #399 from david22swan/FM-8676 (FM-8676) - Support added for CentOS 8	2019-11-11 11:04:03 +02:00
David Swan	afb5531a4a	(FM-8676) - Support added for CentOS 8	2019-11-08 16:07:59 +00:00
carabasdaniel	47a51b4490	Merge pull request #397 from lionce/MODULES-10062 MODULES-10062 - fix acceptance tests on sles	2019-11-07 12:33:16 +02:00
david22swan	b64e9a2f88	Merge pull request #398 from puppetlabs/pdksync_remove_ubuntu14_support pdksync - FM-8499 - remove ubuntu14 support	2019-11-07 09:16:10 +00:00
lionce	6f05978750	FM-8499 - remove ubuntu14 support	2019-11-06 17:45:14 +02:00
lionce	c477db3b59	MODULES-10062 - fix acceptance tests on sles	2019-11-06 14:25:09 +02:00
lionce	00588d2b96	Merge pull request #396 from puppetlabs/pdksync_encrypt-git pdksync - (FM-8634) ensure encrypted communication for fixtures	2019-11-05 12:43:17 +02:00
lionce	2ea5a4adb5	Merge pull request #395 from glennsarti/manage-travis (PDK-1501) Allow Travis CI config to be templated	2019-11-05 10:46:05 +02:00
Glenn Sarti	018de0aef6	(PDK-1501) Fix acceptance stages in Travis CI Previously the Travis CI file was brought under PDK control, however the sync.yml did not contain the stage settings for the Litmus jobs which meant that they did not run. This commit fixes that error and runs PDK Update again	2019-11-05 13:31:09 +08:00
David Schmitt	74c5c27108	(FM-8634) ensure encrypted communication for fixtures	2019-11-01 16:48:53 +00:00
Glenn Sarti	ee0e10dc12	(maint) Fix rubocop failures in download_spec.rb This commit updates the download_spec.rb file to remote the global variable and use let based test fixture.	2019-11-01 09:49:19 +08:00
Glenn Sarti	4913dc0bef	(PDK-1501) Allow Travis CI config to be templated Previously the module unmanaged the Travis CI file when converted to Litmus. This commit allows the Travis CI file to be managed.	2019-11-01 09:49:19 +08:00
Glenn Sarti	459757dd65	(maint) Update for PDK templates This commit updates the module as per PDK-Templates commit 0b5b39b	2019-11-01 09:49:19 +08:00
david22swan	7ce9df174f	Merge pull request #392 from michaeltlombardi/ticket/master/FM-8275-add-vagrant-provision (FM-8275) Add vagrant provision list	2019-10-25 15:17:35 +01:00
cmccrisken-puppet	b1ea376937	Merge pull request #393 from puppetlabs/pdksync_pdksync-pdkgemupdate pdksync - (maint) Override pdk gem version to master branch (PDK-1525 workaround until release)	2019-10-24 21:09:25 +01:00
Ciaran McCrisken	de79582baf	Point pdk gem to head of master until PDK-1525 resolved	2019-10-24 15:21:53 +01:00
Michael T Lombardi	ea006c0587	(FM-8275) Add vagrant provision list Prior to this commit the only provisioners included in the provision lists were docker and vmpooler, neither of which are particularly accessible to folks developing on Windows outside of Puppet. This commit adds a list which leverages the vagrant provisioner.	2019-10-18 17:18:02 -05:00
carabasdaniel	e57cbc84ec	Merge pull request #391 from robmbrooks/master we need to check if java_default_home has a value before we attempt t…	2019-09-30 10:03:51 +03:00
Robert Brooks	d4e5461c26	we need to check if java_default_home has a value before we attempt to find libjvm.so, otherwise we search the entire filesystem	2019-09-26 09:57:55 -07:00
TP Honey	a5aad36b86	Merge pull request #390 from puppetlabs/fix_acceptance_tests Fix fake paths that always cause errors	2019-09-26 10:40:37 +01:00
tphoney	f70d15207a	fake paths always cause errors	2019-09-26 11:31:23 +03:00
sheenaajay	0b1f8df952	Merge pull request #389 from puppetlabs/pdksync_add_codeowners (maint) Add a codeowners file	2019-09-18 10:38:02 +01:00
tphoney	f83cf9fc38	(maint) Add a codeowners file	2019-09-17 15:50:40 +01:00
sheenaajay	074162d034	Merge pull request #386 from vrtdev/feature/java11 Add support for java 11, the default in debian buster 10	2019-09-12 11:22:33 +01:00
sheenaajay	71b6a47798	Merge pull request #385 from leitmedium/master ensure Java8 update number is being handled as a number	2019-09-12 09:15:14 +01:00
TP Honey	b670aca0cc	Merge pull request #387 from puppetlabs/FM-8403 FM-8403 - add support Debain10	2019-09-11 15:27:19 +01:00
Caspar Clemens Mierau	27fed78308	ensure Java8 update number is being handled as a number when doing version comparing	2019-09-11 13:12:45 +02:00
lionce	ba9a1dbe45	add support Debain10	2019-09-10 16:27:01 +03:00
Jeroen Hooyberghs	197213e517	Put test result in variable to satisfy RuboCop	2019-09-10 14:33:49 +02:00
Jeroen Hooyberghs	21d39590b0	Add support for java 11, the default in debian buster 10	2019-09-10 12:21:19 +02:00
TP Honey	00c05a826f	Merge pull request #384 from puppetlabs/pdksync_net-ssh-fix pdksync - (MAINT) pdksync: fix for net-ssh 5 host_key check	2019-08-29 16:02:07 +01:00
Florin Dragos	d277391efc	(MAINT) pdksync: fix for net-ssh 5 host_key check	2019-08-29 17:09:24 +03:00
sheenaajay	ce34499671	Merge pull request #382 from puppetlabs/release MODULES-9673 Release merge back v5.0.1	2019-08-12 12:18:21 +01:00
lionce	b632db3a3e	Merge pull request #381 from sheenaajay/releaseprep MODULES-9669 Release preparation for v5.0.1	2019-08-05 13:48:01 +03:00
sheena	9c8d34f7e7	MODULES-9669 Release preparation for v5.0.1	2019-08-05 11:10:39 +01:00
carabasdaniel	af9c6c1bbe	Merge pull request #380 from puppetlabs/release MODULES-9608 Release Merge back v5.0.0	2019-08-05 12:58:18 +03:00
sheenaajay	70fa42b5c7	Merge pull request #379 from RandomNoun7/release (MODULES-9604) Release prep - 5.0.0	2019-07-29 15:57:20 +01:00
Bill Hurt	0026df5de1	(MODULES-9604) Release prep - 5.0.0	2019-07-29 07:31:19 -07:00
TP Honey	ce58b6793e	Merge pull request #372 from carabasdaniel/master [FM-8320] Remove Oracle download	2019-07-29 11:02:29 +01:00
Daniel Carabas	a7f5b49404	Remove Oracle download support	2019-07-26 17:47:20 +02:00
William Hurt	c3d6da014f	Merge pull request #377 from tphoney/pdk_convert_gemfile (maint) rerun pdk convert,remove systemtests gems	2019-07-25 10:08:26 -07:00
tphoney	ab9efa8405	(maint) rerun pdk convert,remove systemtests gems	2019-07-25 17:20:07 +01:00
Michael T Lombardi (He/Him)	983efef86a	(FM-8223) converted to use litmus (#376 ) (FM-8223) converted to use litmus	2019-07-25 10:32:11 -05:00
tphoney	b9564626d3	(FM-8223) converted to use litmus	2019-07-25 14:46:20 +01:00
lionce	ff0b03eb72	Merge pull request #375 from tphoney/FM-8343 (FM-8343) use release numbers not lsbdistcodename	2019-07-25 13:48:43 +03:00
tphoney	7b73f579c0	(FM-8343) use release numbers not lsbdistcodename	2019-07-25 10:46:05 +01:00
TP Honey	614d624e5d	Merge pull request #369 from mhjacks/master Add buster support, default to 11	2019-07-17 13:37:35 +01:00
carabasdaniel	2bdc458965	Merge pull request #374 from puppetlabs/revert-364-feature/debian_buster Revert "Add support for debian buster"	2019-07-17 14:30:53 +03:00
TP Honey	48b5d0209d	Revert "Add support for debian buster"	2019-07-17 12:14:28 +01:00
carabasdaniel	bd22547e1e	Merge pull request #373 from puppetlabs/pdksync_pdksync_heads/master-0-gb096033 pdksync - pdksync_heads/master-0-gb096033	2019-07-16 12:06:09 +03:00
lionce	77c18be58b	pdksync_heads/master-0-gb096033	2019-07-16 10:05:15 +03:00
TP Honey	88d31a7a64	Merge pull request #364 from vrtdev/feature/debian_buster Add support for debian buster	2019-07-15 10:42:23 +01:00
Eimhin Laverty	2a81a6cd07	Merge pull request #371 from puppetlabs/readme_bsd (maint) Remove BSD section for puppet < 4	2019-07-11 16:00:36 +01:00
TP Honey	68e1d7681d	(maint) Remove BSD section for puppet < 4	2019-07-10 16:24:09 +01:00
Martin Jackson	9d0301b1ef	Add buster support, default to 11	2019-06-18 20:57:32 -05:00
Paula Muir	ae2baf0006	Merge pull request #368 from puppetlabs/pdksync_pdksync_heads/master-0-g7827fc2 pdksync - pdksync_heads/master-0-g7827fc2	2019-06-10 14:49:36 +01:00
Erick Banks	4e36ff899c	pdksync_heads/master-0-g7827fc2	2019-06-10 13:35:53 +01:00
sheenaajay	bcc6263e14	Merge pull request #357 from mhjacks/master Support defaults for ubuntu cosmic and dingo	2019-06-06 10:12:09 +01:00
Tom Ritserveldt	92a9700ad3	Add support for Debian buster	2019-06-04 07:49:14 +02:00
TP Honey	2c624c2800	Merge pull request #367 from puppetlabs/release (MODULES-9189) - Release Merge back 4.1.0	2019-05-29 18:14:33 +01:00
Martin Jackson	2ede3f1f06	Support eoan too while we're here	2019-04-27 08:39:23 -05:00
Martin Jackson	16fa2379a2	Support defaults for ubuntu cosmic and dingo	2019-04-14 15:08:46 -05:00
				`@@ -0,0 +1 @@`
				`UNSUPPORTED_PLATFORMS = ['darwin', 'windows'].freeze`