Merge pull request #513 from david22swan/maint/release_prep

Release prep v8.0.0
2022-04-05 15:08:51 +01:00 · 2022-04-05 12:55:54 +01:00 · 2022-04-04 15:31:15 +01:00 · 2022-04-04 14:09:47 +01:00 · 2022-03-30 13:34:26 +01:00 · 2022-03-30 13:06:41 +01:00
48 changed files with 1977 additions and 1086 deletions
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -0,0 +1,34 @@
+# devcontainer
+
+
+For format details, see https://aka.ms/devcontainer.json. 
+
+For config options, see the README at:
+https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/puppet
+ 
+``` json
+{
+	"name": "Puppet Development Kit (Community)",
+	"dockerFile": "Dockerfile",
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": {
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"puppet.puppet-vscode",
+		"rebornix.Ruby"
+	]
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	"forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	"postCreateCommand": "pdk --version",
+}
+```
+
+
+
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,23 +1,17 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/puppet
 {
 	"name": "Puppet Development Kit (Community)",
 	"dockerFile": "Dockerfile",

-	// Set *default* container specific settings.json values on container create.
 	"settings": {
-		"terminal.integrated.shell.linux": "/bin/bash"
+		"terminal.integrated.profiles.linux": {
+			"bash": {
+				"path": "bash",
+			}
+		}
 	},

-	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
 		"puppet.puppet-vscode",
 		"rebornix.Ruby"
 	]
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "pdk --version",
 }
--- a/.github/workflows/auto_release.yml
+++ b/.github/workflows/auto_release.yml
@@ -0,0 +1,90 @@
+name: "Auto release"
+
+on:
+  workflow_dispatch:
+
+env:
+  HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6 
+  HONEYCOMB_DATASET: litmus tests
+  CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  auto_release:
+    name: "Automatic release prep"
+    runs-on: ubuntu-20.04
+
+    steps:
+    
+    - name: "Honeycomb: Start recording"
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
+      with:
+        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
+        dataset: ${{ env.HONEYCOMB_DATASET }}
+        job-status: ${{ job.status }}
+
+    - name: "Honeycomb: start first step"
+      run: |
+        echo STEP_ID="auto-release" >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+    - name: "Checkout Source"
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+        persist-credentials: false
+
+    - name: "PDK Release prep"
+      uses: docker://puppet/iac_release:ci
+      with:
+        args: 'release prep --force'
+      env:
+        CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: "Get Version"
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      id: gv
+      run: |
+        echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
+
+    - name: "Check if a release is necessary"
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      id: check
+      run: |
+        git diff --quiet CHANGELOG.md && echo "::set-output name=release::false" || echo "::set-output name=release::true"
+
+    - name: "Commit changes"
+      if: ${{ github.repository_owner == 'puppetlabs' && steps.check.outputs.release == 'true' }}
+      run: |
+        git config --local user.email "${{ github.repository_owner }}@users.noreply.github.com"
+        git config --local user.name "GitHub Action"
+        git add .
+        git commit -m "Release prep v${{ steps.gv.outputs.ver }}"
+
+    - name: Create Pull Request
+      id: cpr
+      uses: puppetlabs/peter-evans-create-pull-request@v3
+      if: ${{ github.repository_owner == 'puppetlabs' && steps.check.outputs.release == 'true' }}
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        commit-message: "Release prep v${{ steps.gv.outputs.ver }}"
+        branch: "release-prep"
+        delete-branch: true
+        title: "Release prep v${{ steps.gv.outputs.ver }}"
+        body: |
+          Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb) from commit ${{ github.sha }}. 
+          Please verify before merging:
+          - [ ] last [nightly](https://github.com/${{ github.repository }}/actions/workflows/nightly.yml) run is green
+          - [ ] [Changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) is readable and has no unlabeled pull requests
+          - [ ] Ensure the [changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) version and [metadata](https://github.com/${{ github.repository }}/blob/release-prep/metadata.json) version match
+        labels: "maintenance"
+
+    - name: PR outputs
+      if: ${{ github.repository_owner == 'puppetlabs' && steps.check.outputs.release == 'true' }}
+      run: |
+        echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
+        echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
+ 
+    - name: "Honeycomb: Record finish step"
+      if: ${{ always() }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Finished auto release workflow'
--- a/.github/workflows/labeller.yml
+++ b/.github/workflows/labeller.yml
@@ -0,0 +1,22 @@
+name: community-labeller
+
+on:
+  issues:
+    types:
+      - opened
+  pull_request_target:
+    types:
+      - opened
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: puppetlabs/community-labeller@v0
+        name: Label issues or pull requests
+        with:
+          label_name: community
+          label_color: '5319e7'
+          org_membership: puppetlabs
+          token: ${{ secrets.IAC_COMMUNITY_LABELER }}
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -4,20 +4,23 @@ on:
  schedule:
    - cron: '0 0 * * *'

+
 env:
  HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
  HONEYCOMB_DATASET: litmus tests

 jobs:
  setup_matrix:
+    if: ${{ github.repository_owner == 'puppetlabs' }}
    name: "Setup Test Matrix"
    runs-on: ubuntu-20.04
    outputs:
      matrix: ${{ steps.get-matrix.outputs.matrix }}

    steps:
+     
    - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@v1.0.2
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
      with:
        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
        dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -25,54 +28,48 @@ jobs:

    - name: "Honeycomb: Start first step"
      run: |
-        echo STEP_ID=0 >> $GITHUB_ENV
+        echo STEP_ID=setup-environment >> $GITHUB_ENV
        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
    - name: Checkout Source
      uses: actions/checkout@v2
      if: ${{ github.repository_owner == 'puppetlabs' }}

    - name: Activate Ruby 2.7
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
      if: ${{ github.repository_owner == 'puppetlabs' }}
      with:
        ruby-version: "2.7"
+        bundler-cache: true

-    - name: Cache gems
-      uses: actions/cache@v2
-      if: ${{ github.repository_owner == 'puppetlabs' }}
-      with:
-        path: vendor/gems
-        key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ github.event_name }}-
-          ${{ runner.os }}-
-
-    - name: Install gems
+    - name: Print bundle environment
      if: ${{ github.repository_owner == 'puppetlabs' }}
      run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
-
+        echo ::group::bundler environment
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
+        echo ::endgroup::
+   
+    - name: "Honeycomb: Record Setup Environment time"
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+        echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
    - name: Setup Acceptance Test Matrix
      id: get-matrix
      if: ${{ github.repository_owner == 'puppetlabs' }}
      run: |
        if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
-          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata
+          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2 
        else
          echo  "::set-output name=matrix::{}"
        fi
-
-    - name: "Honeycomb: Record setup time"
+  
+    - name: "Honeycomb: Record Setup Test Matrix time"
      if: ${{ always() }}
      run: |
        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
-
  Acceptance:
+    name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
    needs:
      - setup_matrix

@@ -86,102 +83,78 @@ jobs:

    steps:
    - run: |
-        echo 'platform=${{ matrix.platform }}' >> $BUILDEVENT_FILE
+        echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
        echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
+        echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
+

    - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@v1.0.2
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
      with:
        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
        dataset: ${{ env.HONEYCOMB_DATASET }}
        job-status: ${{ job.status }}
-        matrix-key: ${{ matrix.platform }}-${{ matrix.collection }}
+        matrix-key: ${{ matrix.platforms.label }}-${{ matrix.collection }}

    - name: "Honeycomb: start first step"
      run: |
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
        echo STEP_START=$(date +%s) >> $GITHUB_ENV

    - name: Checkout Source
      uses: actions/checkout@v2

    - name: Activate Ruby 2.7
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
      with:
        ruby-version: "2.7"
+        bundler-cache: true

-    - name: Cache gems
-      uses: actions/cache@v2
-      with:
-        path: vendor/gems
-        key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ github.event_name }}-
-          ${{ runner.os }}-
-
-    - name: "Honeycomb: Record cache setup time"
-      if: ${{ always() }}
+    - name: Print bundle environment
      run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Cache retrieval'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
-    - name: Bundler Setup
-      run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
        echo ::group::bundler environment
        buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
        echo ::endgroup::

-    - name: "Honeycomb: Record Bundler Setup time"
+    - name: "Honeycomb: Record Setup Environment time"
      if: ${{ always() }}
      run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Bundler Setup'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
        echo STEP_START=$(date +%s) >> $GITHUB_ENV

    - name: Provision test environment
      run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platform }}' -- bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]'
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
        echo ::group::=== REQUEST ===
        cat request.json || true
        echo
        echo ::endgroup::
        echo ::group::=== INVENTORY ===
-        sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
+        if [ -f 'spec/fixtures/litmus_inventory.yaml' ];
+        then
+          FILE='spec/fixtures/litmus_inventory.yaml'
+        elif [ -f 'inventory.yaml' ];
+        then
+          FILE='inventory.yaml'
+        fi
+        sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true
        echo ::endgroup::

-    # The provision service hands out machines as soon as they're provisioned.
-    # The GCP VMs might still take a while to spool up and configure themselves fully.
-    # This retry loop spins until all agents have been installed successfully.
    - name: Install agent
-      uses: nick-invision/retry@v1
-      with:
-        timeout_minutes: 30
-        max_attempts: 5
-        retry_wait_seconds: 60
-        command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
+      run: |
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'

-    # The agent installer on windows does not finish in time for this to work. To
-    # work around this for now, retry after a minute if installing the module failed.
    - name: Install module
-      uses: nick-invision/retry@v1
-      with:
-        timeout_minutes: 30
-        max_attempts: 2
-        retry_wait_seconds: 60
-        command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
+      run: |
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'

    - name: "Honeycomb: Record deployment times"
      if: ${{ always() }}
      run: |
        echo ::group::honeycomb step
        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
        echo STEP_START=$(date +%s) >> $GITHUB_ENV
        echo ::endgroup::

@@ -193,13 +166,14 @@ jobs:
      if: ${{ always() }}
      run: |
        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-5 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
        echo STEP_START=$(date +%s) >> $GITHUB_ENV

    - name: Remove test environment
      if: ${{ always() }}
+      continue-on-error: true
      run: |
-        if [ -f inventory.yaml ]; then
+        if [[ -f inventory.yaml || -f spec/fixtures/litmus_inventory.yaml ]]; then
          buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
          echo ::group::=== REQUEST ===
          cat request.json || true
@@ -213,14 +187,14 @@ jobs:
        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'

  slack-workflow-status:
-    if: always()
+    if: ${{ github.repository_owner == 'puppetlabs' }}
    name: Post Workflow Status To Slack
    needs:
      - Acceptance
    runs-on: ubuntu-20.04
    steps:
      - name: Slack Workflow Notification
-        uses: Gamesight/slack-workflow-status@master
+        uses: puppetlabs/Gamesight-slack-workflow-status@pdk-templates-v1
        with:
          # Required Input
          repo_token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/pr_test.yml
+++ b/.github/workflows/pr_test.yml
@@ -2,7 +2,9 @@ name: "PR Testing"

 on: [pull_request]

+
 env:
+ 
  HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
  HONEYCOMB_DATASET: litmus tests

@@ -14,8 +16,9 @@ jobs:
      matrix: ${{ steps.get-matrix.outputs.matrix }}

    steps:
+    
    - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@v1.0.2
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
      with:
        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
        dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -23,56 +26,55 @@ jobs:

    - name: "Honeycomb: Start first step"
      run: |
-        echo STEP_ID=0 >> $GITHUB_ENV
+        echo STEP_ID=setup-environment >> $GITHUB_ENV
        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
    - name: Checkout Source
      uses: actions/checkout@v2
      if: ${{ github.repository_owner == 'puppetlabs' }}

    - name: Activate Ruby 2.7
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
      if: ${{ github.repository_owner == 'puppetlabs' }}
      with:
        ruby-version: "2.7"
+        bundler-cache: true

-    - name: Cache gems
-      uses: actions/cache@v2
-      if: ${{ github.repository_owner == 'puppetlabs' }}
-      with:
-        path: vendor/gems
-        key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ github.event_name }}-
-          ${{ runner.os }}-
-
-    - name: Install gems
+    - name: Print bundle environment
      if: ${{ github.repository_owner == 'puppetlabs' }}
      run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
+        echo ::group::bundler environment
+        buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
+        echo ::endgroup::
+  
+    - name: "Honeycomb: Record Setup Environment time"
+      if: ${{ github.repository_owner == 'puppetlabs' }}
+      run: |
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+        echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
+        echo STEP_START=$(date +%s) >> $GITHUB_ENV
+    - name: Run validation steps
+      run: |
+        bundle exec rake validate
+      if: ${{ github.repository_owner == 'puppetlabs' }}

    - name: Setup Acceptance Test Matrix
      id: get-matrix
-      if: ${{ github.repository_owner == 'puppetlabs' }}
      run: |
        if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
-          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata
+          buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2 
        else
          echo  "::set-output name=matrix::{}"
        fi
-
-    - name: "Honeycomb: Record setup time"
+ 
+    - name: "Honeycomb: Record Setup Test Matrix time"
      if: ${{ always() }}
      run: |
        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
-
  Acceptance:
+    name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
    needs:
      - setup_matrix
+    if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}

    runs-on: ubuntu-20.04
    strategy:
@@ -84,127 +86,99 @@ jobs:

    steps:
    - run: |
-        echo 'platform=${{ matrix.platform }}' >> $BUILDEVENT_FILE
+        echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
        echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
-
+        echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
+ 
    - name: "Honeycomb: Start recording"
-      uses: kvrhdn/gha-buildevents@v1.0.2
+      uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
      with:
        apikey: ${{ env.HONEYCOMB_WRITEKEY }}
        dataset: ${{ env.HONEYCOMB_DATASET }}
        job-status: ${{ job.status }}
-        matrix-key: ${{ matrix.platform }}-${{ matrix.collection }}
+        matrix-key: ${{ matrix.platforms.label }}-${{ matrix.collection }}

    - name: "Honeycomb: start first step"
      run: |
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
    - name: Checkout Source
      uses: actions/checkout@v2

    - name: Activate Ruby 2.7
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
      with:
        ruby-version: "2.7"
+        bundler-cache: true

-    - name: Cache gems
-      uses: actions/cache@v2
-      with:
-        path: vendor/gems
-        key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ github.event_name }}-
-          ${{ runner.os }}-
-
-    - name: "Honeycomb: Record cache setup time"
-      if: ${{ always() }}
+    - name: Print bundle environment
      run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Cache retrieval'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
-        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
-    - name: Bundler Setup
-      run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install
-        buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean
        echo ::group::bundler environment
        buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
        echo ::endgroup::
-
-    - name: "Honeycomb: Record Bundler Setup time"
+ 
+    - name: "Honeycomb: Record Setup Environment time"
      if: ${{ always() }}
      run: |
-        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Bundler Setup'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
+        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
    - name: Provision test environment
      run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platform }}' -- bundle exec rake 'litmus:provision[provision::provision_service,${{ matrix.platform }}]'
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
        echo ::group::=== REQUEST ===
        cat request.json || true
        echo
        echo ::endgroup::
        echo ::group::=== INVENTORY ===
-        sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
+        if [ -f 'spec/fixtures/litmus_inventory.yaml' ];
+        then
+          FILE='spec/fixtures/litmus_inventory.yaml'
+        elif [ -f 'inventory.yaml' ];
+        then
+          FILE='inventory.yaml'
+        fi
+        sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true
        echo ::endgroup::

-    # The provision service hands out machines as soon as they're provisioned.
-    # The GCP VMs might still take a while to spool up and configure themselves fully.
-    # This retry loop spins until all agents have been installed successfully.
    - name: Install agent
-      uses: nick-invision/retry@v1
-      with:
-        timeout_minutes: 30
-        max_attempts: 5
-        retry_wait_seconds: 60
-        command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
+      run: |
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'

-    # The agent installer on windows does not finish in time for this to work. To
-    # work around this for now, retry after a minute if installing the module failed.
    - name: Install module
-      uses: nick-invision/retry@v1
-      with:
-        timeout_minutes: 30
-        max_attempts: 2
-        retry_wait_seconds: 60
-        command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
-
+      run: |
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
+ 
    - name: "Honeycomb: Record deployment times"
      if: ${{ always() }}
      run: |
        echo ::group::honeycomb step
        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
        echo STEP_START=$(date +%s) >> $GITHUB_ENV
        echo ::endgroup::
-
    - name: Run acceptance tests
      run: |
        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
-
+ 
    - name: "Honeycomb: Record acceptance testing times"
      if: ${{ always() }}
      run: |
        buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
-        echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-5 >> $GITHUB_ENV
+        echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
        echo STEP_START=$(date +%s) >> $GITHUB_ENV
-
    - name: Remove test environment
      if: ${{ always() }}
+      continue-on-error: true
      run: |
-        if [ -f inventory.yaml ]; then
+        if [[ -f inventory.yaml || -f spec/fixtures/litmus_inventory.yaml ]]; then
          buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
          echo ::group::=== REQUEST ===
          cat request.json || true
          echo
          echo ::endgroup::
        fi
-
+ 
    - name: "Honeycomb: Record removal times"
      if: ${{ always() }}
      run: |
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -0,0 +1,47 @@
+name: "Publish module"
+
+on:
+  workflow_dispatch:
+  
+jobs:
+  create-github-release:
+    name: Deploy GitHub Release
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.ref }}
+          clean: true
+          fetch-depth: 0
+      - name: Get Version
+        id: gv
+        run: |
+          echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
+      - name: Create Release
+        uses: actions/create-release@v1
+        id: create_release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: "v${{ steps.gv.outputs.ver }}"
+          draft: false
+          prerelease: false
+
+  deploy-forge:
+    name: Deploy to Forge
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.ref }}
+          clean: true
+      - name: "PDK Build"
+        uses: docker://puppet/pdk:nightly
+        with:
+          args: 'build'
+      - name: "Push to Forge"
+        uses: docker://puppet/pdk:nightly
+        with:
+          args: 'release publish --forge-token ${{ secrets.FORGE_API_KEY }} --force'
--- a/.github/workflows/spec.yml
+++ b/.github/workflows/spec.yml
@@ -0,0 +1,126 @@
+name: "Spec Tests"
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  workflow_dispatch:
+  pull_request:
+
+
+env:
+  HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
+  HONEYCOMB_DATASET: litmus tests
+
+jobs:
+  setup_matrix:
+    name: "Setup Test Matrix"
+    runs-on: ubuntu-20.04
+    outputs:
+      spec_matrix: ${{ steps.get-matrix.outputs.spec_matrix }}
+
+    steps:
+    
+      - name: "Honeycomb: Start recording"
+        uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
+        with:
+          apikey: ${{ env.HONEYCOMB_WRITEKEY }}
+          dataset: ${{ env.HONEYCOMB_DATASET }}
+          job-status: ${{ job.status }}
+
+      - name: "Honeycomb: Start first step"
+        run: |
+          echo STEP_ID=setup-environment >> $GITHUB_ENV
+          echo STEP_START=$(date +%s) >> $GITHUB_ENV
+      - name: Checkout Source
+        uses: actions/checkout@v2
+        if: ${{ github.repository_owner == 'puppetlabs' }}
+
+      - name: Activate Ruby 2.7
+        uses: ruby/setup-ruby@v1
+        if: ${{ github.repository_owner == 'puppetlabs' }}
+        with:
+          ruby-version: "2.7"
+          bundler-cache: true
+
+      - name: Print bundle environment
+        if: ${{ github.repository_owner == 'puppetlabs' }}
+        run: |
+          echo ::group::bundler environment
+          buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
+          echo ::endgroup::
+      - name: "Honeycomb: Record Setup Environment time"
+        if: ${{ github.repository_owner == 'puppetlabs' }}
+        run: |
+          buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
+          echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
+          echo STEP_START=$(date +%s) >> $GITHUB_ENV
+      # - name: Run Static & Syntax Tests
+      #   if: ${{ github.repository_owner == 'puppetlabs' }}
+      #   run: |
+      #     buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
+
+      - name: Setup Spec Test Matrix
+        id: get-matrix
+        run: |
+          if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
+            buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
+          else
+            echo  "::set-output name=spec_matrix::{}"
+          fi
+      - name: "Honeycomb: Record Setup Test Matrix time"
+        if: ${{ always() }}
+        run: |
+          buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
+  Spec:
+    name: "Spec Tests (Puppet: ${{matrix.puppet_version}}, Ruby Ver: ${{matrix.ruby_version}})"
+    needs:
+      - setup_matrix
+    if: ${{ needs.setup_matrix.outputs.spec_matrix != '{}' }}
+
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.setup_matrix.outputs.spec_matrix)}}
+
+    env:
+      BUILDEVENT_FILE: '../buildevents.txt'
+      PUPPET_GEM_VERSION: ${{ matrix.puppet_version }}
+      FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main'
+
+    steps:
+      - run: |
+          echo "SANITIZED_PUPPET_VERSION=$(echo '${{ matrix.puppet_version }}' | sed 's/~> //g')" >> $GITHUB_ENV
+
+      - run: |
+          echo 'puppet_version=${{ env.SANITIZED_PUPPET_VERSION }}' >> $BUILDEVENT_FILE
+      - name: "Honeycomb: Start first step"
+        run: |
+          echo "STEP_ID=${{ env.SANITIZED_PUPPET_VERSION }}-spec" >> $GITHUB_ENV
+          echo STEP_START=$(date +%s) >> $GITHUB_ENV
+
+      - name: "Honeycomb: Start recording"
+        uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
+        with:
+          apikey: ${{ env.HONEYCOMB_WRITEKEY }}
+          dataset: ${{ env.HONEYCOMB_DATASET }}
+          job-status: ${{ job.status }}
+          matrix-key: ${{ env.SANITIZED_PUPPET_VERSION }}
+      - name: Checkout Source
+        uses: actions/checkout@v2
+
+      - name: "Activate Ruby ${{ matrix.ruby_version }}"
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{matrix.ruby_version}}
+          bundler-cache: true
+
+      - name: Print bundle environment
+        run: |
+          echo ::group::bundler environment
+          buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
+          echo ::endgroup::
+
+
+      - name: Run parallel_spec tests
+        run: |
+          buildevents cmd $TRACE_ID $STEP_ID 'rake parallel_spec Puppet ${{ matrix.puppet_version }}, Ruby ${{ matrix.ruby_version }}' -- bundle exec rake parallel_spec
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,19 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/stale@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        days-before-stale: 60
+        days-before-close: 7
+        stale-issue-message: 'This issue has been marked as stale because it has been open for a while and has had no recent activity. If this issue is still important to you please drop a comment below and we will add this to our backlog to complete. Otherwise, it will be closed in 7 days.'
+        stale-issue-label: 'stale'
+        stale-pr-message: 'This PR has been marked as stale because it has been open for a while and has had no recent activity. If this PR is still important to you please drop a comment below and we will add this to our backlog to complete. Otherwise, it will be closed in 7 days.'
+        stale-pr-label: 'stale'
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 .project
 .envrc
 /inventory.yaml
+/spec/fixtures/litmus_inventory.yaml
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -6,4 +6,4 @@ tasks:

 vscode:
  extensions:
-    - puppet.puppet-vscode@1.0.0:oSzfTkDf6Cmc1jOjgW33VA==
+    - puppet.puppet-vscode@1.2.0:f5iEPbmOj6FoFTOV6q8LTg==
--- a/.pdkignore
+++ b/.pdkignore
@@ -25,7 +25,9 @@
 .project
 .envrc
 /inventory.yaml
+/spec/fixtures/litmus_inventory.yaml
 /appveyor.yml
+/.editorconfig
 /.fixtures.yml
 /Gemfile
 /.gitattributes
@@ -42,3 +44,4 @@
 /spec/
 /.vscode/
 /.sync.yml
+/.devcontainer/
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,12 +1,12 @@
 ---
 require:
+- rubocop-performance
 - rubocop-rspec
- rubocop-i18n
 AllCops:
  DisplayCopNames: true
-  TargetRubyVersion: '2.1'
+  TargetRubyVersion: '2.5'
  Include:
-  - "./**/*.rb"
+  - "**/*.rb"
  Exclude:
  - bin/*
  - ".vendor/**/*"
@@ -18,16 +18,9 @@ AllCops:
  - "**/Puppetfile"
  - "**/Vagrantfile"
  - "**/Guardfile"
-Metrics/LineLength:
+Layout/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/**/*
-  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.
@@ -36,14 +29,13 @@ RSpec/BeforeAfterAll:
 RSpec/HookArgument:
  Description: Prefer explicit :each argument, matching existing module's style
  EnforcedStyle: each
+RSpec/DescribeSymbol:
+  Exclude:
+  - spec/unit/facter/**/*.rb
 Style/BlockDelimiters:
  Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
    be consistent then.
  EnforcedStyle: braces_for_chaining
-Style/BracesAroundHashParameters:
-  Description: Braces are required by Ruby 2.7. Cop removed from RuboCop v0.80.0.
-    See https://github.com/rubocop-hq/rubocop/pull/7643
-  Enabled: false
 Style/ClassAndModuleChildren:
  Description: Compact style reduces the required amount of indentation.
  EnforcedStyle: compact
@@ -72,7 +64,7 @@ Style/TrailingCommaInArguments:
  Description: Prefer always trailing comma on multiline argument lists. This makes
    diffs, and re-ordering nicer.
  EnforcedStyleForMultiline: comma
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
  Description: Prefer always trailing comma on multiline literals. This makes diffs,
    and re-ordering nicer.
  EnforcedStyleForMultiline: comma
@@ -87,26 +79,170 @@ Style/Documentation:
  - spec/**/*
 Style/WordArray:
  EnforcedStyle: brackets
+Performance/AncestorsInclude:
+  Enabled: true
+Performance/BigDecimalWithNumericArgument:
+  Enabled: true
+Performance/BlockGivenWithExplicitBlock:
+  Enabled: true
+Performance/CaseWhenSplat:
+  Enabled: true
+Performance/ConstantRegexp:
+  Enabled: true
+Performance/MethodObjectAsBlock:
+  Enabled: true
+Performance/RedundantSortBlock:
+  Enabled: true
+Performance/RedundantStringChars:
+  Enabled: true
+Performance/ReverseFirst:
+  Enabled: true
+Performance/SortReverse:
+  Enabled: true
+Performance/Squeeze:
+  Enabled: true
+Performance/StringInclude:
+  Enabled: true
+Performance/Sum:
+  Enabled: true
 Style/CollectionMethods:
  Enabled: true
 Style/MethodCalledOnDoEndBlock:
  Enabled: true
 Style/StringMethods:
  Enabled: true
-GetText/DecorateFunctionMessage:
+Bundler/InsecureProtocolSource:
  Enabled: false
-GetText/DecorateStringFormattingUsingInterpolation:
+Gemspec/DuplicatedAssignment:
  Enabled: false
-GetText/DecorateStringFormattingUsingPercent:
+Gemspec/OrderedDependencies:
+  Enabled: false
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+Gemspec/RubyVersionGlobalsUsage:
+  Enabled: false
+Layout/ArgumentAlignment:
+  Enabled: false
+Layout/BeginEndAlignment:
+  Enabled: false
+Layout/ClosingHeredocIndentation:
+  Enabled: false
+Layout/EmptyComment:
+  Enabled: false
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+Layout/EmptyLinesAroundArguments:
+  Enabled: false
+Layout/EmptyLinesAroundAttributeAccessor:
  Enabled: false
 Layout/EndOfLine:
  Enabled: false
-Layout/IndentHeredoc:
+Layout/FirstArgumentIndentation:
+  Enabled: false
+Layout/HashAlignment:
+  Enabled: false
+Layout/HeredocIndentation:
+  Enabled: false
+Layout/LeadingEmptyLines:
+  Enabled: false
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: false
+Layout/SpaceInsideArrayLiteralBrackets:
+  Enabled: false
+Layout/SpaceInsideReferenceBrackets:
+  Enabled: false
+Lint/BigDecimalNew:
+  Enabled: false
+Lint/BooleanSymbol:
+  Enabled: false
+Lint/ConstantDefinitionInBlock:
+  Enabled: false
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: false
+Lint/DisjunctiveAssignmentInConstructor:
+  Enabled: false
+Lint/DuplicateElsifCondition:
+  Enabled: false
+Lint/DuplicateRequire:
+  Enabled: false
+Lint/DuplicateRescueException:
+  Enabled: false
+Lint/EmptyConditionalBody:
+  Enabled: false
+Lint/EmptyFile:
+  Enabled: false
+Lint/ErbNewArguments:
+  Enabled: false
+Lint/FloatComparison:
+  Enabled: false
+Lint/HashCompareByIdentity:
+  Enabled: false
+Lint/IdentityComparison:
+  Enabled: false
+Lint/InterpolationCheck:
+  Enabled: false
+Lint/MissingCopEnableDirective:
+  Enabled: false
+Lint/MixedRegexpCaptureTypes:
+  Enabled: false
+Lint/NestedPercentLiteral:
+  Enabled: false
+Lint/NonDeterministicRequireOrder:
+  Enabled: false
+Lint/OrderedMagicComments:
+  Enabled: false
+Lint/OutOfRangeRegexpRef:
+  Enabled: false
+Lint/RaiseException:
+  Enabled: false
+Lint/RedundantCopEnableDirective:
+  Enabled: false
+Lint/RedundantRequireStatement:
+  Enabled: false
+Lint/RedundantSafeNavigation:
+  Enabled: false
+Lint/RedundantWithIndex:
+  Enabled: false
+Lint/RedundantWithObject:
+  Enabled: false
+Lint/RegexpAsCondition:
+  Enabled: false
+Lint/ReturnInVoidContext:
+  Enabled: false
+Lint/SafeNavigationConsistency:
+  Enabled: false
+Lint/SafeNavigationWithEmpty:
+  Enabled: false
+Lint/SelfAssignment:
+  Enabled: false
+Lint/SendWithMixinArgument:
+  Enabled: false
+Lint/ShadowedArgument:
+  Enabled: false
+Lint/StructNewOverride:
+  Enabled: false
+Lint/ToJSON:
+  Enabled: false
+Lint/TopLevelReturnWithArgument:
+  Enabled: false
+Lint/TrailingCommaInAttributeDeclaration:
+  Enabled: false
+Lint/UnreachableLoop:
+  Enabled: false
+Lint/UriEscapeUnescape:
+  Enabled: false
+Lint/UriRegexp:
+  Enabled: false
+Lint/UselessMethodDefinition:
+  Enabled: false
+Lint/UselessTimes:
  Enabled: false
 Metrics/AbcSize:
  Enabled: false
 Metrics/BlockLength:
  Enabled: false
+Metrics/BlockNesting:
+  Enabled: false
 Metrics/ClassLength:
  Enabled: false
 Metrics/CyclomaticComplexity:
@@ -119,19 +255,265 @@ Metrics/ParameterLists:
  Enabled: false
 Metrics/PerceivedComplexity:
  Enabled: false
+Migration/DepartmentName:
+  Enabled: false
+Naming/AccessorMethodName:
+  Enabled: false
+Naming/BlockParameterName:
+  Enabled: false
+Naming/HeredocDelimiterCase:
+  Enabled: false
+Naming/HeredocDelimiterNaming:
+  Enabled: false
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
+Naming/MethodParameterName:
+  Enabled: false
+Naming/RescuedExceptionsVariableName:
+  Enabled: false
+Naming/VariableNumber:
+  Enabled: false
+Performance/BindCall:
+  Enabled: false
+Performance/DeletePrefix:
+  Enabled: false
+Performance/DeleteSuffix:
+  Enabled: false
+Performance/InefficientHashSearch:
+  Enabled: false
+Performance/UnfreezeString:
+  Enabled: false
+Performance/UriDefaultParser:
+  Enabled: false
+RSpec/Be:
+  Enabled: false
+RSpec/Capybara/CurrentPathExpectation:
+  Enabled: false
+RSpec/Capybara/FeatureMethods:
+  Enabled: false
+RSpec/Capybara/VisibilityMatcher:
+  Enabled: false
+RSpec/ContextMethod:
+  Enabled: false
+RSpec/ContextWording:
+  Enabled: false
 RSpec/DescribeClass:
  Enabled: false
+RSpec/EmptyHook:
+  Enabled: false
+RSpec/EmptyLineAfterExample:
+  Enabled: false
+RSpec/EmptyLineAfterExampleGroup:
+  Enabled: false
+RSpec/EmptyLineAfterHook:
+  Enabled: false
 RSpec/ExampleLength:
  Enabled: false
-RSpec/MessageExpectation:
+RSpec/ExampleWithoutDescription:
+  Enabled: false
+RSpec/ExpectChange:
+  Enabled: false
+RSpec/ExpectInHook:
+  Enabled: false
+RSpec/FactoryBot/AttributeDefinedStatically:
+  Enabled: false
+RSpec/FactoryBot/CreateList:
+  Enabled: false
+RSpec/FactoryBot/FactoryClassName:
+  Enabled: false
+RSpec/HooksBeforeExamples:
+  Enabled: false
+RSpec/ImplicitBlockExpectation:
+  Enabled: false
+RSpec/ImplicitSubject:
+  Enabled: false
+RSpec/LeakyConstantDeclaration:
+  Enabled: false
+RSpec/LetBeforeExamples:
+  Enabled: false
+RSpec/MissingExampleGroupArgument:
  Enabled: false
 RSpec/MultipleExpectations:
  Enabled: false
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+RSpec/MultipleSubjects:
+  Enabled: false
 RSpec/NestedGroups:
  Enabled: false
+RSpec/PredicateMatcher:
+  Enabled: false
+RSpec/ReceiveCounts:
+  Enabled: false
+RSpec/ReceiveNever:
+  Enabled: false
+RSpec/RepeatedExampleGroupBody:
+  Enabled: false
+RSpec/RepeatedExampleGroupDescription:
+  Enabled: false
+RSpec/RepeatedIncludeExample:
+  Enabled: false
+RSpec/ReturnFromStub:
+  Enabled: false
+RSpec/SharedExamples:
+  Enabled: false
+RSpec/StubbedMock:
+  Enabled: false
+RSpec/UnspecifiedException:
+  Enabled: false
+RSpec/VariableDefinition:
+  Enabled: false
+RSpec/VoidExpect:
+  Enabled: false
+RSpec/Yield:
+  Enabled: false
+Security/Open:
+  Enabled: false
+Style/AccessModifierDeclarations:
+  Enabled: false
+Style/AccessorGrouping:
+  Enabled: false
 Style/AsciiComments:
  Enabled: false
+Style/BisectedAttrAccessor:
+  Enabled: false
+Style/CaseLikeIf:
+  Enabled: false
+Style/ClassEqualityComparison:
+  Enabled: false
+Style/ColonMethodDefinition:
+  Enabled: false
+Style/CombinableLoops:
+  Enabled: false
+Style/CommentedKeyword:
+  Enabled: false
+Style/Dir:
+  Enabled: false
+Style/DoubleCopDisableDirective:
+  Enabled: false
+Style/EmptyBlockParameter:
+  Enabled: false
+Style/EmptyLambdaParameter:
+  Enabled: false
+Style/Encoding:
+  Enabled: false
+Style/EvalWithLocation:
+  Enabled: false
+Style/ExpandPathArguments:
+  Enabled: false
+Style/ExplicitBlockArgument:
+  Enabled: false
+Style/ExponentialNotation:
+  Enabled: false
+Style/FloatDivision:
+  Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
+Style/GlobalStdStream:
+  Enabled: false
+Style/HashAsLastArrayItem:
+  Enabled: false
+Style/HashLikeCase:
+  Enabled: false
+Style/HashTransformKeys:
+  Enabled: false
+Style/HashTransformValues:
+  Enabled: false
 Style/IfUnlessModifier:
  Enabled: false
+Style/KeywordParametersOrder:
+  Enabled: false
+Style/MinMax:
+  Enabled: false
+Style/MixinUsage:
+  Enabled: false
+Style/MultilineWhenThen:
+  Enabled: false
+Style/NegatedUnless:
+  Enabled: false
+Style/NumericPredicate:
+  Enabled: false
+Style/OptionalBooleanParameter:
+  Enabled: false
+Style/OrAssignment:
+  Enabled: false
+Style/RandomWithOffset:
+  Enabled: false
+Style/RedundantAssignment:
+  Enabled: false
+Style/RedundantCondition:
+  Enabled: false
+Style/RedundantConditional:
+  Enabled: false
+Style/RedundantFetchBlock:
+  Enabled: false
+Style/RedundantFileExtensionInRequire:
+  Enabled: false
+Style/RedundantRegexpCharacterClass:
+  Enabled: false
+Style/RedundantRegexpEscape:
+  Enabled: false
+Style/RedundantSelfAssignment:
+  Enabled: false
+Style/RedundantSort:
+  Enabled: false
+Style/RescueStandardError:
+  Enabled: false
+Style/SingleArgumentDig:
+  Enabled: false
+Style/SlicingWithRange:
+  Enabled: false
+Style/SoleNestedConditional:
+  Enabled: false
+Style/StderrPuts:
+  Enabled: false
+Style/StringConcatenation:
+  Enabled: false
+Style/Strip:
+  Enabled: false
 Style/SymbolProc:
  Enabled: false
+Style/TrailingBodyOnClass:
+  Enabled: false
+Style/TrailingBodyOnMethodDefinition:
+  Enabled: false
+Style/TrailingBodyOnModule:
+  Enabled: false
+Style/TrailingCommaInHashLiteral:
+  Enabled: false
+Style/TrailingMethodEndStatement:
+  Enabled: false
+Style/UnpackFirst:
+  Enabled: false
+Lint/DuplicateBranch:
+  Enabled: false
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: false
+Lint/EmptyBlock:
+  Enabled: false
+Lint/EmptyClass:
+  Enabled: false
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: false
+Lint/ToEnumArguments:
+  Enabled: false
+Lint/UnexpectedBlockArity:
+  Enabled: false
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: false
+Performance/CollectionLiteralInLoop:
+  Enabled: false
+Style/ArgumentsForwarding:
+  Enabled: false
+Style/CollectionCompact:
+  Enabled: false
+Style/DocumentDynamicEvalDefinition:
+  Enabled: false
+Style/NegatedIfElseCondition:
+  Enabled: false
+Style/NilLambda:
+  Enabled: false
+Style/RedundantArgument:
+  Enabled: false
+Style/SwapValues:
+  Enabled: false
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,51 +1,13 @@
 ---
 ".gitlab-ci.yml":
  delete: true
-".travis.yml":
-  global_env: 
-    - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
-  deploy_to_forge:
-    enabled: false
-  branches:
-  - release
-  use_litmus: true
-  litmus:
-    provision_list:
-    - ---travis_el
-    - travis_deb
-    - travis_el7
-    - travis_el8
-    complex:
-    - collection:
-        puppet_collection:
-        - puppet6
-        provision_list:
-        - travis_ub_6
-    - collection:
-        puppet_collection:
-        - puppet5
-        provision_list:
-        - travis_ub_5
-  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')
-    - gem: puppet_litmus
-      git: https://github.com/puppetlabs/puppet_litmus
-      ref: main
-      condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.5.0')
-    - gem: bolt
-      version: '2.32.0'
-      condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.5.0')
 spec/spec_helper.rb:
  mock_with: ":rspec"
  coverage_report: true
@@ -57,3 +19,12 @@ spec/spec_helper.rb:
  unmanaged: false
 .github/workflows/pr_test.yml:
  unmanaged: false
+.github/workflows/auto_release.yml:
+  unmanaged: false
+.github/workflows/spec.yml:
+  checks: 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
+  unmanaged: false
+.github/workflows/release.yml:
+  unmanaged: false
+.travis.yml:
+  delete: true
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,137 +0,0 @@
---
-os: linux
-dist: xenial
-language: ruby
-cache: bundler
-before_install:
-  - bundle -v
-  - rm -f Gemfile.lock
-  - "# 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:
-  - 'SIMPLECOV=yes bundle exec rake $CHECK'
-bundler_args: --without system_tests
-rvm:
-  - 2.5.7
-env:
-  global:
-    - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
-stages:
-  - static
-  - spec
-  - acceptance
-jobs:
-  fast_finish: true
-  include:
-    -
-      before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_ub_6]'"
-      - "bundle exec rake 'litmus:install_agent[puppet6]'"
-      - "bundle exec rake litmus:install_module"
-      bundler_args:
-      env: PLATFORMS=travis_ub_6_puppet6
-      rvm: 2.5.7
-      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
-      services: docker
-      stage: acceptance
-    -
-      before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_ub_5]'"
-      - "bundle exec rake 'litmus:install_agent[puppet5]'"
-      - "bundle exec rake litmus:install_module"
-      bundler_args:
-      env: PLATFORMS=travis_ub_5_puppet5
-      rvm: 2.5.7
-      script: ["travis_wait 45 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[puppet5]'"
-      - "bundle exec rake litmus:install_module"
-      bundler_args:
-      env: PLATFORMS=travis_deb_puppet5
-      rvm: 2.5.7
-      script: ["travis_wait 45 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:
-      env: PLATFORMS=travis_el7_puppet5
-      rvm: 2.5.7
-      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
-      services: docker
-      stage: acceptance
-    -
-      before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_el8]'"
-      - "bundle exec rake 'litmus:install_agent[puppet5]'"
-      - "bundle exec rake litmus:install_module"
-      bundler_args:
-      env: PLATFORMS=travis_el8_puppet5
-      rvm: 2.5.7
-      script: ["travis_wait 45 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:
-      env: PLATFORMS=travis_deb_puppet6
-      rvm: 2.5.7
-      script: ["travis_wait 45 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:
-      env: PLATFORMS=travis_el7_puppet6
-      rvm: 2.5.7
-      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
-      services: docker
-      stage: acceptance
-    -
-      before_script:
-      - "bundle exec rake 'litmus:provision_list[travis_el8]'"
-      - "bundle exec rake 'litmus:install_agent[puppet6]'"
-      - "bundle exec rake litmus:install_module"
-      bundler_args:
-      env: PLATFORMS=travis_el8_puppet6
-      rvm: 2.5.7
-      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
-      services: docker
-      stage: acceptance
-    -
-      env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
-      stage: static
-    -
-      env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
-      rvm: 2.4.5
-      stage: spec
-    -
-      env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
-      rvm: 2.5.7
-      stage: spec
-branches:
-  only:
-    - main
-    - /^v\d/
-    - release
-notifications:
-  email: false
-  slack:
-    secure: Wf7Wz3KC0G9ngPiDcOIpSqcCfdvwKQqZdNH/z3GMcj/OipMAdyFSAVnBvikIl7L1c0LMU9ATEpub+jYzViT7RZywaNyer6SRAfs6MIgAYo4xxF/mOnDHAxXeUYAsBXXL4sS3NX2XWMPa9ZWUeuUQKth8O4STWgAX298QZLyYx5k=
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,92 @@

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

+## [v8.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v8.0.0) (2022-04-05)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.3.0...v8.0.0)
+
+### Changed
+
+- \(GH-C&T-7\) Remove code specific to unsupported OSs [\#507](https://github.com/puppetlabs/puppetlabs-java/pull/507) ([david22swan](https://github.com/david22swan))
+
+### Added
+
+- \(MODULES-11234\) Support Adoptium Temurin [\#502](https://github.com/puppetlabs/puppetlabs-java/pull/502) ([dploeger](https://github.com/dploeger))
+
+### Fixed
+
+- pdksync - \(IAC-1787\) Remove Support for CentOS 6 [\#503](https://github.com/puppetlabs/puppetlabs-java/pull/503) ([david22swan](https://github.com/david22swan))
+- pdksync - \(GH-iac-334\) Remove Support for Ubuntu 14.04/16.04 [\#505](https://github.com/puppetlabs/puppetlabs-java/pull/505) ([david22swan](https://github.com/david22swan))
+
+## [v7.3.0](https://github.com/puppetlabs/puppetlabs-java/tree/v7.3.0) (2021-10-11)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.2.0...v7.3.0)
+
+### Added
+
+- pdksync - \(IAC-1753\) - Add Support for AlmaLinux 8 [\#500](https://github.com/puppetlabs/puppetlabs-java/pull/500) ([david22swan](https://github.com/david22swan))
+- pdksync - \(IAC-1751\) - Add Support for Rocky 8 [\#499](https://github.com/puppetlabs/puppetlabs-java/pull/499) ([david22swan](https://github.com/david22swan))
+
+### Fixed
+
+- pdksync - \(IAC-1598\) - Remove Support for Debian 8 [\#498](https://github.com/puppetlabs/puppetlabs-java/pull/498) ([david22swan](https://github.com/david22swan))
+
+## [v7.2.0](https://github.com/puppetlabs/puppetlabs-java/tree/v7.2.0) (2021-09-20)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.1.1...v7.2.0)
+
+### Added
+
+- Enabling Rocky Linux for Install [\#488](https://github.com/puppetlabs/puppetlabs-java/pull/488) ([pmjensen](https://github.com/pmjensen))
+
+### Fixed
+
+- Allow archive 6.x [\#493](https://github.com/puppetlabs/puppetlabs-java/pull/493) ([smortex](https://github.com/smortex))
+
+## [v7.1.1](https://github.com/puppetlabs/puppetlabs-java/tree/v7.1.1) (2021-08-26)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.1.0...v7.1.1)
+
+### Fixed
+
+- \(IAC-1741\) Allow stdlib v8.0.0 [\#491](https://github.com/puppetlabs/puppetlabs-java/pull/491) ([david22swan](https://github.com/david22swan))
+
+## [v7.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/v7.1.0) (2021-08-12)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.0.2...v7.1.0)
+
+### Added
+
+- pdksync - \(IAC-1709\) - Add Support for Debian 11 [\#489](https://github.com/puppetlabs/puppetlabs-java/pull/489) ([david22swan](https://github.com/david22swan))
+
+## [v7.0.2](https://github.com/puppetlabs/puppetlabs-java/tree/v7.0.2) (2021-04-26)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.0.1...v7.0.2)
+
+### Fixed
+
+- add url parameter for adoptopenjdk [\#473](https://github.com/puppetlabs/puppetlabs-java/pull/473) ([cbobinec](https://github.com/cbobinec))
+
+## [v7.0.1](https://github.com/puppetlabs/puppetlabs-java/tree/v7.0.1) (2021-04-19)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.0.0...v7.0.1)
+
+### Fixed
+
+- allow v5.x of puppet/archive [\#476](https://github.com/puppetlabs/puppetlabs-java/pull/476) ([bastelfreak](https://github.com/bastelfreak))
+
+## [v7.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v7.0.0) (2021-03-01)
+
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.5.0...v7.0.0)
+
+### Changed
+
+- pdksync - Remove Puppet 5 from testing and bump minimal version to 6.0.0 [\#463](https://github.com/puppetlabs/puppetlabs-java/pull/463) ([carabasdaniel](https://github.com/carabasdaniel))
+
+### Fixed
+
+- \(MODULES-10935\) - Switch legacy operatingsystem fact to modern kernel one [\#461](https://github.com/puppetlabs/puppetlabs-java/pull/461) ([rjd1](https://github.com/rjd1))
+
 ## [v6.5.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.5.0) (2020-12-16)

 [Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.4.0...v6.5.0)
@@ -463,4 +549,4 @@ Jeff McCune <jeff@puppetlabs.com>
 [2.2.0]:https://github.com/puppetlabs/puppetlabs-java/compare/2.1.1...2.2.0


-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,271 +1,3 @@
 # Contributing to Puppet modules

-So you want to contribute to a Puppet module: Great! Below are some instructions to get you started doing
-that very thing while setting expectations around code quality as well as a few tips for making the
-process as easy as possible. 
-
-### Table of Contents
-
-1. [Getting Started](#getting-started)
-1. [Commit Checklist](#commit-checklist)
-1. [Submission](#submission)
-1. [More about commits](#more-about-commits)
-1. [Testing](#testing)
-    - [Running Tests](#running-tests)
-    - [Writing Tests](#writing-tests)
-1. [Get Help](#get-help)
-
-## Getting Started
-
- Fork the module repository on GitHub and clone to your workspace
-
- Make your changes!
-
-## Commit Checklist
-
-### The Basics
-
- [x] my commit is a single logical unit of work
-
- [x] I have checked for unnecessary whitespace with "git diff --check" 
-
- [x] my commit does not include commented out code or unneeded files
-
-### The Content
-
- [x] my commit includes tests for the bug I fixed or feature I added
-
- [x] my commit includes appropriate documentation changes if it is introducing a new feature or changing existing functionality
-    
- [x] my code passes existing test suites
-
-### The Commit Message
-
- [x] the first line of my commit message includes:
-
-  - [x] an issue number (if applicable), e.g. "(MODULES-xxxx) This is the first line" 
-  
-  - [x] a short description (50 characters is the soft limit, excluding ticket number(s))
-
- [x] the body of my commit message:
-
-  - [x] is meaningful
-
-  - [x] uses the imperative, present tense: "change", not "changed" or "changes"
-
-  - [x] includes motivation for the change, and contrasts its implementation with the previous behavior
-
-## Submission
-
-### Pre-requisites
-
- Make sure you have a [GitHub account](https://github.com/join)
-
- [Create a ticket](https://tickets.puppet.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppet.com/browse/) you are patching for.
-
-### Push and PR
-
- Push your changes to your fork
-
- [Open a Pull Request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) against the repository in the puppetlabs organization
-
-## More about commits 
-
-  1.  Make separate commits for logically separate changes.
-
-      Please break your commits down into logically consistent units
-      which include new or changed tests relevant to the rest of the
-      change.  The goal of doing this is to make the diff easier to
-      read for whoever is reviewing your code.  In general, the easier
-      your diff is to read, the more likely someone will be happy to
-      review it and get it into the code base.
-
-      If you are going to refactor a piece of code, please do so as a
-      separate commit from your feature or bug fix changes.
-
-      We also really appreciate changes that include tests to make
-      sure the bug is not re-introduced, and that the feature is not
-      accidentally broken.
-
-      Describe the technical detail of the change(s).  If your
-      description starts to get too long, that is a good sign that you
-      probably need to split up your commit into more finely grained
-      pieces.
-
-      Commits which plainly describe the things which help
-      reviewers check the patch and future developers understand the
-      code are much more likely to be merged in with a minimum of
-      bike-shedding or requested changes.  Ideally, the commit message
-      would include information, and be in a form suitable for
-      inclusion in the release notes for the version of Puppet that
-      includes them.
-
-      Please also check that you are not introducing any trailing
-      whitespace or other "whitespace errors".  You can do this by
-      running "git diff --check" on your changes before you commit.
-
-  2.  Sending your patches
-
-      To submit your changes via a GitHub pull request, we _highly_
-      recommend that you have them on a topic branch, instead of
-      directly on "main".
-      It makes things much easier to keep track of, especially if
-      you decide to work on another thing before your first change
-      is merged in.
-
-      GitHub has some pretty good
-      [general documentation](http://help.github.com/) on using
-      their site.  They also have documentation on
-      [creating pull requests](https://help.github.com/articles/creating-a-pull-request-from-a-fork/).
-
-      In general, after pushing your topic branch up to your
-      repository on GitHub, you can switch to the branch in the
-      GitHub UI and click "Pull Request" towards the top of the page
-      in order to open a pull request.
-
-  3.  Update the related JIRA issue.
-
-      If there is a JIRA issue associated with the change you
-      submitted, then you should update the ticket to include the
-      location of your branch, along with any other commentary you
-      may wish to make.
-
-# Testing
-
-## Getting Started
-
-Our Puppet modules provide [`Gemfile`](./Gemfile)s, which can tell a Ruby package manager such as [bundler](http://bundler.io/) what Ruby packages,
-or Gems, are required to build, develop, and test this software.
-
-Please make sure you have [bundler installed](http://bundler.io/#getting-started) on your system, and then use it to 
-install all dependencies needed for this project in the project root by running
-
-```shell
-% bundle install --path .bundle/gems
-Fetching gem metadata from https://rubygems.org/........
-Fetching gem metadata from https://rubygems.org/..
-Using rake (10.1.0)
-Using builder (3.2.2)
-- 8><-- many more --><8 --
-Using rspec-system-puppet (2.2.0)
-Using serverspec (0.6.3)
-Using rspec-system-serverspec (1.0.0)
-Using bundler (1.3.5)
-Your bundle is complete!
-Use `bundle show [gemname]` to see where a bundled gem is installed.
-```
-
-NOTE: some systems may require you to run this command with sudo.
-
-If you already have those gems installed, make sure they are up-to-date:
-
-```shell
-% bundle update
-```
-
-## Running Tests
-
-With all dependencies in place and up-to-date, run the tests:
-
-### Unit Tests
-
-```shell
-% bundle exec rake spec
-```
-
-This executes all the [rspec tests](http://rspec-puppet.com/) in the directories defined [here](https://github.com/puppetlabs/puppetlabs_spec_helper/blob/699d9fbca1d2489bff1736bb254bb7b7edb32c74/lib/puppetlabs_spec_helper/rake_tasks.rb#L17) and so on. 
-rspec tests may have the same kind of dependencies as the module they are testing. Although the module defines these dependencies in its [metadata.json](./metadata.json),
-rspec tests define them in [.fixtures.yml](./fixtures.yml).
-
-### Acceptance Tests
-
-Some Puppet modules also come with acceptance tests, which use [beaker][]. These tests spin up a virtual machine under
-[VirtualBox](https://www.virtualbox.org/), controlled with [Vagrant](http://www.vagrantup.com/), to simulate scripted test
-scenarios. In order to run these, you need both Virtualbox and Vagrant installed on your system.
-
-Run the tests by issuing the following command
-
-```shell
-% bundle exec rake spec_clean
-% bundle exec rspec spec/acceptance
-```
-
-This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),
-install Puppet, copy this module, and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb)
-and then run all the tests under [spec/acceptance](./spec/acceptance).
-
-## Writing Tests
-
-### Unit Tests
-
-When writing unit tests for Puppet, [rspec-puppet][] is your best friend. It provides tons of helper methods for testing your manifests against a 
-catalog (e.g. contain_file, contain_package, with_params, etc). It would be ridiculous to try and top rspec-puppet's [documentation][rspec-puppet_docs] 
-but here's a tiny sample:
-
-Sample manifest:
-
-```puppet
-file { "a test file":
-  ensure => present,
-  path   => "/etc/sample",
-}
-```
-
-Sample test:
-
-```ruby
-it 'does a thing' do
-  expect(subject).to contain_file("a test file").with({:path => "/etc/sample"})
-end
-```
-
-### Acceptance Tests
-
-Writing acceptance tests for Puppet involves [beaker][] and its cousin [beaker-rspec][]. A common pattern for acceptance tests is to create a test manifest, apply it
-twice to check for idempotency or errors, then run expectations.
-
-```ruby
-it 'does an end-to-end thing' do
-  pp = <<-EOF
-    file { 'a test file': 
-      ensure  => present,
-      path    => "/etc/sample",
-      content => "test string",
-    }
-    
-  apply_manifest(pp, :catch_failures => true)
-  apply_manifest(pp, :catch_changes => true)
-  
-end
-
-describe file("/etc/sample") do
-  it { is_expected.to contain "test string" }
-end
-
-```
-
-# If you have commit access to the repository
-
-Even if you have commit access to the repository, you still need to go through the process above, and have someone else review and merge
-in your changes.  The rule is that **all changes must be reviewed by a project developer that did not write the code to ensure that
-all changes go through a code review process.**
-
-The record of someone performing the merge is the record that they performed the code review. Again, this should be someone other than the author of the topic branch.
-
-# Get Help
-
-### On the web
-* [Puppet help messageboard](http://puppet.com/community/get-help)
-* [Writing tests](https://docs.puppet.com/guides/module_guides/bgtm.html#step-three-module-testing)
-* [General GitHub documentation](http://help.github.com/)
-* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-
-### On chat
-* Slack (slack.puppet.com) #forge-modules, #puppet-dev, #windows, #voxpupuli
-* IRC (freenode) #puppet-dev, #voxpupuli
-
-
-[rspec-puppet]: http://rspec-puppet.com/
-[rspec-puppet_docs]: http://rspec-puppet.com/documentation/
-[beaker]: https://github.com/puppetlabs/beaker
-[beaker-rspec]: https://github.com/puppetlabs/beaker-rspec
+Check out our [Contributing to Supported Modules Blog Post](https://puppetlabs.github.io/iac/docs/contributing_to_a_module.html) to find all the information that you will need.
--- a/32
+++ b/32
@@ -17,21 +17,19 @@ 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 "json", '= 2.3.0',                                         require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.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')
-  gem "puppet_litmus",                                           require: false, git: 'https://github.com/puppetlabs/puppet_litmus', ref: 'main' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.5.0')
-  gem "bolt", '2.32.0',                                          require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.5.0')
+  gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
+  gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0',     require: false, platforms: [:ruby]
+  gem "puppet-module-win-default-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "voxpupuli-puppet-lint-plugins", '>= 3.0',                 require: false, platforms: [:ruby]
+  gem "github_changelog_generator",                              require: false
+end
+group :system_tests do
+  gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
+  gem "puppet-module-win-system-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
 end

 puppet_version = ENV['PUPPET_GEM_VERSION']
@@ -48,16 +46,6 @@ gems['puppet'] = location_for(puppet_version)
 gems['facter'] = location_for(facter_version) if facter_version
 gems['hiera'] = location_for(hiera_version) if hiera_version

-if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
-  # If we're using a Puppet gem on Windows which handles its own win32-xxx gem
-  # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
-  gems['win32-dir'] =      ['<= 0.4.9', require: false]
-  gems['win32-eventlog'] = ['<= 0.6.5', require: false]
-  gems['win32-process'] =  ['<= 0.7.5', require: false]
-  gems['win32-security'] = ['<= 0.2.5', require: false]
-  gems['win32-service'] =  ['0.8.8', require: false]
-end
-
 gems.each do |gem_name, gem_params|
  gem gem_name, *gem_params
 end
--- a/README.md
+++ b/README.md
@@ -107,6 +107,56 @@ java::adopt { 'jdk8' :
 }
 ```

+## Adoptium Temurin
+
+Adoptium Temurin is the successor of AdoptOpenJDK and is supported using the defined type `java::adoptium`. It depends on [puppet/archive](https://github.com/voxpupuli/puppet-archive).
+
+The `java::adoptium` defined type expects a major, minor, patch and build version to download the specific release. It doesn't support jre downloads as the other distributions.
+
+```puppet
+java::adoptium { 'jdk16' :
+  ensure  => 'present',
+  version_major => '16',
+  version_minor => '0',
+  version_patch => '2',
+  version_build => '7',
+}
+java::adoptium { 'jdk17' :
+  ensure  => 'present',
+  version_major => '17',
+  version_minor => '0',
+  version_patch => '1',
+  version_build => '12',
+}
+```
+
+To install Adoptium to a non-default basedir (defaults: /usr/lib/jvm for Debian; /usr/java for RedHat):
+
+```puppet
+java::adoptium { 'jdk7' :
+  ensure  => 'present',
+  version_major => '17',
+  version_minor => '0',
+  version_patch => '1',
+  version_build => '12',
+  basedir => '/custom/java',
+}
+```
+
+To ensure that a custom basedir is a directory before Adoptium is installed (note: manage separately for custom ownership or perms):
+
+```puppet
+java::adoptium { 'jdk8' :
+  ensure  => 'present',
+  version_major => '17',
+  version_minor => '0',
+  version_patch => '1',
+  version_build => '12',
+  manage_basedir => true,
+  basedir => '/custom/java',
+}
+```
+
 ## SAP Java (sapjvm / sapmachine)

 SAP also offers JVM distributions. They are mostly required for their SAP products. In earlier versions it is called "sapjvm", in newer versions they call it "sapmachine".
@@ -189,19 +239,15 @@ This module is officially [supported](https://forge.puppetlabs.com/supported) fo

 OpenJDK is supported on:

-* Red Hat Enterprise Linux (RHEL) 5, 6, 7
-* CentOS 5, 6, 7
+* Red Hat Enterprise Linux (RHEL) 6, 7
+* CentOS 6, 7
 * Oracle Linux 6, 7
 * Scientific Linux 6
-* Debian 8, 9
-* Ubuntu 14.04, 16.04, 18.04, 20.04
+* Debian 9
+* Ubuntu 18.04, 20.04
 * Solaris 11
 * SLES 11, 12

-Sun Java is supported on:
-
-* Debian 6
-
 Oracle Java is supported on:

 * CentOS 6
@@ -215,6 +261,13 @@ AdoptOpenJDK Java is supported on:
 * Amazon Linux
 * Debian

+Adoptium Temurin Java is supported on:
+
+* CentOS
+* Red Hat Enterprise Linux (RHEL)
+* Amazon Linux
+* Debian
+
 SAP Java 7 and 8 (=sapjvm) are supported (by SAP) on:

 * SLES 12, 15
@@ -225,7 +278,6 @@ SAP Java 7 and 8 (=sapjvm) are supported (by SAP) on:

 For SAP Java > 8 (=sapmachine) please refer to the OpenJDK list as it is based on OpenJDK and has no special requirements.

-
 ### 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. 
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -25,15 +25,23 @@ options, even though those are not in the package repositories.

 ## Classes

-### `java`
+### <a name="java"></a>`java`

 This module manages the Java runtime package

 #### Parameters

-The following parameters are available in the `java` class.
+The following parameters are available in the `java` class:

-##### `distribution`
+* [`distribution`](#distribution)
+* [`version`](#version)
+* [`package`](#package)
+* [`package_options`](#package_options)
+* [`java_alternative`](#java_alternative)
+* [`java_alternative_path`](#java_alternative_path)
+* [`java_home`](#java_home)
+
+##### <a name="distribution"></a>`distribution`

 Data type: `String`

@@ -43,7 +51,7 @@ implementations available (eg: OpenJDK vs Oracle JDK).

 Default value: `'jdk'`

-##### `version`
+##### <a name="version"></a>`version`

 Data type: `Pattern[/present|installed|latest|^[.+_0-9a-zA-Z:~-]+$/]`

@@ -52,7 +60,7 @@ that java is present, and does not require a specific version.

 Default value: `'present'`

-##### `package`
+##### <a name="package"></a>`package`

 Data type: `Optional[String]`

@@ -61,7 +69,7 @@ java package is desired.

 Default value: ``undef``

-##### `package_options`
+##### <a name="package_options"></a>`package_options`

 Data type: `Optional[Array]`

@@ -70,7 +78,7 @@ Options available depend on the 'package' provider for the target OS.

 Default value: ``undef``

-##### `java_alternative`
+##### <a name="java_alternative"></a>`java_alternative`

 Data type: `Optional[String]`

@@ -82,7 +90,7 @@ this, you also need to set the path below.

 Default value: ``undef``

-##### `java_alternative_path`
+##### <a name="java_alternative_path"></a>`java_alternative_path`

 Data type: `Optional[String]`

@@ -93,7 +101,7 @@ correct JVM is enabled.

 Default value: ``undef``

-##### `java_home`
+##### <a name="java_home"></a>`java_home`

 Data type: `Optional[String]`

@@ -104,15 +112,29 @@ Default value: ``undef``

 ## Defined types

-### `java::adopt`
+### <a name="javaadopt"></a>`java::adopt`

 Defined Type java::adopt

 #### Parameters

-The following parameters are available in the `java::adopt` defined type.
+The following parameters are available in the `java::adopt` defined type:

-##### `ensure`
+* [`ensure`](#ensure)
+* [`version`](#version)
+* [`version_major`](#version_major)
+* [`version_minor`](#version_minor)
+* [`java`](#java)
+* [`proxy_server`](#proxy_server)
+* [`proxy_type`](#proxy_type)
+* [`url`](#url)
+* [`basedir`](#basedir)
+* [`manage_basedir`](#manage_basedir)
+* [`package_type`](#package_type)
+* [`manage_symlink`](#manage_symlink)
+* [`symlink_name`](#symlink_name)
+
+##### <a name="ensure"></a>`ensure`

 Data type: `Any`

@@ -120,7 +142,7 @@ Install or remove the package.

 Default value: `'present'`

-##### `version`
+##### <a name="version"></a>`version`

 Data type: `Any`

@@ -128,7 +150,7 @@ Version of Java to install, e.g. '8' or '9'. Default values for major and minor

 Default value: `'8'`

-##### `version_major`
+##### <a name="version_major"></a>`version_major`

 Data type: `Any`

@@ -136,7 +158,7 @@ Major version which should be installed, e.g. '8u101' or '9.0.4'. Must be used t

 Default value: ``undef``

-##### `version_minor`
+##### <a name="version_minor"></a>`version_minor`

 Data type: `Any`

@@ -144,7 +166,7 @@ Minor version which should be installed, e.g. 'b12' (for version = '8') or '11'

 Default value: ``undef``

-##### `java`
+##### <a name="java"></a>`java`

 Data type: `Any`

@@ -152,7 +174,7 @@ Type of Java Standard Edition to install, jdk or jre.

 Default value: `'jdk'`

-##### `proxy_server`
+##### <a name="proxy_server"></a>`proxy_server`

 Data type: `Any`

@@ -160,7 +182,7 @@ Specify a proxy server, with port number if needed. ie: https://example.com:8080

 Default value: ``undef``

-##### `proxy_type`
+##### <a name="proxy_type"></a>`proxy_type`

 Data type: `Any`

@@ -168,115 +190,7 @@ Proxy server type (none|http|https|ftp). (passed to archive)

 Default value: ``undef``

-##### `basedir`
-
-Data type: `Any`
-
-Directory under which the installation will occur. If not set, defaults to
-/usr/lib/jvm for Debian and /usr/java for RedHat.
-
-Default value: ``undef``
-
-##### `manage_basedir`
-
-Data type: `Any`
-
-Whether to manage the basedir directory.  Defaults to false.
-Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter.
-
-Default value: ``true``
-
-##### `package_type`
-
-Data type: `Any`
-
-Type of installation package for specified version of java_se. java_se 6 comes
-in a few installation package flavors and we need to account for them.
-Optional forced package types: rpm, rpmbin, tar.gz
-
-Default value: ``undef``
-
-##### `manage_symlink`
-
-Data type: `Any`
-
-Whether to manage a symlink that points to the installation directory.  Defaults to false.
-
-Default value: ``false``
-
-##### `symlink_name`
-
-Data type: `Any`
-
-The name for the optional symlink in the installation directory.
-
-Default value: ``undef``
-
-### `java::download`
-
-Defined Type java::download
-
-#### Parameters
-
-The following parameters are available in the `java::download` defined type.
-
-##### `ensure`
-
-Data type: `Any`
-
-Install or remove the package.
-
-Default value: `'present'`
-
-##### `version`
-
-Data type: `Any`
-
-Version of Java to install, e.g. '7' or '8'. Default values for major and minor versions will be used.
-
-Default value: `'8'`
-
-##### `version_major`
-
-Data type: `Any`
-
-Major version which should be installed, e.g. '8u101'. Must be used together with version_minor.
-
-Default value: ``undef``
-
-##### `version_minor`
-
-Data type: `Any`
-
-Minor version which should be installed, e.g. 'b12'. Must be used together with version_major.
-
-Default value: ``undef``
-
-##### `java_se`
-
-Data type: `Any`
-
-Type of Java Standard Edition to install, jdk or jre.
-
-Default value: `'jdk'`
-
-##### `proxy_server`
-
-Data type: `Any`
-
-Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
-
-Default value: ``undef``
-
-##### `proxy_type`
-
-Data type: `Any`
-
-Proxy server type (none|http|https|ftp). (passed to archive)
-
-Default value: ``undef``
-
-##### `url`
+##### <a name="url"></a>`url`

 Data type: `Any`

@@ -284,23 +198,7 @@ Full URL

 Default value: ``undef``

-##### `jce`
-
-Data type: `Any`
-
-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`
+##### <a name="basedir"></a>`basedir`

 Data type: `Any`

@@ -309,16 +207,16 @@ Directory under which the installation will occur. If not set, defaults to

 Default value: ``undef``

-##### `manage_basedir`
+##### <a name="manage_basedir"></a>`manage_basedir`

 Data type: `Any`

 Whether to manage the basedir directory.  Defaults to false.
 Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter.

-Default value: ``false``
+Default value: ``true``

-##### `package_type`
+##### <a name="package_type"></a>`package_type`

 Data type: `Any`

@@ -328,7 +226,7 @@ Optional forced package types: rpm, rpmbin, tar.gz

 Default value: ``undef``

-##### `manage_symlink`
+##### <a name="manage_symlink"></a>`manage_symlink`

 Data type: `Any`

@@ -336,7 +234,7 @@ Whether to manage a symlink that points to the installation directory.  Defaults

 Default value: ``false``

-##### `symlink_name`
+##### <a name="symlink_name"></a>`symlink_name`

 Data type: `Any`

@@ -344,15 +242,31 @@ The name for the optional symlink in the installation directory.

 Default value: ``undef``

-### `java::sap`
+### <a name="javadownload"></a>`java::download`

-Defined Type java::sap
+Defined Type java::download

 #### Parameters

-The following parameters are available in the `java::sap` defined type.
+The following parameters are available in the `java::download` defined type:

-##### `ensure`
+* [`ensure`](#ensure)
+* [`version`](#version)
+* [`version_major`](#version_major)
+* [`version_minor`](#version_minor)
+* [`java_se`](#java_se)
+* [`proxy_server`](#proxy_server)
+* [`proxy_type`](#proxy_type)
+* [`url`](#url)
+* [`jce`](#jce)
+* [`jce_url`](#jce_url)
+* [`basedir`](#basedir)
+* [`manage_basedir`](#manage_basedir)
+* [`package_type`](#package_type)
+* [`manage_symlink`](#manage_symlink)
+* [`symlink_name`](#symlink_name)
+
+##### <a name="ensure"></a>`ensure`

 Data type: `Any`

@@ -360,31 +274,39 @@ Install or remove the package.

 Default value: `'present'`

-##### `version`
+##### <a name="version"></a>`version`

 Data type: `Any`

-Version of Java to install, e.g. '8' or '9'. Default values for full versions will be used.
+Version of Java to install, e.g. '7' or '8'. Default values for major and minor versions will be used.

 Default value: `'8'`

-##### `version_full`
+##### <a name="version_major"></a>`version_major`

 Data type: `Any`

-Major version which should be installed, e.g. '8.1.063' or '11.0.7'. If used, "version" parameter is ignored.
+Major version which should be installed, e.g. '8u101'. Must be used together with version_minor.

 Default value: ``undef``

-##### `java`
+##### <a name="version_minor"></a>`version_minor`

 Data type: `Any`

-Type of Java Edition to install, jdk or jre.
+Minor version which should be installed, e.g. 'b12'. Must be used together with version_major.
+
+Default value: ``undef``
+
+##### <a name="java_se"></a>`java_se`
+
+Data type: `Any`
+
+Type of Java Standard Edition to install, jdk or jre.

 Default value: `'jdk'`

-##### `proxy_server`
+##### <a name="proxy_server"></a>`proxy_server`

 Data type: `Any`

@@ -392,7 +314,7 @@ Specify a proxy server, with port number if needed. ie: https://example.com:8080

 Default value: ``undef``

-##### `proxy_type`
+##### <a name="proxy_type"></a>`proxy_type`

 Data type: `Any`

@@ -400,7 +322,31 @@ Proxy server type (none|http|https|ftp). (passed to archive)

 Default value: ``undef``

-##### `basedir`
+##### <a name="url"></a>`url`
+
+Data type: `Any`
+
+Full URL
+
+Default value: ``undef``
+
+##### <a name="jce"></a>`jce`
+
+Data type: `Any`
+
+Install Oracles Java Cryptographic Extensions into the JRE or JDK
+
+Default value: ``false``
+
+##### <a name="jce_url"></a>`jce_url`
+
+Data type: `Any`
+
+Full URL to the jce zip file
+
+Default value: ``undef``
+
+##### <a name="basedir"></a>`basedir`

 Data type: `Any`

@@ -409,7 +355,118 @@ Directory under which the installation will occur. If not set, defaults to

 Default value: ``undef``

-##### `manage_basedir`
+##### <a name="manage_basedir"></a>`manage_basedir`
+
+Data type: `Any`
+
+Whether to manage the basedir directory.  Defaults to false.
+Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter.
+
+Default value: ``false``
+
+##### <a name="package_type"></a>`package_type`
+
+Data type: `Any`
+
+Type of installation package for specified version of java_se. java_se 6 comes
+in a few installation package flavors and we need to account for them.
+Optional forced package types: rpm, rpmbin, tar.gz
+
+Default value: ``undef``
+
+##### <a name="manage_symlink"></a>`manage_symlink`
+
+Data type: `Any`
+
+Whether to manage a symlink that points to the installation directory.  Defaults to false.
+
+Default value: ``false``
+
+##### <a name="symlink_name"></a>`symlink_name`
+
+Data type: `Any`
+
+The name for the optional symlink in the installation directory.
+
+Default value: ``undef``
+
+### <a name="javasap"></a>`java::sap`
+
+Defined Type java::sap
+
+#### Parameters
+
+The following parameters are available in the `java::sap` defined type:
+
+* [`ensure`](#ensure)
+* [`version`](#version)
+* [`version_full`](#version_full)
+* [`java`](#java)
+* [`proxy_server`](#proxy_server)
+* [`proxy_type`](#proxy_type)
+* [`basedir`](#basedir)
+* [`manage_basedir`](#manage_basedir)
+* [`manage_symlink`](#manage_symlink)
+* [`symlink_name`](#symlink_name)
+
+##### <a name="ensure"></a>`ensure`
+
+Data type: `Any`
+
+Install or remove the package.
+
+Default value: `'present'`
+
+##### <a name="version"></a>`version`
+
+Data type: `Any`
+
+Version of Java to install, e.g. '8' or '9'. Default values for full versions will be used.
+
+Default value: `'8'`
+
+##### <a name="version_full"></a>`version_full`
+
+Data type: `Any`
+
+Major version which should be installed, e.g. '8.1.063' or '11.0.7'. If used, "version" parameter is ignored.
+
+Default value: ``undef``
+
+##### <a name="java"></a>`java`
+
+Data type: `Any`
+
+Type of Java Edition to install, jdk or jre.
+
+Default value: `'jdk'`
+
+##### <a name="proxy_server"></a>`proxy_server`
+
+Data type: `Any`
+
+Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
+
+Default value: ``undef``
+
+##### <a name="proxy_type"></a>`proxy_type`
+
+Data type: `Any`
+
+Proxy server type (none|http|https|ftp). (passed to archive)
+
+Default value: ``undef``
+
+##### <a name="basedir"></a>`basedir`
+
+Data type: `Any`
+
+Directory under which the installation will occur. If not set, defaults to
+/usr/lib/jvm for Debian and /usr/java for RedHat.
+
+Default value: ``undef``
+
+##### <a name="manage_basedir"></a>`manage_basedir`

 Data type: `Any`

@@ -418,7 +475,7 @@ Note: /usr/lib/jvm is managed for Debian by default, separate from this paramete

 Default value: ``true``

-##### `manage_symlink`
+##### <a name="manage_symlink"></a>`manage_symlink`

 Data type: `Any`

@@ -426,7 +483,7 @@ Whether to manage a symlink that points to the installation directory.  Defaults

 Default value: ``false``

-##### `symlink_name`
+##### <a name="symlink_name"></a>`symlink_name`

 Data type: `Any`

--- a/2
+++ b/2
@@ -1,5 +1,6 @@
 # frozen_string_literal: true

+require 'bundler'
 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'
@@ -42,6 +43,7 @@ end

 PuppetLint.configuration.send('disable_relative')

+
 if Bundler.rubygems.find_name('github_changelog_generator').any?
  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
    raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
--- a/lib/facter/java_default_home.rb
+++ b/lib/facter/java_default_home.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Fact: java_default_home
 #
 # Purpose: get absolute path of java system home
@@ -19,7 +21,7 @@ Facter.add(:java_default_home) do
      nil
    else
      java_path = File.realpath(java_bin)
-      java_default_home = if java_path =~ %r{/jre/}
+      java_default_home = if %r{/jre/}.match?(java_path)
                            File.dirname(File.dirname(File.dirname(java_path)))
                          else
                            File.dirname(File.dirname(java_path))
--- a/lib/facter/java_libjvm_path.rb
+++ b/lib/facter/java_libjvm_path.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Fact: java_libjvm_path
 #
 # Purpose: get path to libjvm.so
--- a/lib/facter/java_major_version.rb
+++ b/lib/facter/java_major_version.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Fact: java_major_version
 #
 # Purpose: get Java's major version
--- a/lib/facter/java_patch_level.rb
+++ b/lib/facter/java_patch_level.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Fact: java_patch_level
 #
 # Purpose: get Java's patch level
--- a/lib/facter/java_version.rb
+++ b/lib/facter/java_version.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Fact: java_version
 #
 # Purpose: get full java version string
@@ -21,7 +23,7 @@ Facter.add(:java_version) do
  # Additionally, facter versions prior to 2.0.1 only support
  # positive matches, so this needs to be done manually in setcode.
  setcode do
-    unless ['darwin'].include? Facter.value(:operatingsystem).downcase
+    unless ['darwin'].include? Facter.value(:kernel).downcase
      version = nil
      if Facter::Util::Resolution.which('java')
        Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = Regexp.last_match(1) if %r{^.+ version \"(.+)\"} =~ line }
@@ -32,10 +34,10 @@ Facter.add(:java_version) do
 end

 Facter.add(:java_version) do
-  confine operatingsystem: 'Darwin'
+  confine kernel: 'Darwin'
  has_weight 100
  setcode do
-    unless %r{Unable to find any JVMs matching version} =~ Facter::Util::Resolution.exec('/usr/libexec/java_home --failfast 2>&1')
+    unless Facter::Util::Resolution.exec('/usr/libexec/java_home --failfast 2>&1').include?('Unable to find any JVMs matching version')
      version = nil
      Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = Regexp.last_match(1) if %r{^.+ version \"(.+)\"} =~ line }
      version
--- a/locales/config.yaml
+++ b/locales/config.yaml
@@ -1,26 +0,0 @@
---
-# This is the project-specific configuration file for setting up
-# fast_gettext for your project.
-gettext:
-  # This is used for the name of the .pot and .po files; they will be
-  # called <project_name>.pot?
-  project_name: puppetlabs-java
-  # This is used in comments in the .pot and .po files to indicate what
-  # project the files belong to and should bea little more desctiptive than
-  # <project_name>
-  package_name: puppetlabs-java
-  # The locale that the default messages in the .pot file are in
-  default_locale: en
-  # The email used for sending bug reports.
-  bugs_address: docs@puppet.com
-  # The holder of the copyright.
-  copyright_holder: Puppet, Inc.
-  # This determines which comments in code should be eligible for translation.
-  # Any comments that start with this string will be externalized. (Leave
-  # empty to include all.)
-  comments_tag: TRANSLATOR
-  # Patterns for +Dir.glob+ used to find all files that might contain
-  # translatable content, relative to the project root directory
-  source_files:
-      - './lib/**/*.rb'
-  
--- a/manifests/adopt.pp
+++ b/manifests/adopt.pp
@@ -24,6 +24,9 @@
 # @param proxy_type
 #   Proxy server type (none|http|https|ftp). (passed to archive)
 #
+# @param url
+#   Full URL
+#
 # @param basedir
 #   Directory under which the installation will occur. If not set, defaults to
 #   /usr/lib/jvm for Debian and /usr/java for RedHat.
@@ -51,6 +54,7 @@ define java::adopt (
  $java           = 'jdk',
  $proxy_server   = undef,
  $proxy_type     = undef,
+  $url            = undef,
  $basedir        = undef,
  $manage_basedir = true,
  $package_type   = undef,
@@ -234,7 +238,15 @@ define java::adopt (
    $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}"
+
+  # if complete URL is provided, use this value for source in archive resource
+  if $url {
+    $source = $url
+  }
+  else {
+    $source = "https://github.com/AdoptOpenJDK/openjdk${_version}-binaries/releases/download/${download_folder_prefix}${release_major}${spacer}${release_minor}/${package_name}"
+    notice ("Default source url : ${source}")
+  }

  # full path to the installer
  $destination = "${destination_dir}${package_name}"
--- a/manifests/adoptium.pp
+++ b/manifests/adoptium.pp
@@ -0,0 +1,190 @@
+# Defined Type java::adoptium
+#
+# @summary
+#   Install one or more versions of Adoptium Temurin OpenJDK (former AdoptOpenJDK).
+#
+# @param ensure
+#   Install or remove the package.
+#
+# @param version_major
+#   Major version which should be installed, e.g. '16' or '17'
+#
+# @param version_minor
+#   Minor version which should be installed, e.g. '0'
+#
+# @param version_patch
+#   Minor version which should be installed, e.g. '2'
+#
+# @param version_build
+#   Build version which should be installed, e.g. '07'
+#
+# @param proxy_server
+#   Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
+#
+# @param proxy_type
+#   Proxy server type (none|http|https|ftp). (passed to archive)
+#
+# @param url
+#   Full URL
+#
+# @param basedir
+#   Directory under which the installation will occur. If not set, defaults to
+#   /usr/lib/jvm for Debian and /usr/java for RedHat.
+#
+# @param 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.
+#
+# @param manage_symlink
+#   Whether to manage a symlink that points to the installation directory.  Defaults to false.
+#
+# @param symlink_name
+#   The name for the optional symlink in the installation directory.
+#
+define java::adoptium (
+  $ensure         = 'present',
+  $version_major  = undef,
+  $version_minor  = undef,
+  $version_patch  = undef,
+  $version_build  = undef,
+  $proxy_server   = undef,
+  $proxy_type     = undef,
+  $url            = undef,
+  $basedir        = undef,
+  $manage_basedir = true,
+  $manage_symlink = false,
+  $symlink_name   = undef,
+) {
+
+  # archive module is used to download the java package
+  include ::archive
+
+  $install_path = "jdk-${version_major}.${version_minor}.${version_patch}+${version_build}"
+
+  # determine package type (exe/tar/rpm), destination directory based on OS
+  case $facts['kernel'] {
+    'Linux' : {
+      case $facts['os']['family'] {
+        'RedHat', 'Amazon' : {
+          if $basedir {
+            $_basedir = $basedir
+          } else {
+            $_basedir = '/usr/java'
+          }
+        }
+        'Debian' : {
+          if $basedir {
+            $_basedir = $basedir
+          } else {
+            $_basedir = '/usr/lib/jvm'
+          }
+        }
+        default : {
+          fail ("unsupported platform ${$facts['os']['name']}") }
+      }
+
+      $creates_path = "${_basedir}/${install_path}"
+      $os = 'linux_hotspot'
+    }
+    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/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz
+  # https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_alpine-linux_hotspot_16.0.2_7.tar.gz
+
+  $package_name = "OpenJDK${version_major}U-jdk_${arch}_${os}_${version_major}.${version_minor}.${version_patch}_${version_build}.tar.gz"
+
+  # if complete URL is provided, use this value for source in archive resource
+  if $url {
+    $source = $url
+  }
+  else {
+    $source = "https://github.com/adoptium/temurin${version_major}-binaries/releases/download/jdk-${version_major}.${version_minor}.${version_patch}%2B${version_build}/${package_name}"
+    notice ("Default source url : ${source}")
+  }
+
+  # full path to the installer
+  $destination = "/tmp/${package_name}"
+  notice ("Destination is ${destination}")
+
+  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 Adoptium Temurin java ${version_major} ${version_minor} ${version_patch} ${version_build}"],
+              }
+            }
+          }
+
+          exec { "Install Adoptium Temurin java ${version_major} ${version_minor} ${version_patch} ${version_build}" :
+            path    => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
+            command => "tar -zxf ${destination} -C ${_basedir}",
+            creates => $creates_path,
+            require => $install_requires
+          }
+
+          if ($manage_symlink and $symlink_name) {
+            file { "${_basedir}/${symlink_name}":
+              ensure  => link,
+              target  => $creates_path,
+              require => Exec["Install Adoptium Temurin java ${version_major} ${version_minor} ${version_patch} ${version_build}"],
+            }
+          }
+
+        }
+        default : {
+          fail ("unsupported platform ${$facts['kernel']}")
+        }
+      }
+    }
+    default : {
+      notice ("Action ${ensure} not supported.")
+    }
+  }
+
+}
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -9,7 +9,7 @@ class java::params {
  case $facts['os']['family'] {
    'RedHat': {
      case $facts['os']['name'] {
-        'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC', 'CloudLinux': {
+        'AlmaLinux', 'Rocky', 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC', 'CloudLinux': {
          if (versioncmp($facts['os']['release']['full'], '5.0') < 0) {
            $jdk_package = 'java-1.6.0-sun-devel'
            $jre_package = 'java-1.6.0-sun'
@@ -74,59 +74,7 @@ class java::params {
        default   => $facts['os']['architecture']
      }
      case $facts['os']['release']['major'] {
-        '7', '8', '14.04': {
-          $java =  {
-            'jdk' => {
-              'package'          => 'openjdk-7-jdk',
-              'alternative'      => "java-1.7.0-openjdk-${openjdk_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}/",
-            },
-            'jre' => {
-              'package'          => 'openjdk-7-jre-headless',
-              '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}/",
-            },
-            'oracle-jre' => {
-              'package'          => 'oracle-j2re1.7',
-              'alternative'      => 'j2re1.7-oracle',
-              'alternative_path' => '/usr/lib/jvm/j2re1.7-oracle/bin/java',
-              'java_home'        => '/usr/lib/jvm/j2re1.7-oracle/',
-            },
-            'oracle-jdk' => {
-              'package'          => 'oracle-j2sdk1.7',
-              'alternative'      => 'j2sdk1.7-oracle',
-              'alternative_path' => '/usr/lib/jvm/j2sdk1.7-oracle/jre/bin/java',
-              'java_home'        => '/usr/lib/jvm/j2sdk1.7-oracle/jre/',
-            },
-            'oracle-j2re' => {
-              'package'          => 'oracle-j2re1.8',
-              'alternative'      => 'j2re1.8-oracle',
-              'alternative_path' => '/usr/lib/jvm/j2re1.8-oracle/bin/java',
-              'java_home'        => '/usr/lib/jvm/j2re1.8-oracle/',
-            },
-            'oracle-j2sdk' => {
-              'package'          => 'oracle-j2sdk1.8',
-              'alternative'      => 'j2sdk1.8-oracle',
-              'alternative_path' => '/usr/lib/jvm/j2sdk1.8-oracle/bin/java',
-              'java_home'        => '/usr/lib/jvm/j2sdk1.8-oracle/',
-            },
-            'oracle-java8-jre' => {
-              'package'          => 'oracle-java8-jre',
-              'alternative'      => "jre-8-oracle-${oracle_architecture}",
-              'alternative_path' => "/usr/lib/jvm/jre-8-oracle-${oracle_architecture}/bin/java",
-              'java_home'        => "/usr/lib/jvm/jre-8-oracle-${oracle_architecture}/",
-            },
-            'oracle-java8-jdk' => {
-              'package'          => 'oracle-java8-jdk',
-              'alternative'      => "jdk-8-oracle-${oracle_architecture}",
-              'alternative_path' => "/usr/lib/jvm/jdk-8-oracle-${oracle_architecture}/bin/java",
-              'java_home'        => "/usr/lib/jvm/jdk-8-oracle-${oracle_architecture}/",
-            },
-          }
-        }
-        '9', '15.04', '15.10', '16.04', '16.10', '17.04', '17.10': {
+        '9': {
          $java =  {
            'jdk' => {
              'package'          => 'openjdk-8-jdk',
@@ -142,7 +90,7 @@ class java::params {
            },
          }
        }
-        '10', '18.04', '18.10', '19.04', '19.10', '20.04': {
+        '10', '11', '18.04', '18.10', '19.04', '19.10', '20.04': {
          $java =  {
            'jdk' => {
              'package'          => 'openjdk-11-jdk',
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
  "name": "puppetlabs-java",
-  "version": "6.5.0",
+  "version": "8.0.0",
  "author": "puppetlabs",
  "summary": "Installs the correct Java package on various platforms.",
  "license": "Apache-2.0",
@@ -10,18 +10,17 @@
  "dependencies": [
    {
      "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.1 < 7.0.0"
+      "version_requirement": ">= 4.13.1 < 9.0.0"
    },
    {
      "name": "puppet/archive",
-      "version_requirement": ">= 1.1.0 < 5.0.0"
+      "version_requirement": ">= 1.1.0 < 7.0.0"
    }
  ],
  "operatingsystem_support": [
    {
      "operatingsystem": "RedHat",
      "operatingsystemrelease": [
-        "5",
        "6",
        "7",
        "8"
@@ -30,8 +29,6 @@
    {
      "operatingsystem": "CentOS",
      "operatingsystemrelease": [
-        "5",
-        "6",
        "7",
        "8"
      ]
@@ -52,16 +49,14 @@
    {
      "operatingsystem": "Debian",
      "operatingsystemrelease": [
-        "8",
        "9",
-        "10"
+        "10",
+        "11"
      ]
    },
    {
      "operatingsystem": "Ubuntu",
      "operatingsystemrelease": [
-        "14.04",
-        "16.04",
        "18.04",
        "20.04"
      ]
@@ -69,19 +64,30 @@
    {
      "operatingsystem": "SLES",
      "operatingsystemrelease": [
-        "11",
        "12",
        "15"
      ]
+    },
+    {
+      "operatingsystem": "Rocky",
+      "operatingsystemrelease": [
+        "8"
+      ]
+    },
+    {
+      "operatingsystem": "AlmaLinux",
+      "operatingsystemrelease": [
+        "8"
+      ]
    }
  ],
  "requirements": [
    {
      "name": "puppet",
-      "version_requirement": ">= 5.5.10 < 8.0.0"
+      "version_requirement": ">= 6.0.0 < 8.0.0"
    }
  ],
-  "template-url": "https://github.com/puppetlabs/pdk-templates#main",
-  "template-ref": "heads/main-0-g5afcd3d",
-  "pdk-version": "1.18.1"
+  "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
+  "template-ref": "heads/main-0-gf3911d3",
+  "pdk-version": "2.3.0"
 }
--- a/pdk.yaml
+++ b/pdk.yaml
@@ -0,0 +1,2 @@
+---
+ignore: []
--- a/provision.yaml
+++ b/provision.yaml
@@ -11,20 +11,11 @@ vagrant:
 travis_deb:
  provisioner: docker
  images:
-  - litmusimage/debian:8
  - litmusimage/debian:9
  - litmusimage/debian:10
-travis_ub_5:
-  provisioner: docker
-  images:
-  - litmusimage/ubuntu:14.04
-  - litmusimage/ubuntu:16.04
-  - litmusimage/ubuntu:18.04
 travis_ub_6:
  provisioner: docker
  images:
-  - litmusimage/ubuntu:14.04
-  - litmusimage/ubuntu:16.04
  - litmusimage/ubuntu:18.04
  - litmusimage/ubuntu:20.04
 travis_el7:
@@ -37,27 +28,6 @@ travis_el8:
  provisioner: docker
  images:
  - litmusimage/centos:8
-release_checks_5:
-  provisioner: abs
-  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-12-x86_64
-  - sles-15-x86_64
 release_checks_6:
  provisioner: abs
  images:
@@ -71,11 +41,8 @@ release_checks_6:
  - 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
  - ubuntu-2004-x86_64
  - sles-12-x86_64
--- a/spec/acceptance/install_spec.rb
+++ b/spec/acceptance/install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 require 'pry'

@@ -138,6 +140,27 @@ install_adopt_jdk_jre = <<EOL
  }
 EOL

+# Adoptium
+
+adoptium_enabled = true unless os[:family].casecmp('SLES').zero?
+
+install_adoptium_jdk = <<EOL
+  java::adoptium {
+    'test_adoptium_jdk_version16':
+      version_major => '16',
+      version_minor => '0',
+      version_patch => '2',
+      version_build => '7',
+  }
+  java::adoptium {
+    'test_adoptium_jdk_version17':
+      version_major => '17',
+      version_minor => '0',
+      version_patch => '1',
+      version_build => '12',
+  }
+EOL
+
 sap_enabled = true
 sap_version7 = '7'
 sap_version7_full = '7.1.072'
@@ -187,94 +210,110 @@ install_sap_jdk_jre = <<EOL
  }
 EOL

-context 'installing java jre', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
-  it 'installs jre' do
-    idempotent_apply(java_class_jre)
-  end
-end
-
-context 'installing java jdk', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
-  it 'installs jdk' do
-    idempotent_apply(java_class)
-  end
-end
-
-context 'with failure cases' do
-  it 'fails to install java with a blank version' do
-    apply_manifest(blank_version, expect_failures: true)
+describe 'installing' do
+  context 'installing java jre' do
+    it 'installs jre' do
+      idempotent_apply(java_class_jre)
+    end
  end

-  it 'fails to install java with an incorrect distribution' do
-    apply_manifest(incorrect_distro, expect_failures: true)
+  context 'installing java jdk' do
+    it 'installs jdk' do
+      idempotent_apply(java_class)
+    end
  end

-  it 'fails to install java with a blank distribution' do
-    apply_manifest(blank_distro, expect_failures: true)
+  context 'with failure cases' do
+    it 'fails to install java with a blank version' do
+      apply_manifest(blank_version, expect_failures: true)
+    end
+
+    it 'fails to install java with an incorrect distribution' do
+      apply_manifest(incorrect_distro, expect_failures: true)
+    end
+
+    it 'fails to install java with a blank distribution' do
+      apply_manifest(blank_distro, expect_failures: true)
+    end
+
+    it 'fails to install java with an incorrect package' do
+      apply_manifest(incorrect_package, expect_failures: true)
+    end
+
+    it 'fails on debian or RHEL when passed fake java_alternative and path' do
+      if os[:family] == 'sles'
+        apply_manifest(bogus_alternative, catch_failures: true)
+      else
+        apply_manifest(bogus_alternative, expect_failures: true)
+      end
+    end
  end

-  it 'fails to install java with an incorrect package' do
-    apply_manifest(incorrect_package, expect_failures: true)
+  context 'java::oracle', if: oracle_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 oracle jdk and jre' do
+      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)
+      expect(jre_result.exit_code).to eq(0)
+    end
+
+    it 'installs oracle jdk with jce' do
+      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(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

-  it 'fails on debian or RHEL when passed fake java_alternative and path' do
-    if os[:family] == 'sles'
-      apply_manifest(bogus_alternative, catch_failures: true)
-    else
-      apply_manifest(bogus_alternative, expect_failures: true)
+  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
+
+  context 'java::adoptium', if: adoptium_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_adoptium_jdk)
+    end
+  end
+
+  context 'java::sap', if: sap_enabled && ['Sles'].include?(os[:family]), unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
+    let(:install_path) do
+      (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm'
+    end
+
+    it 'installs adopt jdk and jre' do
+      idempotent_apply(install_sap_jdk_jre)
    end
  end
 end
-
-context 'java::oracle', if: oracle_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 oracle jdk and jre' do
-    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)
-    expect(jre_result.exit_code).to eq(0)
-  end
-
-  it 'installs oracle jdk with jce' do
-    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(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
-
-context 'java::adopt', if: sap_enabled && ['Sles'].include?(os[:family]), unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
-  let(:install_path) do
-    (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm'
-  end
-
-  it 'installs adopt jdk and jre' do
-    idempotent_apply(install_sap_jdk_jre)
-  end
-end
--- a/spec/classes/java_spec.rb
+++ b/spec/classes/java_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'

 describe 'java', type: :class do
@@ -69,36 +71,20 @@ describe 'java', type: :class do
    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) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'trusty' }, release: { major: '14.04' }, architecture: 'amd64' } } }
+  context 'when select jdk for Ubuntu Bionic (18.04)' do
+    let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'bionic' }, release: { major: '18.04' }, architecture: 'amd64' } } }
    let(:params) { { 'distribution' => 'jdk' } }

-    it { is_expected.to contain_package('java').with_name('openjdk-7-jdk') }
-    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64/') }
+    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 Ubuntu Trusty (14.04)' do
-    let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'trusty' }, release: { major: '14.04' }, architecture: 'amd64' } } }
+  context 'when select jre for Ubuntu Bionic (18.04)' do
+    let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'bionic' }, release: { major: '18.04' }, architecture: 'amd64' } } }
    let(:params) { { 'distribution' => 'jre' } }

-    it { is_expected.to contain_package('java').with_name('openjdk-7-jre-headless') }
-    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64/') }
-  end
-
-  context 'when select jdk for Ubuntu xenial (16.04) on ARM' do
-    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') }
-    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-armhf/') }
-  end
-
-  context 'when select jdk for Ubuntu xenial (16.04) on ARM64' do
-    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') }
-    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-arm64/') }
+    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 openjdk for Oracle Linux' do
@@ -172,7 +158,7 @@ describe 'java', type: :class do
  end

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

    context 'when all params provided' do
      let(:params) do
--- a/spec/defines/adopt_spec.rb
+++ b/spec/defines/adopt_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'

 describe 'java::adopt', type: :define do
@@ -176,7 +178,7 @@ describe 'java::adopt', type: :define do
  end

  context 'with Ubuntu 64-bit' do
-    let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '16.04' } } } }
+    let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '18.04' } } } }

    context 'when AdoptOpenJDK Java 8 JDK' do
      let(:params) { { ensure: 'present', version: '8', java: 'jdk' } }
--- a/spec/defines/adoptium_spec.rb
+++ b/spec/defines/adoptium_spec.rb
@@ -0,0 +1,308 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'java::adoptium', 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 manage_symlink is set to true' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '16',
+          version_minor: '0',
+          version_patch: '2',
+          version_build: '7',
+          basedir: '/usr/java',
+          manage_symlink: true,
+          symlink_name: 'java_home',
+        }
+      end
+      let(:title) { 'jdk16_symlink' }
+
+      it { is_expected.to contain_file('/usr/java/java_home') }
+    end
+
+    context 'when manage_symlink is not set' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '16',
+          version_minor: '0',
+          version_patch: '2',
+          version_build: '7',
+          basedir: '/usr/java',
+          symlink_name: 'java_home',
+        }
+      end
+      let(:title) { 'jdk16_nosymlink' }
+
+      it { is_expected.not_to contain_file('/usr/java/java_home') }
+    end
+
+    context 'when Adoptium Temurin Java 16 JDK' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '16',
+          version_minor: '0',
+          version_patch: '2',
+          version_build: '7',
+          basedir: '/usr/java',
+          symlink_name: 'java_home',
+        }
+      end
+      let(:title) { 'jdk16' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz') }
+      it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').with_command('tar -zxf /tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz -C /usr/java') }
+      it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').that_requires('Archive[/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz]') }
+    end
+
+    context 'when Adoptium Temurin Java 17 JDK' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '17',
+          version_minor: '0',
+          version_patch: '1',
+          version_build: '12',
+          basedir: '/usr/java',
+          symlink_name: 'java_home',
+        }
+      end
+      let(:title) { 'jdk17' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz') }
+      it { is_expected.to contain_exec('Install Adoptium Temurin java 17 0 1 12').with_command('tar -zxf /tmp/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz -C /usr/java') }
+      it { is_expected.to contain_exec('Install Adoptium Temurin java 17 0 1 12').that_requires('Archive[/tmp/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz]') }
+    end
+
+    context 'when installing multiple versions' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '16',
+          version_minor: '0',
+          version_patch: '2',
+          version_build: '7',
+        }
+      end
+      let(:title) { 'jdk16' }
+
+      let(:pre_condition) do
+        <<-EOL
+        java::adoptium {
+          'jdk17':
+            ensure        => 'present',
+            version_major => '17',
+            version_minor => '0',
+            version_patch => '1',
+            version_build => '12',
+        }
+        EOL
+      end
+
+      it { is_expected.to compile }
+    end
+
+    context 'when specifying package_type tar.gz and basedir' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '16',
+          version_minor: '0',
+          version_patch: '2',
+          version_build: '7',
+          basedir: '/usr/java',
+        }
+      end
+      let(:title) { 'jdk16' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz') }
+      it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').with_command('tar -zxf /tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz -C /usr/java') }
+      it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').that_requires('Archive[/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz]') }
+    end
+    context 'when manage_basedir is set to true' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '16',
+          version_minor: '0',
+          version_patch: '2',
+          version_build: '7',
+          basedir: '/usr/java',
+          manage_basedir: true,
+        }
+      end
+      let(:title) { 'jdk16' }
+
+      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: '18.04' } } } }
+
+    context 'when Adoptium Temurin Java 16 JDK' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '16',
+          version_minor: '0',
+          version_patch: '2',
+          version_build: '7',
+          symlink_name: 'java_home',
+        }
+      end
+      let(:title) { 'jdk16' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz') }
+      it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').with_command('tar -zxf /tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').that_requires('Archive[/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz]') }
+    end
+
+    context 'when Adoptium Temurin Java 17 JDK' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '17',
+          version_minor: '0',
+          version_patch: '1',
+          version_build: '12',
+          symlink_name: 'java_home',
+        }
+      end
+      let(:title) { 'jdk17' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz') }
+      it { is_expected.to contain_exec('Install Adoptium Temurin java 17 0 1 12').with_command('tar -zxf /tmp/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install Adoptium Temurin java 17 0 1 12').that_requires('Archive[/tmp/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz]') }
+    end
+
+    context 'when installing multiple versions' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '16',
+          version_minor: '0',
+          version_patch: '2',
+          version_build: '7',
+        }
+      end
+      let(:title) { 'jdk16' }
+
+      let(:pre_condition) do
+        <<-EOL
+        java::adoptium {
+          'jdk17':
+            ensure        => 'present',
+            version_major => '17',
+            version_minor => '0',
+            version_patch => '1',
+            version_build => '12',
+        }
+        EOL
+      end
+
+      it { is_expected.to compile }
+    end
+
+    context 'when specifying package_type tar.gz and basedir' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '16',
+          version_minor: '0',
+          version_patch: '2',
+          version_build: '7',
+          basedir: '/usr/lib/jvm',
+        }
+      end
+      let(:title) { 'jdk16' }
+
+      it { is_expected.to contain_archive('/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz') }
+      it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').with_command('tar -zxf /tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz -C /usr/lib/jvm') }
+      it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').that_requires('Archive[/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz]') }
+    end
+    context 'when manage_basedir is set to true' do
+      let(:params) do
+        {
+          ensure: 'present',
+          version_major: '16',
+          version_minor: '0',
+          version_patch: '2',
+          version_build: '7',
+          basedir: '/usr/lib/jvm',
+          manage_basedir: true,
+        }
+      end
+      let(:title) { 'jdk16' }
+
+      it { is_expected.to contain_file('/usr/lib/jvm') }
+    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
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'

 describe 'java::download', type: :define do
@@ -73,7 +75,7 @@ describe 'java::download', type: :define do
  end

  context 'with Ubuntu 64-bit' do
-    let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '16.04' } } } }
+    let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '18.04' } } } }

    context 'when passing URL to url parameter' do
      let(:params) { { ensure: 'present', version_major: '8u201', version_minor: 'b09', java_se: 'jdk', url: url } }
--- a/spec/defines/sap_spec.rb
+++ b/spec/defines/sap_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'

 describe 'java::sap', type: :define do
@@ -123,7 +125,7 @@ describe 'java::sap', type: :define do
  end

  context 'with Ubuntu 64-bit' do
-    let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '16.04' } } } }
+    let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '18.04' } } } }

    context 'when sapjvm 7' do
      let(:params) { { ensure: 'present', version: '7', java: 'jdk' } }
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -48,6 +48,18 @@ RSpec.configure do |c|
  c.after(:suite) do
    RSpec::Puppet::Coverage.report!(0)
  end
+
+  # Filter backtrace noise
+  backtrace_exclusion_patterns = [
+    %r{spec_helper},
+    %r{gems},
+  ]
+
+  if c.respond_to?(:backtrace_exclusion_patterns)
+    c.backtrace_exclusion_patterns = backtrace_exclusion_patterns
+  elsif c.respond_to?(:backtrace_clean_patterns)
+    c.backtrace_clean_patterns = backtrace_exclusion_patterns
+  end
 end

 # Ensures that a module is defined
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 UNSUPPORTED_PLATFORMS = ['darwin', 'windows'].freeze
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if ENV['COVERAGE'] == 'yes'
  require 'simplecov'
  require 'simplecov-console'
--- a/spec/unit/facter/java_default_home_spec.rb
+++ b/spec/unit/facter/java_default_home_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'

 java_7_path = '/usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java'
--- a/spec/unit/facter/java_libjvm_path_spec.rb
+++ b/spec/unit/facter/java_libjvm_path_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'

 describe 'java_libjvm_path' do
--- a/spec/unit/facter/java_major_version_spec.rb
+++ b/spec/unit/facter/java_major_version_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'

 describe 'java_major_version' do
--- a/spec/unit/facter/java_patch_level_spec.rb
+++ b/spec/unit/facter/java_patch_level_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'

 describe 'java_patch_level' do
--- a/spec/unit/facter/java_version_spec.rb
+++ b/spec/unit/facter/java_version_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'

 openjdk_7_output = "Picked up JAVA_TOOL_OPTIONS: -Djava.net.preferIPv4Stack=true\n"\
@@ -30,9 +32,9 @@ describe 'java_version' do
    end
    context 'when on Darwin' do
      before(:each) do
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Darwin')
+        allow(Facter.fact(:kernel)).to receive(:value).and_return('Darwin')
      end
-      let(:facts) { { operatingsystem: 'Darwin' } }
+      let(:facts) { { kernel: 'Darwin' } }

      it do
        expect(Facter::Util::Resolution).to receive(:exec).with('/usr/libexec/java_home --failfast 2>&1').and_return('/Library/Java/JavaVirtualMachines/jdk1.7.0_71.jdk/Contents/Home')
@@ -69,9 +71,9 @@ describe 'java_version' do
    end
    context 'when on Darwin' do
      before(:each) do
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Darwin')
+        allow(Facter.fact(:kernel)).to receive(:value).and_return('Darwin')
      end
-      let(:facts) { { operatingsystem: 'Darwin' } }
+      let(:facts) { { kernel: 'Darwin' } }

      it do
        expect(Facter::Util::Resolution).to receive(:exec).with('/usr/libexec/java_home --failfast 2>&1').at_least(1).and_return('Unable to find any JVMs matching version "(null)".')
Author	SHA1	Message	Date
Lukas Audzevicius	cc3c5401a9	Merge pull request #513 from david22swan/maint/release_prep Release prep v8.0.0	2022-04-05 15:08:51 +01:00
david22swan	8fe60c71be	Release prep v8.0.0	2022-04-05 12:55:54 +01:00
Lukas Audzevicius	452cd836c3	Merge pull request #512 from puppetlabs/pdksync_pdksync-use_pull_request_target pdksync - PDKSYNC Update labeller trigger	2022-04-04 15:31:15 +01:00
Craig Gumbley	8be3cb1e64	"This commit changes the workflow trigger for pull requests to pull_request_target"	2022-04-04 14:09:47 +01:00
Craig Gumbley	a5228d17b5	Merge pull request #507 from david22swan/GH-C&T-7/main/remove_compatible_code	2022-03-30 13:34:26 +01:00
david22swan	367d197278	(GH-C&T-9) Temporarily disable syntax checks	2022-03-30 13:06:41 +01:00
david22swan	d6bccd4097	(GH-C&T-7) Remove code specific to unsupported OSs Removes compatibility for all Debian below 9, all Ubuntu below 18.04	2022-03-30 13:06:41 +01:00
Lukas Audzevicius	dd4eec27d6	Merge pull request #506 from puppetlabs/pdksync_pdksync_add_workflows pdksync - Add labeller and stale GHA workflows	2022-03-25 16:11:18 +00:00
Craig Gumbley	a744c14662	(MAINT) Fixes no new line at EOF	2022-03-25 15:33:44 +00:00
Craig Gumbley	3c030d73d3	(MAINT) Add labeller and stale GHA workflows	2022-03-25 15:12:33 +00:00
Lukas Audzevicius	5eb468d2c2	Merge pull request #505 from puppetlabs/pdksync_GH-iac-334/main/remove_ubuntu_16.04_support pdksync - (GH-iac-334) Remove Support for Ubuntu 14.04/16.04	2022-03-24 10:45:13 +00:00
david22swan	2b2e79ba5d	(GH-iac-334) Remove Support for Ubuntu 14.04	2022-03-23 16:11:57 +00:00
david22swan	a98d0801d7	(GH-iac-334) Remove Support for Ubuntu 16.04	2022-03-23 12:34:20 +00:00
Lukas Audzevicius	ecd0f881c6	Merge pull request #504 from puppetlabs/pdksync_pdksync_heads/main-0-gf3911d3 pdksync - pdksync_heads/main-0-gf3911d3	2022-03-21 16:37:04 +00:00
david22swan	369219732b	pdksync_heads/main-0-gf3911d3	2022-03-16 15:38:40 +00:00
david22swan	d36a0f6f12	Merge pull request #502 from dodevops/modules-11234 (MODULES-11234) Support Adoptium Temurin	2022-03-10 15:22:30 +00:00
Craig Gumbley	44bd9d5a21	Merge pull request #503 from puppetlabs/pdksync_IAC-1787/main/remove_centos_6_support pdksync - (IAC-1787) Remove Support for CentOS 6	2022-02-08 15:54:40 +00:00
22swan	af04d1eba3	(IAC-1787) Remove Support for CentOS 6	2022-02-08 15:22:13 +00:00
Dennis Ploeger	3aac15caa7	(MODULES-11234) Support Adoptium Temurin	2021-12-03 09:39:11 +01:00
daianamezdrea	1e5d620e03	Merge pull request #501 from puppetlabs/release-prep Release prep v7.3.0	2021-10-11 16:28:02 +03:00
GitHub Action	b0b9d9d035	Release prep v7.3.0	2021-10-11 13:24:57 +00:00
david22swan	1388863f4f	pdksync - (IAC-1753) - Add Support for AlmaLinux 8 (#500 ) * (IAC-1752) - Add Support for AlmaLinux 8 * Update params.pp * Fix lint error * Update params.pp Co-authored-by: daianamezdrea <46529728+daianamezdrea@users.noreply.github.com> Co-authored-by: daiana <daiana.mezdrea@yahoo.com>	2021-10-11 15:59:15 +03:00
carabasdaniel	8cad2cd4e4	Merge pull request #499 from puppetlabs/pdksync_IAC-1751/main/add_rocky_8_support pdksync - (IAC-1751) - Add Support for Rocky 8	2021-09-29 15:29:35 +03:00
David Swan	d33cb0f51c	(IAC-1751) - Add Support for Rocky 8	2021-09-28 10:32:52 +01:00
Adrian Iurca	feb38a7b9e	Merge pull request #498 from puppetlabs/pdksync_IAC-1598/main/remove_debian_8_support pdksync - (IAC-1598) - Remove Support for Debian 8	2021-09-23 12:05:54 +03:00
daianamezdrea	f7342bacb7	Merge pull request #497 from puppetlabs/release-prep Release prep v7.2.0	2021-09-20 17:56:47 +03:00
GitHub Action	5b8b12525c	Release prep v7.2.0	2021-09-20 14:21:34 +00:00
daianamezdrea	5531b7b728	Merge pull request #488 from pmjensen/main Enabling Rocky Linux for Install	2021-09-20 17:18:22 +03:00
David Swan	745f0917a7	(IAC-1598) - Remove Support for Debian 8	2021-09-15 13:43:38 +01:00
Tim Meusel	ae3e12ed5e	Merge pull request #493 from smortex/main Allow archive 6.x	2021-09-06 11:11:07 +02:00
Romain Tartière	529a37ca4e	Allow archive 6.x A new major version of the archive module was released which add support for new operating systems and drop support of legacy ones.	2021-08-26 06:47:13 -10:00
david22swan	04cccb09c8	Merge pull request #492 from puppetlabs/release-prep Release prep v7.1.1	2021-08-26 10:18:07 +01:00
GitHub Action	8fdefc4c89	Release prep v7.1.1	2021-08-25 15:43:57 +00:00
daianamezdrea	980cc5cc03	Merge pull request #491 from puppetlabs/IAC-1741/main/stdlib_v8.0.0 (IAC-1741) Allow stdlib v8.0.0	2021-08-25 18:20:32 +03:00
david22swan	8a6d5038bb	(IAC-1741) Allow stdlib v8.0.0	2021-08-25 11:30:09 +01:00
david22swan	541a7dc90a	Merge pull request #490 from puppetlabs/release-prep Release prep v7.1.0	2021-08-12 11:22:15 +01:00
GitHub Action	49ef4596d1	Release prep v7.1.0	2021-08-12 10:19:23 +00:00
daianamezdrea	4cabd802d7	Merge pull request #489 from puppetlabs/pdksync_IAC-1709/main/add_debian_11_support pdksync - (IAC-1709) - Add Support for Debian 11	2021-08-09 12:57:33 +03:00
Adrian Iurca	13acbba4c8	add debian-11 to params.pp	2021-08-09 05:16:13 +03:00
David Swan	e943b8654c	(IAC-1709) - Add Support for Debian 11	2021-08-04 15:42:27 +01:00
Peter Jensen	8817a44d62	Enabling Rocky Linux for Install	2021-07-29 15:57:09 -07:00
Adrian Iurca	a8e68cd210	Merge pull request #487 from puppetlabs/pdksync_iac-1149 pdksync - (maint) - Updating Contribution Guidelines	2021-07-21 13:11:59 +03:00
Paula Muir	4b58529ad5	(maint) Updating CONTRIBUTING guidelines	2021-07-20 15:28:53 +01:00
Michael T Lombardi (He/Him)	358884cbd7	Merge pull request #486 from puppetlabs/pdksync_pdkupdate pdksync - (maint) PDKSync - PDK Update	2021-06-07 10:28:39 -05:00
Daniel Carabas	e9a1c62f0d	(maint) pdksync - PDK Update	2021-06-07 13:07:20 +03:00
daianamezdrea	ee3ac2dbc5	Merge pull request #480 from puppetlabs/pdksync_pdk_update pdksync - (maint) Running pdk update	2021-04-27 14:40:19 +03:00
Paula Muir	c0ce63019e	(maint) Running a pdk update to consume latest pdk-template changes	2021-04-26 21:07:54 +01:00
daianamezdrea	e283a48afc	Merge pull request #478 from puppetlabs/release-prep Release prep v7.0.2	2021-04-26 12:35:25 +03:00
GitHub Action	1c64b30c5d	Release prep v7.0.2	2021-04-26 08:48:51 +00:00
daianamezdrea	01fba18d37	Merge pull request #473 from cbobinec/add-url-parameter Add url parameter for adoptopenjdk	2021-04-26 11:45:58 +03:00
daianamezdrea	bdf8c34b02	Merge pull request #477 from puppetlabs/release-prep Release prep v7.0.1	2021-04-19 11:21:24 +03:00
GitHub Action	c76a66eb7e	Release prep v7.0.1	2021-04-17 03:10:19 +00:00
David Schmitt	312f5469cb	Merge pull request #476 from bastelfreak/archive puppet/archive: allow 5.x	2021-04-16 12:53:58 +01:00
Tim Meusel	69e9ffb19e	puppet/archive: allow 5.x	2021-04-16 13:13:21 +02:00
Disha-maker	2d9ff91e1c	Merge pull request #475 from puppetlabs/pdksync-locales_remove pdksync - (maint) - Remove Locales Folder	2021-04-08 10:26:25 +01:00
David Swan	57c94e86e3	(maint) - Removal of Locales Folder	2021-04-07 15:40:51 +01:00
daianamezdrea	d595362de6	Merge pull request #474 from puppetlabs/pdksync_releaseprepupdate pdksync - PDK Update for auto release prep workflow	2021-04-05 10:58:28 +03:00
Daniel Carabas	56f3f10b1d	PDK Update for release prep workflow	2021-04-02 14:19:37 +03:00
Cédric Bobinec	4e2217986e	update documentation with puppet strings	2021-04-02 12:20:13 +02:00
Cédric Bobinec	7b8c7ba42f	add url parameter for adoptopenjdk	2021-03-23 08:57:37 +01:00
Paula Muir	4fed9edddf	Merge pull request #471 from puppetlabs/pdksync_pdkupdate pdksync - PDK Update - Replace Travis and Appveyor with Github Actions	2021-03-15 20:21:48 +00:00
Daniel Carabas	a83c5a60bc	Replace Travis and Appveyor with Github Actions	2021-03-15 18:45:24 +02:00
carabasdaniel	be4923629a	Merge pull request #470 from puppetlabs/release (maint) Release Merge back PR v7.0.0	2021-03-01 18:19:47 +02:00
sheenaajay	2fe0d5dff4	Merge pull request #469 from carabasdaniel/release_prep_v7.0.0 Release version v7.0.0	2021-03-01 16:08:50 +00:00
Auto-release	4ed5c8b966	Release version 7.0.0	2021-03-01 15:44:13 +00:00
daianamezdrea	be8320eafe	Merge pull request #468 from puppetlabs/pdksync_maint/main/perform_pdk_update pdksync - (MAINT) PDK update for GHA workflows + Litmus updates	2021-02-26 15:25:15 +02:00
Ciaran McCrisken	ee6eb4e4a1	(MAINT) pdk update	2021-02-25 16:14:52 +00:00
Paula Muir	91e86c1d11	Merge pull request #467 from puppetlabs/pdksync_maint/main/deprecate_sles11 pdksync - (MAINT) Remove SLES 11 support	2021-02-24 16:58:46 +00:00
Ciaran McCrisken	f5350ff75b	(MAINT) Remove SLES 11 support	2021-02-24 16:23:56 +00:00
Paula Muir	28599c9752	Merge pull request #466 from puppetlabs/pdksync_maint/main/deprecate_rhel_5_family pdksync - (MAINT) Remove RHEL 5 family support	2021-02-24 15:34:27 +00:00
Ciaran McCrisken	0547a5aef9	(MAINT) Remove RHEL 5 OS family support	2021-02-24 13:56:20 +00:00
Michael T Lombardi (He/Him)	32f4322ec6	Merge pull request #464 from puppetlabs/maint/main/update_dependencies (maint) Update major dependencies prior to release	2021-02-22 19:40:50 -06:00
Paula Muir	8169c6684e	(maint) Update major dependencies prior to release	2021-02-22 16:33:42 +00:00
David Schmitt	0ee1993b19	Merge pull request #463 from puppetlabs/pdksync_remove_puppet5 pdksync - Remove Puppet 5 from testing and bump minimal version to 6.0.0	2021-02-18 09:21:05 +00:00
Paula Muir	2ee840b8fc	Merge pull request #461 from rjd1/main (MODULES-10935) - Switch legacy operatingsystem fact to modern kernel one	2021-02-17 09:21:19 +00:00
Ryan Dill	c3a5d55989	(MODULES-10935) - Update fact used on Darwin in java_version unit test	2021-02-16 20:39:24 -08:00
Daniel Carabas	f48ed2fbe9	Add auto_release.yml to sync.yml	2021-02-16 19:19:04 +02:00
Daniel Carabas	1abf0ac15c	pdk update	2021-02-16 15:36:50 +02:00
Daniel Carabas	0d2dda5590	Update .sync.yml	2021-02-16 09:50:57 +02:00
Daniel Carabas	d871ee97c1	Bump minimal puppet version to 6.0.0 in metadata.json	2021-02-15 17:36:26 +02:00
Daniel Carabas	a78feaa17e	Remove Puppet 5 testing	2021-02-15 17:20:03 +02:00
Ryan Dill	595dc6df93	(MODULES-10935) - Switch legacy operatingsystem fact to modern kernel	2021-02-08 03:28:11 -08:00
daianamezdrea	c03f5a0392	Merge pull request #460 from puppetlabs/pdksync_gha-updates pdksync - Update gha templates	2021-01-27 11:34:29 +02:00
David Schmitt	dcdbec8565	(maint) Update github actions	2021-01-26 17:16:54 +00:00
sheenaajay	a83f32da35	Merge pull request #457 from puppetlabs/pdksync Update to puppet-module-gems 1.0, pdk-templates and new rubocop	2021-01-04 13:24:01 +00:00
daianamezdrea	1a6de8e23f	Merge pull request #459 from puppetlabs/release Release mergeback v6.5.0	2020-12-17 11:21:51 +02:00
Adrian Iurca	57187de011	Merge pull request #458 from daianamezdrea/release Release prep version 6.5.0	2020-12-17 10:23:12 +02:00
David Schmitt	f9d03a10ac	Apply remaining rubocop fixes	2020-12-16 17:36:26 +00:00
David Schmitt	d3c3598349	Add all safe auto corrects	2020-12-16 13:44:18 +00:00
David Schmitt	fdbccc3435	Add the FrozenStrings magic comment	2020-12-16 13:44:14 +00:00
David Schmitt	1dda22762e	Update to pdk-templates and puppet-module-gems 1.0.0	2020-12-16 13:44:06 +00:00