Revert "Revert "Add support for Oracle JDK (#401)" (#421)"

This reverts commit c3ac5dd0ed.

.eslintignore

@@ -1,6 +0,0 @@
-# Ignore list
-/*
-
-# Do not ignore these folders:
-!__tests__/
-!src/

.eslintrc.js

@@ -1,51 +0,0 @@
-// This is a reusable configuration file copied from https://github.com/actions/reusable-workflows/tree/main/reusable-configurations. Please don't make changes to this file as it's the subject of an automatic update.
-module.exports = {
-  extends: [
-    'eslint:recommended',
-    'plugin:@typescript-eslint/recommended',
-    'plugin:eslint-plugin-jest/recommended',
-    'eslint-config-prettier'
-  ],
-  parser: '@typescript-eslint/parser',
-  plugins: ['@typescript-eslint', 'eslint-plugin-node', 'eslint-plugin-jest'],
-  rules: {
-    '@typescript-eslint/no-require-imports': 'error',
-    '@typescript-eslint/no-non-null-assertion': 'off',
-    '@typescript-eslint/no-explicit-any': 'off',
-    '@typescript-eslint/no-empty-function': 'off',
-    '@typescript-eslint/ban-ts-comment': [
-      'error',
-      {
-        'ts-ignore': 'allow-with-description'
-      }
-    ],
-    'no-console': 'error',
-    'yoda': 'error',
-    'prefer-const': [
-      'error',
-      {
-        destructuring: 'all'
-      }
-    ],
-    'no-control-regex': 'off',
-    'no-constant-condition': ['error', {checkLoops: false}],
-    'node/no-extraneous-import': 'error'
-  },
-  overrides: [
-    {
-      files: ['**/*{test,spec}.ts'],
-      rules: {
-        '@typescript-eslint/no-unused-vars': 'off',
-        'jest/no-standalone-expect': 'off',
-        'jest/no-conditional-expect': 'off',
-        'no-console': 'off',
-
-      }
-    }
-  ],
-  env: {
-    node: true,
-    es6: true,
-    'jest/globals': true
-  }
-};

.gitattributes

@@ -1,4 +1,3 @@
-* text=auto eol=lf
 dist/index.js    -diff -merge
 dist/index.js    linguist-generated=true
 .licenses/** -diff linguist-generated=true

.github/workflows/basic-validation.yml

@@ -15,5 +15,3 @@ jobs:
   call-basic-validation:
     name: Basic validation
     uses: actions/reusable-workflows/.github/workflows/basic-validation.yml@main
-    with:
-      node-version: '20.x'

.github/workflows/check-dist.yml

@@ -15,5 +15,3 @@ jobs:
   call-check-dist:
     name: Check dist/
     uses: actions/reusable-workflows/.github/workflows/check-dist.yml@main
-    with:
-      node-version: '20.x'

.github/workflows/codeql-analysis.yml

@@ -2,9 +2,9 @@ name: CodeQL analysis
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   pull_request:
-    branches: [main]
+    branches: [ main ]
   schedule:
     - cron: '0 3 * * 0'
 

.github/workflows/e2e-cache-dependency-path.yml

@@ -1,93 +0,0 @@
-name: Validate cache with cache-dependency-path option
-
-on:
-  push:
-    branches:
-      - main
-      - releases/*
-    paths-ignore:
-      - '**.md'
-  pull_request:
-    paths-ignore:
-      - '**.md'
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  gradle1-save:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Run setup-java with the cache for gradle
-        uses: ./
-        id: setup-java
-        with:
-          distribution: 'adopt'
-          java-version: '11'
-          cache: gradle
-          cache-dependency-path: __tests__/cache/gradle1/*.gradle*
-      - name: Create files to cache
-        # Need to avoid using Gradle daemon to stabilize the save process on Windows
-        # https://github.com/actions/cache/issues/454#issuecomment-840493935
-        run: |
-          gradle downloadDependencies --no-daemon -p __tests__/cache/gradle1
-          if [ ! -d ~/.gradle/caches ]; then
-            echo "::error::The ~/.gradle/caches directory does not exist unexpectedly"
-            exit 1
-          fi
-  gradle1-restore:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-    needs: gradle1-save
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Run setup-java with the cache for gradle
-        uses: ./
-        id: setup-java
-        with:
-          distribution: 'adopt'
-          java-version: '11'
-          cache: gradle
-          cache-dependency-path: __tests__/cache/gradle1/*.gradle*
-      - name: Confirm that ~/.gradle/caches directory has been made
-        run: |
-          if [ ! -d ~/.gradle/caches ]; then
-            echo "::error::The ~/.gradle/caches directory does not exist unexpectedly"
-            exit 1
-          fi
-          ls ~/.gradle/caches/
-  gradle2-restore:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-    needs: gradle1-save
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Run setup-java with the cache for gradle
-        uses: ./
-        id: setup-java
-        with:
-          distribution: 'adopt'
-          java-version: '11'
-          cache: gradle
-          cache-dependency-path: __tests__/cache/gradle2/*.gradle*
-      - name: Confirm that ~/.gradle/caches directory has not been made
-        run: |
-          if [ -d ~/.gradle/caches ]; then
-            echo "::error::The ~/.gradle/caches directory exists unexpectedly"
-            exit 1
-          fi

.github/workflows/e2e-cache.yml

@@ -36,7 +36,7 @@ jobs:
         # Need to avoid using Gradle daemon to stabilize the save process on Windows
         # https://github.com/actions/cache/issues/454#issuecomment-840493935
         run: |
-          gradle downloadDependencies --no-daemon -p __tests__/cache/gradle1
+          gradle downloadDependencies --no-daemon -p __tests__/cache/gradle
           if [ ! -d ~/.gradle/caches ]; then
             echo "::error::The ~/.gradle/caches directory does not exist unexpectedly"
             exit 1
@@ -151,6 +151,7 @@ jobs:
             exit 1
           fi
 
+      
       - name: Check files to cache on ubuntu-latest
         if: matrix.os == 'ubuntu-latest'
         run: |

.github/workflows/e2e-versions.yml

@@ -11,7 +11,7 @@ on:
     paths-ignore:
       - '**.md'
   schedule:
-    - cron: '0 */12 * * *'
+    - cron:  '0 */12 * * *'
   workflow_dispatch:
 jobs:
   setup-java-major-versions:
@@ -21,34 +21,21 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: [
+        distribution: ['temurin', 'adopt', 'adopt-openj9', 'zulu', 'liberica', 'microsoft', 'corretto' ] # internally 'adopt-hotspot' is the same as 'adopt'
-            'temurin',
+        version: ['8', '11', '16']
-            'adopt',
-            'adopt-openj9',
-            'zulu',
-            'liberica',
-            'microsoft',
-            'semeru',
-            'corretto',
-            'dragonwell'
-          ] # internally 'adopt-hotspot' is the same as 'adopt'
-        version: ['8', '11', '17']
         exclude:
-          - distribution: microsoft
+        - distribution: microsoft
-            version: 8
+          version: 8
-          - distribution: dragonwell
-            os: macos-latest
         include:
-          - distribution: oracle
+        - distribution: oracle
-            os: macos-latest
+          os: macos-latest
-            version: 17
+          version: 17
-          - distribution: oracle
+        - distribution: oracle
-            os: windows-latest
+          os: windows-latest
-            version: 20
+          version: 19
-          - distribution: oracle
+        - distribution: oracle
-            os: ubuntu-latest
+          os: ubuntu-latest
-            version: 20
+          version: 19
-
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -72,19 +59,13 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
         distribution: ['temurin', 'zulu', 'liberica']
         version:
-          - '11.0'
+        - '11.0'
-          - '8.0.302'
+        - '8.0.302'
-          - '17.0.7+7'
+        - '16.0.2+7'
         include:
-          - distribution: oracle
+        - distribution: oracle
-            os: ubuntu-latest
+          os: ubuntu-latest
-            version: '20.0.1'
+          version: '19.0.1'
-          - distribution: dragonwell
-            os: ubuntu-latest
-            version: '11.0'
-          - distribution: dragonwell
-            os: ubuntu-latest
-            version: '11.0.13+9'
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -106,10 +87,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['temurin', 'zulu', 'liberica', 'dragonwell']
+        distribution: ['temurin', 'zulu', 'liberica']
-        exclude:
-          - distribution: dragonwell
-            os: macos-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -132,10 +110,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['temurin', 'zulu', 'liberica', 'dragonwell']
+        distribution: ['temurin', 'zulu', 'liberica']
-        exclude:
-          - distribution: dragonwell
-            os: macos-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -216,7 +191,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['temurin', 'zulu', 'liberica', 'semeru']
+        distribution: ['temurin', 'zulu', 'liberica']
         java-package: ['jre']
         version: ['17.0']
         include:
@@ -287,7 +262,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['temurin', 'microsoft', 'corretto']
+        distribution: ['temurin', 'microsoft', 'corretto' ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -312,7 +287,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['temurin', 'zulu', 'liberica', 'microsoft', 'corretto']
+        distribution: ['temurin', 'zulu', 'liberica', 'microsoft', 'corretto' ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -336,7 +311,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['adopt', 'adopt-openj9', 'zulu']
+        distribution: [ 'adopt', 'adopt-openj9', 'zulu' ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -360,7 +335,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['adopt', 'zulu', 'liberica']
+        distribution: ['adopt', 'zulu', 'liberica'  ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.github/workflows/release-new-action-version.yml

@@ -21,9 +21,9 @@ jobs:
       name: releaseNewActionVersion
     runs-on: ubuntu-latest
     steps:
-      - name: Update the ${{ env.TAG_NAME }} tag
+    - name: Update the ${{ env.TAG_NAME }} tag
-        id: update-major-tag
+      id: update-major-tag
-        uses: actions/publish-action@v0.2.2
+      uses: actions/publish-action@v0.2.2
-        with:
+      with:
-          source-tag: ${{ env.TAG_NAME }}
+        source-tag: ${{ env.TAG_NAME }}
-          slack-webhook: ${{ secrets.SLACK_WEBHOOK }}
+        slack-webhook: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/update-config-files.yml

@@ -1,11 +0,0 @@
-name: Update configuration files
-
-on:
-  schedule:
-    - cron: '0 3 * * 0'
-  workflow_dispatch:
-
-jobs:
-  call-update-configuration-files:
-    name: Update configuration files
-    uses: actions/reusable-workflows/.github/workflows/update-config-files.yml@main

.gitignore

@@ -94,6 +94,3 @@ typings/
 # DynamoDB Local files
 .dynamodb/
 .vscode/
-
-# IntelliJ / WebStorm
-/.idea/

.licenses/npm/@actions/cache.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@actions/cache"
-version: 3.2.2
+version: 3.0.4
 type: npm
 summary: Actions cache lib
 homepage: https://github.com/actions/toolkit/tree/main/packages/cache

.licenses/npm/@actions/core.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@actions/core"
-version: 1.10.1
+version: 1.10.0
 type: npm
 summary: Actions core lib
 homepage: https://github.com/actions/toolkit/tree/main/packages/core

.licenses/npm/@actions/exec.dep.yml

@@ -1,20 +1,30 @@
 ---
 name: "@actions/exec"
-version: 1.1.1
+version: 1.0.4
 type: npm
 summary: Actions exec lib
-homepage: https://github.com/actions/toolkit/tree/main/packages/exec
+homepage: https://github.com/actions/toolkit/tree/master/packages/exec
 license: mit
 licenses:
-- sources: LICENSE.md
+- sources: Auto-generated MIT license text
-  text: |-
+  text: |
-    The MIT License (MIT)
+    MIT License
 
-    Copyright 2019 GitHub
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
 
-    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
 
-    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
 notices: []

.licenses/npm/@actions/glob-0.2.0.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@actions/glob"
-version: 0.4.0
+version: 0.2.0
 type: npm
 summary: Actions glob lib
 homepage: https://github.com/actions/toolkit/tree/main/packages/glob

.licenses/npm/@actions/http-client-1.0.11.dep.yml

@@ -0,0 +1,32 @@
+---
+name: "@actions/http-client"
+version: 1.0.11
+type: npm
+summary: Actions Http Client
+homepage: https://github.com/actions/http-client#readme
+license: mit
+licenses:
+- sources: LICENSE
+  text: |
+    Actions Http Client for Node.js
+
+    Copyright (c) GitHub, Inc.
+
+    All rights reserved.
+
+    MIT License
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+    associated documentation files (the "Software"), to deal in the Software without restriction,
+    including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+    subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+    LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+    NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+notices: []

.licenses/npm/@actions/http-client-2.0.1.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@actions/http-client"
-version: 2.2.0
+version: 2.0.1
 type: npm
 summary: Actions Http Client
 homepage: https://github.com/actions/toolkit/tree/main/packages/http-client

.licenses/npm/@actions/io.dep.yml

@@ -1,20 +1,30 @@
 ---
 name: "@actions/io"
-version: 1.1.3
+version: 1.0.2
 type: npm
 summary: Actions io lib
-homepage: https://github.com/actions/toolkit/tree/main/packages/io
+homepage: https://github.com/actions/toolkit/tree/master/packages/io
 license: mit
 licenses:
-- sources: LICENSE.md
+- sources: Auto-generated MIT license text
-  text: |-
+  text: |
-    The MIT License (MIT)
+    MIT License
 
-    Copyright 2019 GitHub
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
 
-    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
 
-    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
 notices: []

.licenses/npm/@actions/tool-cache.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@actions/tool-cache"
-version: 2.0.1
+version: 1.6.1
 type: npm
 summary: Actions tool-cache lib
 homepage: https://github.com/actions/toolkit/tree/main/packages/tool-cache

.licenses/npm/@azure/abort-controller.dep.yml

@@ -1,9 +1,9 @@
 ---
 name: "@azure/abort-controller"
-version: 1.1.0
+version: 1.0.4
 type: npm
 summary: Microsoft Azure SDK for JavaScript - Aborter
-homepage: https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/core/abort-controller/README.md
+homepage: https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/core/abort-controller/README.md
 license: mit
 licenses:
 - sources: LICENSE

.licenses/npm/@azure/core-asynciterator-polyfill.dep.yml

@@ -1,9 +1,9 @@
 ---
-name: "@azure/core-util"
+name: "@azure/core-asynciterator-polyfill"
-version: 1.6.1
+version: 1.0.2
 type: npm
-summary: Core library for shared utility methods
+summary: Polyfill for IE/Node 8 for Symbol.asyncIterator
-homepage: https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/core/core-util/
+homepage: https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/core/core-asynciterator-polyfill/README.md
 license: mit
 licenses:
 - sources: LICENSE

.licenses/npm/@azure/core-auth.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@azure/core-auth"
-version: 1.5.0
+version: 1.3.2
 type: npm
 summary: Provides low-level interfaces and helper methods for authentication in Azure
   SDK

.licenses/npm/@azure/core-http.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@azure/core-http"
-version: 3.0.4
+version: 2.2.4
 type: npm
 summary: Isomorphic client Runtime for Typescript/node.js/browser javascript client
   libraries generated using AutoRest

.licenses/npm/@azure/core-lro.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@azure/core-lro"
-version: 2.5.4
+version: 2.2.4
 type: npm
 summary: Isomorphic client library for supporting long-running operations in node.js
   and browser.

.licenses/npm/@azure/core-paging.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@azure/core-paging"
-version: 1.5.0
+version: 1.2.1
 type: npm
 summary: Core types for paging async iterable iterators
 homepage: https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/core/core-paging/README.md

.licenses/npm/@azure/logger.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@azure/logger"
-version: 1.0.4
+version: 1.0.3
 type: npm
 summary: Microsoft Azure SDK for JavaScript - Logger
 homepage: https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/core/logger/README.md

.licenses/npm/@azure/ms-rest-js.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@azure/ms-rest-js"
-version: 2.7.0
+version: 2.6.1
 type: npm
 summary: Isomorphic client Runtime for Typescript/node.js/browser javascript client
   libraries generated using AutoRest

.licenses/npm/@azure/storage-blob.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@azure/storage-blob"
-version: 12.17.0
+version: 12.9.0
 type: npm
 summary: Microsoft Azure Storage SDK for JavaScript - Blob
 homepage: https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/storage/storage-blob/

.licenses/npm/@fastify/busboy.dep.yml

@@ -1,30 +0,0 @@
----
-name: "@fastify/busboy"
-version: 2.1.0
-type: npm
-summary: A streaming parser for HTML form data for node.js
-homepage:
-license: mit
-licenses:
-- sources: LICENSE
-  text: |-
-    Copyright Brian White. All rights reserved.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to
-    deal in the Software without restriction, including without limitation the
-    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-    sell copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-    IN THE SOFTWARE.
-notices: []

.licenses/npm/@opentelemetry/api.dep.yml

@@ -1,9 +1,9 @@
 ---
 name: "@opentelemetry/api"
-version: 1.7.0
+version: 1.0.4
 type: npm
 summary: Public API for OpenTelemetry
-homepage: https://github.com/open-telemetry/opentelemetry-js/tree/main/api
+homepage: https://github.com/open-telemetry/opentelemetry-js-api#readme
 license: apache-2.0
 licenses:
 - sources: LICENSE
@@ -216,8 +216,10 @@ licenses:
     [opentelemetry-js]: https://github.com/open-telemetry/opentelemetry-js
 
     [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions
-    [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/api/LICENSE
+    [license-url]: https://github.com/open-telemetry/opentelemetry-js-api/blob/main/LICENSE
     [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat
-    [docs-tracing]: https://github.com/open-telemetry/opentelemetry-js/blob/main/doc/tracing.md
+    [npm-url]: https://www.npmjs.com/package/@opentelemetry/api
-    [docs-sdk-registration]: https://github.com/open-telemetry/opentelemetry-js/blob/main/doc/sdk-registration.md
+    [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fapi.svg
+    [docs-tracing]: https://github.com/open-telemetry/opentelemetry-js-api/blob/main/docs/tracing.md
+    [docs-sdk-registration]: https://github.com/open-telemetry/opentelemetry-js-api/blob/main/docs/sdk-registration.md
 notices: []

.licenses/npm/@types/node-14.6.2.dep.yml

@@ -0,0 +1,32 @@
+---
+name: "@types/node"
+version: 14.6.2
+type: npm
+summary: TypeScript definitions for Node.js
+homepage: https://github.com/DefinitelyTyped/DefinitelyTyped#readme
+license: mit
+licenses:
+- sources: LICENSE
+  text: |2
+        MIT License
+
+        Copyright (c) Microsoft Corporation.
+
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE
+notices: []

.licenses/npm/@types/node-16.11.25.dep.yml

@@ -1,8 +1,8 @@
 ---
 name: "@types/node"
-version: 20.9.3
+version: 16.11.25
 type: npm
-summary: TypeScript definitions for node
+summary: TypeScript definitions for Node.js
 homepage: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node
 license: mit
 licenses:

.licenses/npm/@types/node-fetch.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@types/node-fetch"
-version: 2.6.9
+version: 2.6.1
 type: npm
 summary: TypeScript definitions for node-fetch
 homepage: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node-fetch

.licenses/npm/balanced-match.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: balanced-match
-version: 1.0.2
+version: 1.0.0
 type: npm
 summary: Match balanced character pairs, like "{" and "}"
 homepage: https://github.com/juliangruber/balanced-match

.licenses/npm/form-data-3.0.1.dep.yml

@@ -0,0 +1,33 @@
+---
+name: form-data
+version: 3.0.1
+type: npm
+summary: A library to create readable "multipart/form-data" streams. Can be used to
+  submit forms and file uploads to other web applications.
+homepage: https://github.com/form-data/form-data#readme
+license: mit
+licenses:
+- sources: License
+  text: |
+    Copyright (c) 2012 Felix Geisendörfer (felix@debuggable.com) and contributors
+
+     Permission is hereby granted, free of charge, to any person obtaining a copy
+     of this software and associated documentation files (the "Software"), to deal
+     in the Software without restriction, including without limitation the rights
+     to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+     copies of the Software, and to permit persons to whom the Software is
+     furnished to do so, subject to the following conditions:
+
+     The above copyright notice and this permission notice shall be included in
+     all copies or substantial portions of the Software.
+
+     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+     IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+     AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+     THE SOFTWARE.
+- sources: Readme.md
+  text: Form-Data is released under the [MIT](License) license.
+notices: []

.licenses/npm/ip-regex.dep.yml

@@ -1,16 +1,16 @@
 ---
-name: undici
+name: ip-regex
-version: 5.27.2
+version: 2.1.0
 type: npm
-summary: An HTTP/1.1 client, written from scratch for Node.js
+summary: Regular expression for matching IP addresses (IPv4 & IPv6)
-homepage: https://undici.nodejs.org
+homepage: https://github.com/sindresorhus/ip-regex#readme
 license: mit
 licenses:
-- sources: LICENSE
+- sources: license
   text: |
-    MIT License
+    The MIT License (MIT)
 
-    Copyright (c) Matteo Collina and Undici contributors
+    Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -19,16 +19,16 @@ licenses:
     copies of the Software, and to permit persons to whom the Software is
     furnished to do so, subject to the following conditions:
 
-    The above copyright notice and this permission notice shall be included in all
+    The above copyright notice and this permission notice shall be included in
-    copies or substantial portions of the Software.
+    all copies or substantial portions of the Software.
 
     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
     IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
     AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    SOFTWARE.
+    THE SOFTWARE.
-- sources: README.md
+- sources: readme.md
-  text: MIT
+  text: MIT © [Sindre Sorhus](https://sindresorhus.com)
 notices: []

.licenses/npm/mime-db.dep.yml

@@ -1,34 +1,33 @@
 ---
 name: mime-db
-version: 1.52.0
+version: 1.46.0
 type: npm
 summary: Media Type Database
-homepage:
+homepage: https://github.com/jshttp/mime-db#readme
 license: mit
 licenses:
 - sources: LICENSE
-  text: |
+  text: |2
-    (The MIT License)
 
-    Copyright (c) 2014 Jonathan Ong <me@jongleberry.com>
+    The MIT License (MIT)
-    Copyright (c) 2015-2022 Douglas Christopher Wilson <doug@somethingdoug.com>
 
-    Permission is hereby granted, free of charge, to any person obtaining
+    Copyright (c) 2014 Jonathan Ong me@jongleberry.com
-    a copy of this software and associated documentation files (the
-    'Software'), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
 
-    The above copyright notice and this permission notice shall be
+    Permission is hereby granted, free of charge, to any person obtaining a copy
-    included in all copies or substantial portions of the Software.
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
 
-    THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+    The above copyright notice and this permission notice shall be included in
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    all copies or substantial portions of the Software.
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+
-    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
 notices: []

.licenses/npm/mime-types.dep.yml

@@ -1,9 +1,9 @@
 ---
 name: mime-types
-version: 2.1.35
+version: 2.1.29
 type: npm
 summary: The ultimate javascript content-type utility.
-homepage:
+homepage: https://github.com/jshttp/mime-types#readme
 license: mit
 licenses:
 - sources: LICENSE
@@ -36,7 +36,7 @@ licenses:
     [MIT](LICENSE)
 
     [ci-image]: https://badgen.net/github/checks/jshttp/mime-types/master?label=ci
-    [ci-url]: https://github.com/jshttp/mime-types/actions/workflows/ci.yml
+    [ci-url]: https://github.com/jshttp/mime-types/actions?query=workflow%3Aci
     [coveralls-image]: https://badgen.net/coveralls/c/github/jshttp/mime-types/master
     [coveralls-url]: https://coveralls.io/r/jshttp/mime-types?branch=master
     [node-version-image]: https://badgen.net/npm/node/mime-types

.licenses/npm/node-fetch.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: node-fetch
-version: 2.7.0
+version: 2.6.7
 type: npm
 summary: A light-weight module that brings window.fetch to node.js
 homepage: https://github.com/bitinn/node-fetch

.licenses/npm/psl.dep.yml

@@ -0,0 +1,43 @@
+---
+name: psl
+version: 1.8.0
+type: npm
+summary: Domain name parser based on the Public Suffix List
+homepage: https://github.com/lupomontero/psl#readme
+license: mit
+licenses:
+- sources: LICENSE
+  text: |
+    The MIT License (MIT)
+
+    Copyright (c) 2017 Lupo Montero lupomontero@gmail.com
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+- sources: README.md
+  text: |-
+    The MIT License (MIT)
+
+    Copyright (c) 2017 Lupo Montero <lupomontero@gmail.com>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+notices: []

.licenses/npm/punycode.dep.yml

@@ -0,0 +1,34 @@
+---
+name: punycode
+version: 2.1.1
+type: npm
+summary: A robust Punycode converter that fully complies to RFC 3492 and RFC 5891,
+  and works on nearly all JavaScript platforms.
+homepage: https://mths.be/punycode
+license: mit
+licenses:
+- sources: LICENSE-MIT.txt
+  text: |
+    Copyright Mathias Bynens <https://mathiasbynens.be/>
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+- sources: README.md
+  text: Punycode.js is available under the [MIT](https://mths.be/mit) license.
+notices: []

.licenses/npm/sax.dep.yml

@@ -1,16 +1,16 @@
 ---
 name: sax
-version: 1.3.0
+version: 1.2.4
 type: npm
 summary: An evented streaming XML parser in JavaScript
-homepage:
+homepage: https://github.com/isaacs/sax-js#readme
 license: isc
 licenses:
 - sources: LICENSE
   text: |
     The ISC License
 
-    Copyright (c) 2010-2022 Isaac Z. Schlueter and Contributors
+    Copyright (c) Isaac Z. Schlueter and Contributors
 
     Permission to use, copy, modify, and/or distribute this software for any
     purpose with or without fee is hereby granted, provided that the above
@@ -29,7 +29,7 @@ licenses:
     `String.fromCodePoint` by Mathias Bynens used according to terms of MIT
     License, as follows:
 
-    Copyright (c) 2010-2022 Mathias Bynens <https://mathiasbynens.be/>
+        Copyright Mathias Bynens <https://mathiasbynens.be/>
 
         Permission is hereby granted, free of charge, to any person obtaining
         a copy of this software and associated documentation files (the

.licenses/npm/semver-6.3.0.dep.yml

@@ -1,9 +1,9 @@
 ---
 name: semver
-version: 6.3.1
+version: 6.3.0
 type: npm
 summary: The semantic version parser used by npm.
-homepage: 
+homepage: https://github.com/npm/node-semver#readme
 license: isc
 licenses:
 - sources: LICENSE

.licenses/npm/semver-7.3.4.dep.yml

@@ -1,9 +1,9 @@
 ---
 name: semver
-version: 7.5.4
+version: 7.3.4
 type: npm
 summary: The semantic version parser used by npm.
-homepage: 
+homepage: https://github.com/npm/node-semver#readme
 license: isc
 licenses:
 - sources: LICENSE

.licenses/npm/tough-cookie-3.0.1.dep.yml

@@ -0,0 +1,23 @@
+---
+name: tough-cookie
+version: 3.0.1
+type: npm
+summary: RFC6265 Cookies and Cookie Jar for node.js
+homepage: https://github.com/salesforce/tough-cookie
+license: bsd-3-clause
+licenses:
+- sources: LICENSE
+  text: |
+    Copyright (c) 2015, Salesforce.com, Inc.
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+    3. Neither the name of Salesforce.com nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+notices: []

.licenses/npm/tough-cookie-4.0.0.dep.yml

@@ -0,0 +1,23 @@
+---
+name: tough-cookie
+version: 4.0.0
+type: npm
+summary: RFC6265 Cookies and Cookie Jar for node.js
+homepage: https://github.com/salesforce/tough-cookie
+license: bsd-3-clause
+licenses:
+- sources: LICENSE
+  text: |
+    Copyright (c) 2015, Salesforce.com, Inc.
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+    3. Neither the name of Salesforce.com nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+notices: []

.licenses/npm/tslib-2.3.1.dep.yml

@@ -0,0 +1,35 @@
+---
+name: tslib
+version: 2.3.1
+type: npm
+summary: Runtime library for TypeScript helper functions
+homepage: https://www.typescriptlang.org/
+license: 0bsd
+licenses:
+- sources: LICENSE.txt
+  text: |-
+    Copyright (c) Microsoft Corporation.
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose with or without fee is hereby granted.
+
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+    REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+    LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+    OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
+notices:
+- sources: CopyrightNotice.txt
+  text: "/*! *****************************************************************************\r\nCopyright
+    (c) Microsoft Corporation.\r\n\r\nPermission to use, copy, modify, and/or distribute
+    this software for any\r\npurpose with or without fee is hereby granted.\r\n\r\nTHE
+    SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\r\nREGARD
+    TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY\r\nAND FITNESS.
+    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\r\nINDIRECT, OR
+    CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\r\nLOSS OF USE,
+    DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR\r\nOTHER TORTIOUS
+    ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\r\nPERFORMANCE OF THIS
+    SOFTWARE.\r\n*****************************************************************************
+    */"

.licenses/npm/tslib-2.6.2.dep.yml

@@ -1,23 +0,0 @@
----
-name: tslib
-version: 2.6.2
-type: npm
-summary: Runtime library for TypeScript helper functions
-homepage: https://www.typescriptlang.org/
-license: 0bsd
-licenses:
-- sources: LICENSE.txt
-  text: |-
-    Copyright (c) Microsoft Corporation.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose with or without fee is hereby granted.
-
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-    REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-    LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-    OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-notices: []

.licenses/npm/undici-types.dep.yml

@@ -1,30 +0,0 @@
----
-name: undici-types
-version: 5.26.5
-type: npm
-summary: A stand-alone types package for Undici
-homepage: https://undici.nodejs.org
-license: mit
-licenses:
-- sources: Auto-generated MIT license text
-  text: |
-    MIT License
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
-notices: []

.licenses/npm/universalify.dep.yml

@@ -0,0 +1,33 @@
+---
+name: universalify
+version: 0.1.2
+type: npm
+summary: Make a callback- or promise-based function support both promises and callbacks.
+homepage: https://github.com/RyanZim/universalify#readme
+license: mit
+licenses:
+- sources: LICENSE
+  text: |
+    (The MIT License)
+
+    Copyright (c) 2017, Ryan Zimmerman <opensrc@ryanzim.com>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of
+    this software and associated documentation files (the 'Software'), to deal in
+    the Software without restriction, including without limitation the rights to
+    use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+    the Software, and to permit persons to whom the Software is furnished to do so,
+    subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+    FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+    COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+    IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+- sources: README.md
+  text: MIT
+notices: []

.licenses/npm/xml2js.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: xml2js
-version: 0.5.0
+version: 0.4.23
 type: npm
 summary: Simple XML to JavaScript object converter.
 homepage: https://github.com/Leonidas-from-XIV/node-xml2js

.licenses/npm/xmlbuilder2.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: xmlbuilder2
-version: 2.4.1
+version: 2.4.0
 type: npm
 summary: An XML builder for node.js
 homepage: http://github.com/oozcitak/xmlbuilder2

.prettierignore

@@ -1,7 +0,0 @@
-# Ignore list
-/*
-
-# Do not ignore these folders:
-!__tests__/
-!.github/
-!src/

.prettierrc.js

@@ -1,11 +0,0 @@
-// This is a reusable configuration file copied from https://github.com/actions/reusable-workflows/tree/main/reusable-configurations. Please don't make changes to this file as it's the subject of an automatic update.
-module.exports = {
-  printWidth: 80,
-  tabWidth: 2,
-  useTabs: false,
-  semi: true,
-  singleQuote: true,
-  trailingComma: 'none',
-  bracketSpacing: false,
-  arrowParens: 'avoid'
-};

.prettierrc.json

@@ -0,0 +1,11 @@
+{
+  "printWidth": 100,
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "none",
+  "bracketSpacing": true,
+  "arrowParens": "avoid",
+  "parser": "typescript"
+}

README.md

@@ -5,7 +5,7 @@
 [![Validate cache](https://github.com/actions/setup-java/actions/workflows/e2e-cache.yml/badge.svg?branch=main)](https://github.com/actions/setup-java/actions/workflows/e2e-cache.yml)
 
 The `setup-java` action provides the following functionality for GitHub Actions runners:
-- Downloading and setting up a requested version of Java. See [Usage](#usage) for a list of supported distributions.
+- Downloading and setting up a requested version of Java. See [Usage](#Usage) for a list of supported distributions.
 - Extracting and caching custom version of Java from a local file.
 - Configuring runner for publishing using Apache Maven.
 - Configuring runner for publishing using Gradle.
@@ -31,7 +31,7 @@ This action allows you to work with Java and Scala projects.
    
   - `distribution`: _(required)_ Java [distribution](#supported-distributions).
 
-  - `java-package`: The packaging variant of the chosen distribution. Possible values: `jdk`, `jre`, `jdk+fx`, `jre+fx`. Default value: `jdk`.
+  - `java-package`: The packaging variant of the choosen distribution. Possible values: `jdk`, `jre`, `jdk+fx`, `jre+fx`. Default value: `jdk`.
 
   - `architecture`: The target architecture of the package. Possible values: `x86`, `x64`, `armv7`, `aarch64`, `ppc64le`. Default value: Derived from the runner machine.
 
@@ -39,14 +39,12 @@ This action allows you to work with Java and Scala projects.
 
   - `check-latest`: Setting this option makes the action to check for the latest available version for the version spec.
 
-  - `cache`: Quick [setup caching](#caching-packages-dependencies) for the dependencies managed through one of the predefined package managers. It can be one of "maven", "gradle" or "sbt".
+  - `cache`: Quick [setup caching](#caching-packages-dependencies) for the dependencies managed through one of the predifined package managers. It can be one of "maven", "gradle" or "sbt".
-
-  - `cache-dependency-path`: The path to a dependency file: pom.xml, build.gradle, build.sbt, etc. This option can be used with the `cache` option. If this option is omitted, the action searches for the dependency file in the entire repository. This option supports wildcards and a list of file names for caching multiple dependencies.
 
   #### Maven options
   The action has a bunch of inputs to generate maven's [settings.xml](https://maven.apache.org/settings.html) on the fly and pass the values to Apache Maven GPG Plugin as well as Apache Maven Toolchains. See [advanced usage](docs/advanced-usage.md) for more.
 
-  - `overwrite-settings`: By default action overwrites the settings.xml. In order to skip generation of file if it exists, set this to `false`.
+  - `overwrite-settings`: By default action overwrites the settings.xml. In order to skip generation of file if it exists set this to `false`.
 
   - `server-id`: ID of the distributionManagement repository in the pom.xml file. Default is `github`.
 
@@ -58,7 +56,7 @@ This action allows you to work with Java and Scala projects.
 
   - `gpg-private-key`: GPG private key to import. Default is empty string.
 
-  - `gpg-passphrase`: Environment variable name for the GPG private key passphrase. Default is GPG_PASSPHRASE.
+  - `gpg-passphrase`: description: Environment variable name for the GPG private key passphrase. Default is GPG_PASSPHRASE.
 
   - `mvn-toolchain-id`: Name of Maven Toolchain ID if the default name of `${distribution}_${java-version}` is not wanted.
 
@@ -105,24 +103,19 @@ Currently, the following distributions are supported:
 | `liberica` | Liberica JDK | [Link](https://bell-sw.com/) | [Link](https://bell-sw.com/liberica_eula/) |
 | `microsoft` | Microsoft Build of OpenJDK | [Link](https://www.microsoft.com/openjdk) | [Link](https://docs.microsoft.com/java/openjdk/faq)
 | `corretto` | Amazon Corretto Build of OpenJDK | [Link](https://aws.amazon.com/corretto/) | [Link](https://aws.amazon.com/corretto/faqs/)
-| `semeru` | IBM Semeru Runtime Open Edition | [Link](https://developer.ibm.com/languages/java/semeru-runtimes/downloads/) | [Link](https://openjdk.java.net/legal/gplv2+ce.html) |
 | `oracle` | Oracle JDK | [Link](https://www.oracle.com/java/technologies/downloads/) | [Link](https://java.com/freeuselicense)
-| `dragonwell` | Alibaba Dragonwell JDK | [Link](https://dragonwell-jdk.io/) | [Link](https://www.aliyun.com/product/dragonwell/)
 
 **NOTE:** The different distributors can provide discrepant list of available versions / supported configurations. Please refer to the official documentation to see the list of supported versions.
 
-**NOTE:** AdoptOpenJDK got moved to Eclipse Temurin and won't be updated anymore. It is highly recommended to migrate workflows from `adopt` and `adopt-openj9`, to `temurin` and `semeru` respectively, to keep receiving software and security updates. See more details in the [Good-bye AdoptOpenJDK post](https://blog.adoptopenjdk.net/2021/08/goodbye-adoptopenjdk-hello-adoptium/).
+**NOTE:** AdoptOpenJDK got moved to Eclipse Temurin and won't be updated anymore. It is highly recommended to migrate workflows from `adopt` to `temurin` to keep receiving software and security updates. See more details in the [Good-bye AdoptOpenJDK post](https://blog.adoptopenjdk.net/2021/08/goodbye-adoptopenjdk-hello-adoptium/).
 
 **NOTE:** For Azul Zulu OpenJDK architectures x64 and arm64 are mapped to x86 / arm with proper hw_bitness.
 
 ### Caching packages dependencies
-The action has a built-in functionality for caching and restoring dependencies. It uses [toolkit/cache](https://github.com/actions/toolkit/tree/main/packages/cache) under hood for caching dependencies but requires less configuration settings. Supported package managers are gradle, maven and sbt. The format of the used cache key is `setup-java-${{ platform }}-${{ packageManager }}-${{ fileHash }}`, where the hash is based on the following files:
+The action has a built-in functionality for caching and restoring dependencies. It uses [actions/cache](https://github.com/actions/cache) under hood for caching dependencies but requires less configuration settings. Supported package managers are gradle, maven and sbt. The format of the used cache key is `setup-java-${{ platform }}-${{ packageManager }}-${{ fileHash }}`, where the hash is based on the following files:
-
+- gradle: `**/*.gradle*`, `**/gradle-wrapper.properties`, `buildSrc/**/Versions.kt`, `buildSrc/**/Dependencies.kt`, and `gradle/*.versions.toml`
-- gradle: `**/*.gradle*`, `**/gradle-wrapper.properties`, `buildSrc/**/Versions.kt`, `buildSrc/**/Dependencies.kt`, `gradle/*.versions.toml`, and `**/versions.properties`
 - maven: `**/pom.xml`
-- sbt: all sbt build definition files `**/*.sbt`, `**/project/build.properties`, `**/project/**.scala`, `**/project/**.sbt`
+- sbt: all sbt build definition files `**/*.sbt`, `**/project/build.properties`, `**/project/**.{scala,sbt}`
-
-When the option `cache-dependency-path` is specified, the hash is based on the matching file. This option supports wildcards and a list of file names, and is especially useful for monorepos.
 
 The workflow output `cache-hit` is set to indicate if an exact match was found for the key [as actions/cache does](https://github.com/actions/cache/tree/main#outputs).
 
@@ -137,9 +130,6 @@ steps:
     distribution: 'temurin'
     java-version: '17'
     cache: 'gradle'
-    cache-dependency-path: | # optional
-      sub-project/*.gradle*
-      sub-project/**/gradle-wrapper.properties
 - run: ./gradlew build --no-daemon
 ```
 
@@ -152,7 +142,6 @@ steps:
     distribution: 'temurin'
     java-version: '17'
     cache: 'maven'
-    cache-dependency-path: 'sub-project/pom.xml' # optional
 - name: Build with Maven
   run: mvn -B package --file pom.xml
 ```
@@ -166,29 +155,10 @@ steps:
     distribution: 'temurin'
     java-version: '17'
     cache: 'sbt'
-    cache-dependency-path: | # optional
-      sub-project/build.sbt
-      sub-project/project/build.properties
 - name: Build with SBT
   run: sbt package
 ```
 
-#### Cache segment restore timeout
-Usually, cache gets downloaded in multiple segments of fixed sizes. Sometimes, a segment download gets stuck, which causes the workflow job to be stuck. The cache segment download timeout [was introduced](https://github.com/actions/toolkit/tree/main/packages/cache#cache-segment-restore-timeout) to solve this issue as it allows the segment download to get aborted and hence allows the job to proceed with a cache miss. The default value of the cache segment download timeout is set to 10 minutes and can be customized by specifying an environment variable named `SEGMENT_DOWNLOAD_TIMEOUT_MINS` with a timeout value in minutes.
-
-```yaml
-env:
-  SEGMENT_DOWNLOAD_TIMEOUT_MINS: '5'
-steps:
-- uses: actions/checkout@v3
-- uses: actions/setup-java@v3
-  with:
-    distribution: 'temurin'
-    java-version: '17'
-    cache: 'gradle'
-- run: ./gradlew build --no-daemon
-```
-
 ### Check latest
 
 In the basic examples above, the `check-latest` flag defaults to `false`. When set to `false`, the action tries to first resolve a version of Java from the local tool cache on the runner. If unable to find a specific version in the cache, the action will download a version of Java. Use the default or set `check-latest` to `false` if you prefer a faster more consistent setup experience that prioritizes trying to use the cached versions at the expense of newer versions sometimes being available for download.
@@ -255,8 +225,6 @@ In the example above multiple JDKs are installed for the same job. The result af
   - [Liberica](docs/advanced-usage.md#Liberica)
   - [Microsoft](docs/advanced-usage.md#Microsoft)
   - [Amazon Corretto](docs/advanced-usage.md#Amazon-Corretto)
-  - [Oracle](docs/advanced-usage.md#Oracle)
-  - [Alibaba Dragonwell](docs/advanced-usage.md#Alibaba-Dragonwell)
 - [Installing custom Java package type](docs/advanced-usage.md#Installing-custom-Java-package-type)
 - [Installing custom Java architecture](docs/advanced-usage.md#Installing-custom-Java-architecture)
 - [Installing custom Java distribution from local file](docs/advanced-usage.md#Installing-Java-from-local-file)

__tests__/auth.test.ts

@@ -1,11 +1,11 @@
-import * as io from '@actions/io';
+import io = require('@actions/io');
+import fs = require('fs');
+import path = require('path');
 import * as core from '@actions/core';
-import * as fs from 'fs';
-import * as path from 'path';
 import os from 'os';
 
 import * as auth from '../src/auth';
-import {M2_DIR, MVN_SETTINGS_FILE} from '../src/constants';
+import { M2_DIR, MVN_SETTINGS_FILE } from '../src/constants';
 
 const m2Dir = path.join(__dirname, M2_DIR);
 const settingsFile = path.join(m2Dir, MVN_SETTINGS_FILE);
@@ -42,13 +42,7 @@ describe('auth tests', () => {
     const altSettingsFile = path.join(altHome, MVN_SETTINGS_FILE);
     await io.rmRF(altHome); // ensure it doesn't already exist
 
-    await auth.createAuthenticationSettings(
+    await auth.createAuthenticationSettings(id, username, password, altHome, true);
-      id,
-      username,
-      password,
-      altHome,
-      true
-    );
 
     expect(fs.existsSync(m2Dir)).toBe(false);
     expect(fs.existsSync(settingsFile)).toBe(false);
@@ -67,19 +61,11 @@ describe('auth tests', () => {
     const username = 'UNAME';
     const password = 'TOKEN';
 
-    await auth.createAuthenticationSettings(
+    await auth.createAuthenticationSettings(id, username, password, m2Dir, true);
-      id,
-      username,
-      password,
-      m2Dir,
-      true
-    );
 
     expect(fs.existsSync(m2Dir)).toBe(true);
     expect(fs.existsSync(settingsFile)).toBe(true);
-    expect(fs.readFileSync(settingsFile, 'utf-8')).toEqual(
+    expect(fs.readFileSync(settingsFile, 'utf-8')).toEqual(auth.generate(id, username, password));
-      auth.generate(id, username, password)
-    );
   }, 100000);
 
   it('creates settings.xml with additional configuration', async () => {
@@ -88,14 +74,7 @@ describe('auth tests', () => {
     const password = 'TOKEN';
     const gpgPassphrase = 'GPG';
 
-    await auth.createAuthenticationSettings(
+    await auth.createAuthenticationSettings(id, username, password, m2Dir, true, gpgPassphrase);
-      id,
-      username,
-      password,
-      m2Dir,
-      true,
-      gpgPassphrase
-    );
 
     expect(fs.existsSync(m2Dir)).toBe(true);
     expect(fs.existsSync(settingsFile)).toBe(true);
@@ -109,24 +88,16 @@ describe('auth tests', () => {
     const username = 'USERNAME';
     const password = 'PASSWORD';
 
-    fs.mkdirSync(m2Dir, {recursive: true});
+    fs.mkdirSync(m2Dir, { recursive: true });
     fs.writeFileSync(settingsFile, 'FAKE FILE');
     expect(fs.existsSync(m2Dir)).toBe(true);
     expect(fs.existsSync(settingsFile)).toBe(true);
 
-    await auth.createAuthenticationSettings(
+    await auth.createAuthenticationSettings(id, username, password, m2Dir, true);
-      id,
-      username,
-      password,
-      m2Dir,
-      true
-    );
 
     expect(fs.existsSync(m2Dir)).toBe(true);
     expect(fs.existsSync(settingsFile)).toBe(true);
-    expect(fs.readFileSync(settingsFile, 'utf-8')).toEqual(
+    expect(fs.readFileSync(settingsFile, 'utf-8')).toEqual(auth.generate(id, username, password));
-      auth.generate(id, username, password)
-    );
   }, 100000);
 
   it('does not overwrite existing settings.xml files', async () => {
@@ -134,18 +105,12 @@ describe('auth tests', () => {
     const username = 'USERNAME';
     const password = 'PASSWORD';
 
-    fs.mkdirSync(m2Dir, {recursive: true});
+    fs.mkdirSync(m2Dir, { recursive: true });
     fs.writeFileSync(settingsFile, 'FAKE FILE');
     expect(fs.existsSync(m2Dir)).toBe(true);
     expect(fs.existsSync(settingsFile)).toBe(true);
 
-    await auth.createAuthenticationSettings(
+    await auth.createAuthenticationSettings(id, username, password, m2Dir, false);
-      id,
-      username,
-      password,
-      m2Dir,
-      false
-    );
 
     expect(fs.existsSync(m2Dir)).toBe(true);
     expect(fs.existsSync(settingsFile)).toBe(true);
@@ -194,8 +159,6 @@ describe('auth tests', () => {
   </servers>
 </settings>`;
 
-    expect(auth.generate(id, username, password, gpgPassphrase)).toEqual(
+    expect(auth.generate(id, username, password, gpgPassphrase)).toEqual(expectedSettings);
-      expectedSettings
-    );
   });
 });

__tests__/cache.test.ts

@@ -1,12 +1,11 @@
-import {mkdtempSync} from 'fs';
+import { mkdtempSync } from 'fs';
-import {tmpdir} from 'os';
+import { tmpdir } from 'os';
-import {join} from 'path';
+import { join } from 'path';
-import {restore, save} from '../src/cache';
+import { restore, save } from '../src/cache';
 import * as fs from 'fs';
 import * as os from 'os';
 import * as core from '@actions/core';
 import * as cache from '@actions/cache';
-import * as glob from '@actions/glob';
 
 describe('dependency cache', () => {
   const ORIGINAL_RUNNER_OS = process.env['RUNNER_OS'];
@@ -65,30 +64,21 @@ describe('dependency cache', () => {
       ReturnType<typeof cache.restoreCache>,
       Parameters<typeof cache.restoreCache>
     >;
-    let spyGlobHashFiles: jest.SpyInstance<
-      ReturnType<typeof glob.hashFiles>,
-      Parameters<typeof glob.hashFiles>
-    >;
 
     beforeEach(() => {
       spyCacheRestore = jest
         .spyOn(cache, 'restoreCache')
-        .mockImplementation((paths: string[], primaryKey: string) =>
+        .mockImplementation((paths: string[], primaryKey: string) => Promise.resolve(undefined));
-          Promise.resolve(undefined)
-        );
-      spyGlobHashFiles = jest.spyOn(glob, 'hashFiles');
       spyWarning.mockImplementation(() => null);
     });
 
     it('throws error if unsupported package manager specified', () => {
-      return expect(restore('ant', '')).rejects.toThrow(
+      return expect(restore('ant')).rejects.toThrowError('unknown package manager specified: ant');
-        'unknown package manager specified: ant'
-      );
     });
 
     describe('for maven', () => {
       it('throws error if no pom.xml found', async () => {
-        await expect(restore('maven', '')).rejects.toThrow(
+        await expect(restore('maven')).rejects.toThrowError(
           `No file in ${projectRoot(
             workspace
           )} matched to [**/pom.xml], make sure you have checked out the target repository`
@@ -97,160 +87,70 @@ describe('dependency cache', () => {
       it('downloads cache', async () => {
         createFile(join(workspace, 'pom.xml'));
 
-        await restore('maven', '');
+        await restore('maven');
-        expect(spyCacheRestore).toHaveBeenCalled();
+        expect(spyCacheRestore).toBeCalled();
-        expect(spyGlobHashFiles).toHaveBeenCalledWith('**/pom.xml');
+        expect(spyWarning).not.toBeCalled();
-        expect(spyWarning).not.toHaveBeenCalled();
+        expect(spyInfo).toBeCalledWith('maven cache is not found');
-        expect(spyInfo).toHaveBeenCalledWith('maven cache is not found');
       });
     });
     describe('for gradle', () => {
       it('throws error if no build.gradle found', async () => {
-        await expect(restore('gradle', '')).rejects.toThrow(
+        await expect(restore('gradle')).rejects.toThrowError(
           `No file in ${projectRoot(
             workspace
-          )} matched to [**/*.gradle*,**/gradle-wrapper.properties,buildSrc/**/Versions.kt,buildSrc/**/Dependencies.kt,gradle/*.versions.toml,**/versions.properties], make sure you have checked out the target repository`
+          )} matched to [**/*.gradle*,**/gradle-wrapper.properties,buildSrc/**/Versions.kt,buildSrc/**/Dependencies.kt,gradle/*.versions.toml], make sure you have checked out the target repository`
         );
       });
       it('downloads cache based on build.gradle', async () => {
         createFile(join(workspace, 'build.gradle'));
 
-        await restore('gradle', '');
+        await restore('gradle');
-        expect(spyCacheRestore).toHaveBeenCalled();
+        expect(spyCacheRestore).toBeCalled();
-        expect(spyGlobHashFiles).toHaveBeenCalledWith(
+        expect(spyWarning).not.toBeCalled();
-          '**/*.gradle*\n**/gradle-wrapper.properties\nbuildSrc/**/Versions.kt\nbuildSrc/**/Dependencies.kt\ngradle/*.versions.toml\n**/versions.properties'
+        expect(spyInfo).toBeCalledWith('gradle cache is not found');
-        );
-        expect(spyWarning).not.toHaveBeenCalled();
-        expect(spyInfo).toHaveBeenCalledWith('gradle cache is not found');
       });
       it('downloads cache based on build.gradle.kts', async () => {
         createFile(join(workspace, 'build.gradle.kts'));
 
-        await restore('gradle', '');
+        await restore('gradle');
-        expect(spyCacheRestore).toHaveBeenCalled();
+        expect(spyCacheRestore).toBeCalled();
-        expect(spyGlobHashFiles).toHaveBeenCalledWith(
+        expect(spyWarning).not.toBeCalled();
-          '**/*.gradle*\n**/gradle-wrapper.properties\nbuildSrc/**/Versions.kt\nbuildSrc/**/Dependencies.kt\ngradle/*.versions.toml\n**/versions.properties'
+        expect(spyInfo).toBeCalledWith('gradle cache is not found');
-        );
-        expect(spyWarning).not.toHaveBeenCalled();
-        expect(spyInfo).toHaveBeenCalledWith('gradle cache is not found');
       });
       it('downloads cache based on libs.versions.toml', async () => {
         createDirectory(join(workspace, 'gradle'));
         createFile(join(workspace, 'gradle', 'libs.versions.toml'));
 
-        await restore('gradle', '');
+        await restore('gradle');
-        expect(spyCacheRestore).toHaveBeenCalled();
+        expect(spyCacheRestore).toBeCalled();
-        expect(spyGlobHashFiles).toHaveBeenCalledWith(
+        expect(spyWarning).not.toBeCalled();
-          '**/*.gradle*\n**/gradle-wrapper.properties\nbuildSrc/**/Versions.kt\nbuildSrc/**/Dependencies.kt\ngradle/*.versions.toml\n**/versions.properties'
+        expect(spyInfo).toBeCalledWith('gradle cache is not found');
-        );
-        expect(spyWarning).not.toHaveBeenCalled();
-        expect(spyInfo).toHaveBeenCalledWith('gradle cache is not found');
       });
-      it('downloads cache based on buildSrc/Versions.kt', async () => {
+    });
-        createDirectory(join(workspace, 'buildSrc'));
+    it('downloads cache based on buildSrc/Versions.kt', async () => {
-        createFile(join(workspace, 'buildSrc', 'Versions.kt'));
+      createDirectory(join(workspace, 'buildSrc'));
+      createFile(join(workspace, 'buildSrc', 'Versions.kt'));
 
-        await restore('gradle', '');
+      await restore('gradle');
-        expect(spyCacheRestore).toHaveBeenCalled();
+      expect(spyCacheRestore).toBeCalled();
-        expect(spyGlobHashFiles).toHaveBeenCalledWith(
+      expect(spyWarning).not.toBeCalled();
-          '**/*.gradle*\n**/gradle-wrapper.properties\nbuildSrc/**/Versions.kt\nbuildSrc/**/Dependencies.kt\ngradle/*.versions.toml\n**/versions.properties'
+      expect(spyInfo).toBeCalledWith('gradle cache is not found');
-        );
-        expect(spyWarning).not.toHaveBeenCalled();
-        expect(spyInfo).toHaveBeenCalledWith('gradle cache is not found');
-      });
     });
     describe('for sbt', () => {
       it('throws error if no build.sbt found', async () => {
-        await expect(restore('sbt', '')).rejects.toThrow(
+        await expect(restore('sbt')).rejects.toThrowError(
           `No file in ${projectRoot(
             workspace
-          )} matched to [**/*.sbt,**/project/build.properties,**/project/**.scala,**/project/**.sbt], make sure you have checked out the target repository`
+          )} matched to [**/*.sbt,**/project/build.properties,**/project/**.{scala,sbt}], make sure you have checked out the target repository`
         );
       });
       it('downloads cache', async () => {
         createFile(join(workspace, 'build.sbt'));
 
-        await restore('sbt', '');
+        await restore('sbt');
-        expect(spyCacheRestore).toHaveBeenCalled();
+        expect(spyCacheRestore).toBeCalled();
-        expect(spyGlobHashFiles).toHaveBeenCalledWith(
+        expect(spyWarning).not.toBeCalled();
-          '**/*.sbt\n**/project/build.properties\n**/project/**.scala\n**/project/**.sbt'
+        expect(spyInfo).toBeCalledWith('sbt cache is not found');
-        );
-        expect(spyWarning).not.toHaveBeenCalled();
-        expect(spyInfo).toHaveBeenCalledWith('sbt cache is not found');
-      });
-      it('detects scala and sbt changes under **/project/ folder', async () => {
-        createFile(join(workspace, 'build.sbt'));
-        createDirectory(join(workspace, 'project'));
-        createFile(join(workspace, 'project/DependenciesV1.scala'));
-
-        await restore('sbt', '');
-        const firstCall = spySaveState.mock.calls.toString();
-
-        spySaveState.mockClear();
-        await restore('sbt', '');
-        const secondCall = spySaveState.mock.calls.toString();
-
-        // Make sure multiple restores produce the same cache
-        expect(firstCall).toBe(secondCall);
-
-        spySaveState.mockClear();
-        createFile(join(workspace, 'project/DependenciesV2.scala'));
-        await restore('sbt', '');
-        const thirdCall = spySaveState.mock.calls.toString();
-
-        expect(firstCall).not.toBe(thirdCall);
-      });
-    });
-    it('downloads cache based on versions.properties', async () => {
-      createFile(join(workspace, 'versions.properties'));
-
-      await restore('gradle', '');
-      expect(spyCacheRestore).toHaveBeenCalled();
-      expect(spyGlobHashFiles).toHaveBeenCalledWith(
-        '**/*.gradle*\n**/gradle-wrapper.properties\nbuildSrc/**/Versions.kt\nbuildSrc/**/Dependencies.kt\ngradle/*.versions.toml\n**/versions.properties'
-      );
-      expect(spyWarning).not.toHaveBeenCalled();
-      expect(spyInfo).toHaveBeenCalledWith('gradle cache is not found');
-    });
-    describe('cache-dependency-path', () => {
-      it('throws error if no matching dependency file found', async () => {
-        createFile(join(workspace, 'build.gradle.kts'));
-        await expect(
-          restore('gradle', 'sub-project/**/build.gradle.kts')
-        ).rejects.toThrow(
-          `No file in ${projectRoot(
-            workspace
-          )} matched to [sub-project/**/build.gradle.kts], make sure you have checked out the target repository`
-        );
-      });
-      it('downloads cache based on the specified pattern', async () => {
-        createFile(join(workspace, 'build.gradle.kts'));
-        createDirectory(join(workspace, 'sub-project1'));
-        createFile(join(workspace, 'sub-project1', 'build.gradle.kts'));
-        createDirectory(join(workspace, 'sub-project2'));
-        createFile(join(workspace, 'sub-project2', 'build.gradle.kts'));
-
-        await restore('gradle', 'build.gradle.kts');
-        expect(spyCacheRestore).toHaveBeenCalled();
-        expect(spyGlobHashFiles).toHaveBeenCalledWith('build.gradle.kts');
-        expect(spyWarning).not.toHaveBeenCalled();
-        expect(spyInfo).toHaveBeenCalledWith('gradle cache is not found');
-
-        await restore('gradle', 'sub-project1/**/*.gradle*\n');
-        expect(spyCacheRestore).toHaveBeenCalled();
-        expect(spyGlobHashFiles).toHaveBeenCalledWith(
-          'sub-project1/**/*.gradle*'
-        );
-        expect(spyWarning).not.toHaveBeenCalled();
-        expect(spyInfo).toHaveBeenCalledWith('gradle cache is not found');
-
-        await restore('gradle', '*.gradle*\nsub-project2/**/*.gradle*\n');
-        expect(spyCacheRestore).toHaveBeenCalled();
-        expect(spyGlobHashFiles).toHaveBeenCalledWith(
-          '*.gradle*\nsub-project2/**/*.gradle*'
-        );
-        expect(spyWarning).not.toHaveBeenCalled();
-        expect(spyInfo).toHaveBeenCalledWith('gradle cache is not found');
       });
     });
   });
@@ -263,16 +163,12 @@ describe('dependency cache', () => {
     beforeEach(() => {
       spyCacheSave = jest
         .spyOn(cache, 'saveCache')
-        .mockImplementation((paths: string[], key: string) =>
+        .mockImplementation((paths: string[], key: string) => Promise.resolve(0));
-          Promise.resolve(0)
-        );
       spyWarning.mockImplementation(() => null);
     });
 
     it('throws error if unsupported package manager specified', () => {
-      return expect(save('ant')).rejects.toThrow(
+      return expect(save('ant')).rejects.toThrowError('unknown package manager specified: ant');
-        'unknown package manager specified: ant'
-      );
     });
 
     it('save with -1 cacheId , should not fail workflow', async () => {
@@ -280,12 +176,10 @@ describe('dependency cache', () => {
       createStateForMissingBuildFile();
 
       await save('maven');
-      expect(spyCacheSave).toHaveBeenCalled();
+      expect(spyCacheSave).toBeCalled();
-      expect(spyWarning).not.toHaveBeenCalled();
+      expect(spyWarning).not.toBeCalled();
-      expect(spyInfo).toHaveBeenCalled();
+      expect(spyInfo).toBeCalled();
-      expect(spyInfo).toHaveBeenCalledWith(
+      expect(spyInfo).toBeCalledWith(expect.stringMatching(/^Cache saved with the key:.*/));
-        expect.stringMatching(/^Cache saved with the key:.*/)
-      );
     });
 
     it('saves with error from toolkit, should fail workflow', async () => {
@@ -295,37 +189,31 @@ describe('dependency cache', () => {
       createStateForMissingBuildFile();
 
       expect.assertions(1);
-      await expect(save('maven')).rejects.toEqual(
+      await expect(save('maven')).rejects.toEqual(new cache.ValidationError('Validation failed'));
-        new cache.ValidationError('Validation failed')
-      );
     });
 
     describe('for maven', () => {
       it('uploads cache even if no pom.xml found', async () => {
         createStateForMissingBuildFile();
         await save('maven');
-        expect(spyCacheSave).toHaveBeenCalled();
+        expect(spyCacheSave).toBeCalled();
-        expect(spyWarning).not.toHaveBeenCalled();
+        expect(spyWarning).not.toBeCalled();
       });
       it('does not upload cache if no restore run before', async () => {
         createFile(join(workspace, 'pom.xml'));
 
         await save('maven');
-        expect(spyCacheSave).not.toHaveBeenCalled();
+        expect(spyCacheSave).not.toBeCalled();
-        expect(spyWarning).toHaveBeenCalledWith(
+        expect(spyWarning).toBeCalledWith('Error retrieving key from state.');
-          'Error retrieving key from state.'
-        );
       });
       it('uploads cache', async () => {
         createFile(join(workspace, 'pom.xml'));
         createStateForSuccessfulRestore();
 
         await save('maven');
-        expect(spyCacheSave).toHaveBeenCalled();
+        expect(spyCacheSave).toBeCalled();
-        expect(spyWarning).not.toHaveBeenCalled();
+        expect(spyWarning).not.toBeCalled();
-        expect(spyInfo).toHaveBeenCalledWith(
+        expect(spyInfo).toBeCalledWith(expect.stringMatching(/^Cache saved with the key:.*/));
-          expect.stringMatching(/^Cache saved with the key:.*/)
-        );
       });
     });
     describe('for gradle', () => {
@@ -333,39 +221,33 @@ describe('dependency cache', () => {
         createStateForMissingBuildFile();
 
         await save('gradle');
-        expect(spyCacheSave).toHaveBeenCalled();
+        expect(spyCacheSave).toBeCalled();
-        expect(spyWarning).not.toHaveBeenCalled();
+        expect(spyWarning).not.toBeCalled();
       });
       it('does not upload cache if no restore run before', async () => {
         createFile(join(workspace, 'build.gradle'));
 
         await save('gradle');
-        expect(spyCacheSave).not.toHaveBeenCalled();
+        expect(spyCacheSave).not.toBeCalled();
-        expect(spyWarning).toHaveBeenCalledWith(
+        expect(spyWarning).toBeCalledWith('Error retrieving key from state.');
-          'Error retrieving key from state.'
-        );
       });
       it('uploads cache based on build.gradle', async () => {
         createFile(join(workspace, 'build.gradle'));
         createStateForSuccessfulRestore();
 
         await save('gradle');
-        expect(spyCacheSave).toHaveBeenCalled();
+        expect(spyCacheSave).toBeCalled();
-        expect(spyWarning).not.toHaveBeenCalled();
+        expect(spyWarning).not.toBeCalled();
-        expect(spyInfo).toHaveBeenCalledWith(
+        expect(spyInfo).toBeCalledWith(expect.stringMatching(/^Cache saved with the key:.*/));
-          expect.stringMatching(/^Cache saved with the key:.*/)
-        );
       });
       it('uploads cache based on build.gradle.kts', async () => {
         createFile(join(workspace, 'build.gradle.kts'));
         createStateForSuccessfulRestore();
 
         await save('gradle');
-        expect(spyCacheSave).toHaveBeenCalled();
+        expect(spyCacheSave).toBeCalled();
-        expect(spyWarning).not.toHaveBeenCalled();
+        expect(spyWarning).not.toBeCalled();
-        expect(spyInfo).toHaveBeenCalledWith(
+        expect(spyInfo).toBeCalledWith(expect.stringMatching(/^Cache saved with the key:.*/));
-          expect.stringMatching(/^Cache saved with the key:.*/)
-        );
       });
       it('uploads cache based on buildSrc/Versions.kt', async () => {
         createDirectory(join(workspace, 'buildSrc'));
@@ -373,50 +255,33 @@ describe('dependency cache', () => {
         createStateForSuccessfulRestore();
 
         await save('gradle');
-        expect(spyCacheSave).toHaveBeenCalled();
+        expect(spyCacheSave).toBeCalled();
-        expect(spyWarning).not.toHaveBeenCalled();
+        expect(spyWarning).not.toBeCalled();
-        expect(spyInfo).toHaveBeenCalledWith(
+        expect(spyInfo).toBeCalledWith(expect.stringMatching(/^Cache saved with the key:.*/));
-          expect.stringMatching(/^Cache saved with the key:.*/)
-        );
       });
     });
     describe('for sbt', () => {
       it('uploads cache even if no build.sbt found', async () => {
         createStateForMissingBuildFile();
         await save('sbt');
-        expect(spyCacheSave).toHaveBeenCalled();
+        expect(spyCacheSave).toBeCalled();
-        expect(spyWarning).not.toHaveBeenCalled();
+        expect(spyWarning).not.toBeCalled();
       });
       it('does not upload cache if no restore run before', async () => {
         createFile(join(workspace, 'build.sbt'));
 
         await save('sbt');
-        expect(spyCacheSave).not.toHaveBeenCalled();
+        expect(spyCacheSave).not.toBeCalled();
-        expect(spyWarning).toHaveBeenCalledWith(
+        expect(spyWarning).toBeCalledWith('Error retrieving key from state.');
-          'Error retrieving key from state.'
-        );
       });
       it('uploads cache', async () => {
         createFile(join(workspace, 'build.sbt'));
         createStateForSuccessfulRestore();
 
         await save('sbt');
-        expect(spyCacheSave).toHaveBeenCalled();
+        expect(spyCacheSave).toBeCalled();
-        expect(spyWarning).not.toHaveBeenCalled();
+        expect(spyWarning).not.toBeCalled();
-        expect(spyInfo).toHaveBeenCalledWith(
+        expect(spyInfo).toBeCalledWith(expect.stringMatching(/^Cache saved with the key:.*/));
-          expect.stringMatching(/^Cache saved with the key:.*/)
-        );
-      });
-      it('uploads cache based on versions.properties', async () => {
-        createFile(join(workspace, 'versions.properties'));
-        createStateForSuccessfulRestore();
-
-        await save('gradle');
-        expect(spyCacheSave).toHaveBeenCalled();
-        expect(spyWarning).not.toHaveBeenCalled();
-        expect(spyInfo).toHaveBeenCalledWith(
-          expect.stringMatching(/^Cache saved with the key:.*/)
-        );
       });
     });
   });

__tests__/cache/gradle2/.gitignore

@@ -1,12 +0,0 @@
-.gradle
-**/build/
-!src/**/build/
-
-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
-
-# Cache of project
-.gradletasknamecache

__tests__/cache/gradle2/build.gradle

@@ -1,17 +0,0 @@
-plugins {
-    id 'java'
-}
-repositories {
-    mavenCentral()
-}
-dependencies {
-    implementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
-}
-tasks.register('downloadDependencies') {
-    doLast {
-        def total = configurations.compileClasspath.inject (0) { sum, file ->
-            sum + file.length()
-        }
-        println total
-    }
-}

__tests__/cleanup-java.test.ts

@@ -1,4 +1,4 @@
-import {run as cleanup} from '../src/cleanup-java';
+import { run as cleanup } from '../src/cleanup-java';
 import * as core from '@actions/core';
 import * as cache from '@actions/cache';
 import * as util from '../src/util';
@@ -38,8 +38,8 @@ describe('cleanup', () => {
       return name === 'cache' ? 'gradle' : '';
     });
     await cleanup();
-    expect(spyCacheSave).toHaveBeenCalled();
+    expect(spyCacheSave).toBeCalled();
-    expect(spyWarning).not.toHaveBeenCalled();
+    expect(spyWarning).not.toBeCalled();
   });
 
   it('does not fail even though the save process throws error', async () => {
@@ -50,7 +50,7 @@ describe('cleanup', () => {
       return name === 'cache' ? 'gradle' : '';
     });
     await cleanup();
-    expect(spyCacheSave).toHaveBeenCalled();
+    expect(spyCacheSave).toBeCalled();
   });
 });
 

__tests__/data/microsoft.json

@@ -1,255 +0,0 @@
-[
-    {
-      "version": "21.0.0",
-      "stable": true,
-      "release_url": "https://aka.ms/download-jdk",
-      "files": [
-        {
-          "filename": "microsoft-jdk-21.0.0-macos-x64.tar.gz",
-          "arch": "x64",
-          "platform": "darwin",
-          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.0-macos-x64.tar.gz"
-        },
-        {
-          "filename": "microsoft-jdk-21.0.0-linux-x64.tar.gz",
-          "arch": "x64",
-          "platform": "linux",
-          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.0-linux-x64.tar.gz"
-        },
-        {
-          "filename": "microsoft-jdk-21.0.0-windows-x64.zip",
-          "arch": "x64",
-          "platform": "win32",
-          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.0-windows-x64.zip"
-        },
-        {
-          "filename": "microsoft-jdk-21.0.0-macos-aarch64.tar.gz",
-          "arch": "aarch64",
-          "platform": "darwin",
-          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.0-macos-aarch64.tar.gz"
-        },
-        {
-          "filename": "microsoft-jdk-21.0.0-linux-aarch64.tar.gz",
-          "arch": "aarch64",
-          "platform": "linux",
-          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.0-linux-aarch64.tar.gz"
-        }
-      ]
-    },
-    {
-        "version": "17.0.7",
-        "stable": true,
-        "release_url": "https://aka.ms/download-jdk",
-        "files": [
-          {
-            "filename": "microsoft-jdk-17.0.7-macos-x64.tar.gz",
-            "arch": "x64",
-            "platform": "darwin",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.7-macos-x64.tar.gz"
-          },
-          {
-            "filename": "microsoft-jdk-17.0.7-linux-x64.tar.gz",
-            "arch": "x64",
-            "platform": "linux",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.7-linux-x64.tar.gz"
-          },
-          {
-            "filename": "microsoft-jdk-17.0.7-windows-x64.zip",
-            "arch": "x64",
-            "platform": "win32",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.7-windows-x64.zip"
-          },
-          {
-            "filename": "microsoft-jdk-17.0.7-macos-aarch64.tar.gz",
-            "arch": "aarch64",
-            "platform": "darwin",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.7-macos-aarch64.tar.gz"
-          },
-          {
-            "filename": "microsoft-jdk-17.0.7-linux-aarch64.tar.gz",
-            "arch": "aarch64",
-            "platform": "linux",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.7-linux-aarch64.tar.gz"
-          }
-        ]
-    },
-    {
-        "version": "17.0.1+12.1",
-        "stable": true,
-        "release_url": "https://aka.ms/download-jdk",
-        "files": [
-          {
-            "filename": "microsoft-jdk-17.0.1.12.1-macos-x64.tar.gz",
-            "arch": "x64",
-            "platform": "darwin",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.1.12.1-macos-x64.tar.gz"
-          },
-          {
-            "filename": "microsoft-jdk-17.0.1.12.1-linux-x64.tar.gz",
-            "arch": "x64",
-            "platform": "linux",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.1.12.1-linux-x64.tar.gz"
-          },
-          {
-            "filename": "microsoft-jdk-17.0.1.12.1-windows-x64.zip",
-            "arch": "x64",
-            "platform": "win32",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.1.12.1-windows-x64.zip"
-          },
-          {
-            "filename": "microsoft-jdk-17.0.1.12.1-macos-aarch64.tar.gz",
-            "arch": "aarch64",
-            "platform": "darwin",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.1.12.1-macos-aarch64.tar.gz"
-          },
-          {
-            "filename": "microsoft-jdk-17.0.1.12.1-linux-aarch64.tar.gz",
-            "arch": "aarch64",
-            "platform": "linux",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.1.12.1-linux-aarch64.tar.gz"
-          }
-        ]
-    },
-    {
-        "version": "16.0.2+7.1",
-        "stable": true,
-        "release_url": "https://aka.ms/download-jdk",
-        "files": [
-          {
-            "filename": "microsoft-jdk-16.0.2.7.1-macos-x64.tar.gz",
-            "arch": "x64",
-            "platform": "darwin",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-16.0.2.7.1-macos-x64.tar.gz"
-          },
-          {
-            "filename": "microsoft-jdk-16.0.2.7.1-linux-x64.tar.gz",
-            "arch": "x64",
-            "platform": "linux",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-16.0.2.7.1-linux-x64.tar.gz"
-          },
-          {
-            "filename": "microsoft-jdk-16.0.2.7.1-windows-x64.zip",
-            "arch": "x64",
-            "platform": "win32",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-16.0.2.7.1-windows-x64.zip"
-          },
-          {
-            "filename": "microsoft-jdk-16.0.2.7.1-macos-aarch64.tar.gz",
-            "arch": "aarch64",
-            "platform": "darwin",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-16.0.2.7.1-macos-aarch64.tar.gz"
-          },
-          {
-            "filename": "microsoft-jdk-16.0.2.7.1-linux-aarch64.tar.gz",
-            "arch": "aarch64",
-            "platform": "linux",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-16.0.2.7.1-linux-aarch64.tar.gz"
-          }
-        ]
-    },
-    {
-        "version": "11.0.19",
-        "stable": true,
-        "release_url": "https://aka.ms/download-jdk",
-        "files": [
-          {
-            "filename": "microsoft-jdk-11.0.19-macos-x64.tar.gz",
-            "arch": "x64",
-            "platform": "darwin",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-11.0.19-macos-x64.tar.gz"
-          },
-          {
-            "filename": "microsoft-jdk-11.0.19-linux-x64.tar.gz",
-            "arch": "x64",
-            "platform": "linux",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-11.0.19-linux-x64.tar.gz"
-          },
-          {
-            "filename": "microsoft-jdk-11.0.19-windows-x64.zip",
-            "arch": "x64",
-            "platform": "win32",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-11.0.19-windows-x64.zip"
-          },
-          {
-            "filename": "microsoft-jdk-11.0.19-macos-aarch64.tar.gz",
-            "arch": "aarch64",
-            "platform": "darwin",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-11.0.19-macos-aarch64.tar.gz"
-          },
-          {
-            "filename": "microsoft-jdk-11.0.19-linux-aarch64.tar.gz",
-            "arch": "aarch64",
-            "platform": "linux",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-11.0.19-linux-aarch64.tar.gz"
-          }
-        ]
-    },
-    {
-        "version": "11.0.15",
-        "stable": true,
-        "release_url": "https://aka.ms/download-jdk",
-        "files": [
-          {
-            "filename": "microsoft-jdk-11.0.15-macos-x64.tar.gz",
-            "arch": "x64",
-            "platform": "darwin",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-11.0.15-macos-x64.tar.gz"
-          },
-          {
-            "filename": "microsoft-jdk-11.0.15-linux-x64.tar.gz",
-            "arch": "x64",
-            "platform": "linux",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-11.0.15-linux-x64.tar.gz"
-          },
-          {
-            "filename": "microsoft-jdk-11.0.15-windows-x64.zip",
-            "arch": "x64",
-            "platform": "win32",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-11.0.15-windows-x64.zip"
-          },
-          {
-            "filename": "microsoft-jdk-11.0.15-macos-aarch64.tar.gz",
-            "arch": "aarch64",
-            "platform": "darwin",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-11.0.15-macos-aarch64.tar.gz"
-          },
-          {
-            "filename": "microsoft-jdk-11.0.15-linux-aarch64.tar.gz",
-            "arch": "aarch64",
-            "platform": "linux",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-11.0.15-linux-aarch64.tar.gz"
-          }
-        ]
-    },
-    {
-        "version": "11.0.13+8.1",
-        "stable": true,
-        "release_url": "https://aka.ms/download-jdk",
-        "files": [
-          {
-            "filename": "microsoft-jdk-11.0.13.8.1-macos-x64.tar.gz",
-            "arch": "x64",
-            "platform": "darwin",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-macos-x64.tar.gz"
-          },
-          {
-            "filename": "microsoft-jdk-11.0.13.8.1-linux-x64.tar.gz",
-            "arch": "x64",
-            "platform": "linux",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-linux-x64.tar.gz"
-          },
-          {
-            "filename": "microsoft-jdk-11.0.13.8.1-windows-x64.zip",
-            "arch": "x64",
-            "platform": "win32",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-x64.zip"
-          },
-          {
-            "filename": "microsoft-jdk-11.0.13.8.1-linux-aarch64.tar.gz",
-            "arch": "aarch64",
-            "platform": "linux",
-            "download_url": "https://aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-linux-aarch64.tar.gz"
-          }
-        ]
-    }
-]

__tests__/distributors/adopt-installer.test.ts

@@ -1,14 +1,11 @@
-import {HttpClient} from '@actions/http-client';
+import { HttpClient } from '@actions/http-client';
-import {IAdoptAvailableVersions} from '../../src/distributions/adopt/models';
+
-import {
+import { AdoptDistribution, AdoptImplementation } from '../../src/distributions/adopt/installer';
-  AdoptDistribution,
+import { JavaInstallerOptions } from '../../src/distributions/base-models';
-  AdoptImplementation
-} from '../../src/distributions/adopt/installer';
-import {JavaInstallerOptions} from '../../src/distributions/base-models';
 
 import os from 'os';
 
-import manifestData from '../data/adopt.json';
+let manifestData = require('../data/adopt.json') as [];
 
 describe('getAvailableVersions', () => {
   let spyHttpClient: jest.SpyInstance;
@@ -30,82 +27,42 @@ describe('getAvailableVersions', () => {
 
   it.each([
     [
-      {
+      { version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '11',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       AdoptImplementation.Hotspot,
       'os=mac&architecture=x64&image_type=jdk&release_type=ga&jvm_impl=hotspot&page_size=20&page=0'
     ],
     [
-      {
+      { version: '11', architecture: 'x86', packageType: 'jdk', checkLatest: false },
-        version: '11',
-        architecture: 'x86',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       AdoptImplementation.Hotspot,
       'os=mac&architecture=x86&image_type=jdk&release_type=ga&jvm_impl=hotspot&page_size=20&page=0'
     ],
     [
-      {
+      { version: '11', architecture: 'x64', packageType: 'jre', checkLatest: false },
-        version: '11',
-        architecture: 'x64',
-        packageType: 'jre',
-        checkLatest: false
-      },
       AdoptImplementation.Hotspot,
       'os=mac&architecture=x64&image_type=jre&release_type=ga&jvm_impl=hotspot&page_size=20&page=0'
     ],
     [
-      {
+      { version: '11-ea', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '11-ea',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       AdoptImplementation.Hotspot,
       'os=mac&architecture=x64&image_type=jdk&release_type=ea&jvm_impl=hotspot&page_size=20&page=0'
     ],
     [
-      {
+      { version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '11',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       AdoptImplementation.OpenJ9,
       'os=mac&architecture=x64&image_type=jdk&release_type=ga&jvm_impl=openj9&page_size=20&page=0'
     ],
     [
-      {
+      { version: '11', architecture: 'x86', packageType: 'jdk', checkLatest: false },
-        version: '11',
-        architecture: 'x86',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       AdoptImplementation.OpenJ9,
       'os=mac&architecture=x86&image_type=jdk&release_type=ga&jvm_impl=openj9&page_size=20&page=0'
     ],
     [
-      {
+      { version: '11', architecture: 'x64', packageType: 'jre', checkLatest: false },
-        version: '11',
-        architecture: 'x64',
-        packageType: 'jre',
-        checkLatest: false
-      },
       AdoptImplementation.OpenJ9,
       'os=mac&architecture=x64&image_type=jre&release_type=ga&jvm_impl=openj9&page_size=20&page=0'
     ],
     [
-      {
+      { version: '11-ea', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '11-ea',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       AdoptImplementation.OpenJ9,
       'os=mac&architecture=x64&image_type=jdk&release_type=ea&jvm_impl=openj9&page_size=20&page=0'
     ]
@@ -117,8 +74,7 @@ describe('getAvailableVersions', () => {
       expectedParameters
     ) => {
       const distribution = new AdoptDistribution(installerOptions, impl);
-      const baseUrl =
+      const baseUrl = 'https://api.adoptopenjdk.net/v3/assets/version/%5B1.0,100.0%5D';
-        'https://api.adoptopenjdk.net/v3/assets/version/%5B1.0,100.0%5D';
       const expectedUrl = `${baseUrl}?project=jdk&vendor=adoptopenjdk&heap_size=normal&sort_method=DEFAULT&sort_order=DESC&${expectedParameters}`;
       distribution['getPlatformOption'] = () => 'mac';
 
@@ -135,12 +91,12 @@ describe('getAvailableVersions', () => {
       .mockReturnValueOnce({
         statusCode: 200,
         headers: {},
-        result: manifestData as any
+        result: manifestData
       })
       .mockReturnValueOnce({
         statusCode: 200,
         headers: {},
-        result: manifestData as any
+        result: manifestData
       })
       .mockReturnValueOnce({
         statusCode: 200,
@@ -149,12 +105,7 @@ describe('getAvailableVersions', () => {
       });
 
     const distribution = new AdoptDistribution(
-      {
+      { version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '11',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       AdoptImplementation.Hotspot
     );
     const availableVersions = await distribution['getAvailableVersions']();
@@ -171,12 +122,7 @@ describe('getAvailableVersions', () => {
     'find right toolchain folder',
     (impl: AdoptImplementation, packageType: string, expected: string) => {
       const distribution = new AdoptDistribution(
-        {
+        { version: '11', architecture: 'x64', packageType: packageType, checkLatest: false },
-          version: '11',
-          architecture: 'x64',
-          packageType: packageType,
-          checkLatest: false
-        },
         impl
       );
 
@@ -202,12 +148,8 @@ describe('getAvailableVersions', () => {
 
       const expectedParameters = `os=mac&architecture=${distroArch}&image_type=jdk&release_type=ga&jvm_impl=hotspot&page_size=20&page=0`;
 
-      const distribution = new AdoptDistribution(
+      const distribution = new AdoptDistribution(installerOptions, AdoptImplementation.Hotspot);
-        installerOptions,
+      const baseUrl = 'https://api.adoptopenjdk.net/v3/assets/version/%5B1.0,100.0%5D';
-        AdoptImplementation.Hotspot
-      );
-      const baseUrl =
-        'https://api.adoptopenjdk.net/v3/assets/version/%5B1.0,100.0%5D';
       const expectedUrl = `${baseUrl}?project=jdk&vendor=adoptopenjdk&heap_size=normal&sort_method=DEFAULT&sort_order=DESC&${expectedParameters}`;
       distribution['getPlatformOption'] = () => 'mac';
 
@@ -234,63 +176,43 @@ describe('findPackageForDownload', () => {
     ['15.0.1+9.1', '15.0.1+9.1']
   ])('version is resolved correctly %s -> %s', async (input, expected) => {
     const distribution = new AdoptDistribution(
-      {
+      { version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '11',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       AdoptImplementation.Hotspot
     );
-    distribution['getAvailableVersions'] = async () => manifestData as any;
+    distribution['getAvailableVersions'] = async () => manifestData;
     const resolvedVersion = await distribution['findPackageForDownload'](input);
     expect(resolvedVersion.version).toBe(expected);
   });
 
   it('version is found but binaries list is empty', async () => {
     const distribution = new AdoptDistribution(
-      {
+      { version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '11',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       AdoptImplementation.Hotspot
     );
-    distribution['getAvailableVersions'] = async () => manifestData as any;
+    distribution['getAvailableVersions'] = async () => manifestData;
-    await expect(
+    await expect(distribution['findPackageForDownload']('9.0.8')).rejects.toThrowError(
-      distribution['findPackageForDownload']('9.0.8')
+      /Could not find satisfied version for SemVer */
-    ).rejects.toThrow(/Could not find satisfied version for SemVer */);
+    );
   });
 
   it('version is not found', async () => {
     const distribution = new AdoptDistribution(
-      {
+      { version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '11',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       AdoptImplementation.Hotspot
     );
-    distribution['getAvailableVersions'] = async () => manifestData as any;
+    distribution['getAvailableVersions'] = async () => manifestData;
-    await expect(distribution['findPackageForDownload']('7.x')).rejects.toThrow(
+    await expect(distribution['findPackageForDownload']('7.x')).rejects.toThrowError(
       /Could not find satisfied version for SemVer */
     );
   });
 
   it('version list is empty', async () => {
     const distribution = new AdoptDistribution(
-      {
+      { version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '11',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       AdoptImplementation.Hotspot
     );
     distribution['getAvailableVersions'] = async () => [];
-    await expect(distribution['findPackageForDownload']('11')).rejects.toThrow(
+    await expect(distribution['findPackageForDownload']('11')).rejects.toThrowError(
       /Could not find satisfied version for SemVer */
     );
   });

__tests__/distributors/base-installer.test.ts

@@ -5,7 +5,7 @@ import * as util from '../../src/util';
 import path from 'path';
 import * as semver from 'semver';
 
-import {JavaBase} from '../../src/distributions/base-installer';
+import { JavaBase } from '../../src/distributions/base-installer';
 import {
   JavaDownloadRelease,
   JavaInstallerOptions,
@@ -19,23 +19,14 @@ class EmptyJavaBase extends JavaBase {
     super('Empty', installerOptions);
   }
 
-  protected async downloadTool(
+  protected async downloadTool(javaRelease: JavaDownloadRelease): Promise<JavaInstallerResults> {
-    javaRelease: JavaDownloadRelease
-  ): Promise<JavaInstallerResults> {
     return {
       version: '11.0.9',
-      path: path.join(
+      path: path.join('toolcache', this.toolcacheFolderName, '11.0.9', this.architecture)
-        'toolcache',
-        this.toolcacheFolderName,
-        '11.0.9',
-        this.architecture
-      )
     };
   }
 
-  protected async findPackageForDownload(
+  protected async findPackageForDownload(range: string): Promise<JavaDownloadRelease> {
-    range: string
-  ): Promise<JavaDownloadRelease> {
     const availableVersion = '11.0.9';
     if (!semver.satisfies(availableVersion, range)) {
       throw new Error('Available version not found');
@@ -69,111 +60,44 @@ describe('findInToolcache', () => {
 
   it.each([
     [
-      {
+      { version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '11',
+      { version: actualJavaVersion, path: javaPath }
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
-      {version: actualJavaVersion, path: javaPath}
     ],
     [
-      {
+      { version: '11.0', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '11.0',
+      { version: actualJavaVersion, path: javaPath }
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
-      {version: actualJavaVersion, path: javaPath}
     ],
     [
-      {
+      { version: '11.0.8', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '11.0.8',
+      { version: actualJavaVersion, path: javaPath }
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
-      {version: actualJavaVersion, path: javaPath}
     ],
     [
-      {
+      { version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: true },
-        version: '11',
+      { version: actualJavaVersion, path: javaPath }
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: true
-      },
-      {version: actualJavaVersion, path: javaPath}
     ],
     [
-      {
+      { version: '11.0', architecture: 'x64', packageType: 'jdk', checkLatest: true },
-        version: '11.0',
+      { version: actualJavaVersion, path: javaPath }
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: true
-      },
-      {version: actualJavaVersion, path: javaPath}
     ],
     [
-      {
+      { version: '11.0.8', architecture: 'x64', packageType: 'jdk', checkLatest: true },
-        version: '11.0.8',
+      { version: actualJavaVersion, path: javaPath }
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: true
-      },
-      {version: actualJavaVersion, path: javaPath}
     ],
-    [
+    [{ version: '11', architecture: 'x64', packageType: 'jre', checkLatest: false }, null],
-      {
+    [{ version: '8', architecture: 'x64', packageType: 'jdk', checkLatest: false }, null],
-        version: '11',
+    [{ version: '11', architecture: 'x86', packageType: 'jdk', checkLatest: false }, null],
-        architecture: 'x64',
+    [{ version: '11', architecture: 'x86', packageType: 'jre', checkLatest: false }, null]
-        packageType: 'jre',
-        checkLatest: false
-      },
-      null
-    ],
-    [
-      {
-        version: '8',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
-      null
-    ],
-    [
-      {
-        version: '11',
-        architecture: 'x86',
-        packageType: 'jdk',
-        checkLatest: false
-      },
-      null
-    ],
-    [
-      {
-        version: '11',
-        architecture: 'x86',
-        packageType: 'jre',
-        checkLatest: false
-      },
-      null
-    ]
   ])(`should find java for path %s -> %s`, (input, expected) => {
     spyTcFindAllVersions.mockReturnValue([actualJavaVersion]);
     spyGetToolcachePath.mockImplementation(
       (toolname: string, javaVersion: string, architecture: string) => {
         const semverVersion = new semver.Range(javaVersion);
 
-        if (
+        if (path.basename(javaPath) !== architecture || !javaPath.includes(toolname)) {
-          path.basename(javaPath) !== architecture ||
-          !javaPath.includes(toolname)
-        ) {
           return '';
         }
 
-        return semver.satisfies(actualJavaVersion, semverVersion)
+        return semver.satisfies(actualJavaVersion, semverVersion) ? javaPath : '';
-          ? javaPath
-          : '';
       }
     );
     mockJavaBase = new EmptyJavaBase(input);
@@ -181,63 +105,52 @@ describe('findInToolcache', () => {
   });
 
   it.each([
-    ['11', {version: '11.0.3+2', versionInPath: '11.0.3-2'}],
+    ['11', { version: '11.0.3+2', versionInPath: '11.0.3-2' }],
-    ['11.0', {version: '11.0.3+2', versionInPath: '11.0.3-2'}],
+    ['11.0', { version: '11.0.3+2', versionInPath: '11.0.3-2' }],
-    ['11.0.1', {version: '11.0.1', versionInPath: '11.0.1'}],
+    ['11.0.1', { version: '11.0.1', versionInPath: '11.0.1' }],
-    ['11.0.3', {version: '11.0.3+2', versionInPath: '11.0.3-2'}],
+    ['11.0.3', { version: '11.0.3+2', versionInPath: '11.0.3-2' }],
-    ['15', {version: '15.0.2+4', versionInPath: '15.0.2-4'}],
+    ['15', { version: '15.0.2+4', versionInPath: '15.0.2-4' }],
-    ['x', {version: '15.0.2+4', versionInPath: '15.0.2-4'}],
+    ['x', { version: '15.0.2+4', versionInPath: '15.0.2-4' }],
-    ['x-ea', {version: '17.4.4', versionInPath: '17.4.4-ea'}],
+    ['x-ea', { version: '17.4.4', versionInPath: '17.4.4-ea' }],
-    [
+    ['11-ea', { version: '11.3.3+5.2.1231421', versionInPath: '11.3.3-ea.5.2.1231421' }],
-      '11-ea',
+    ['11.2-ea', { version: '11.2.1', versionInPath: '11.2.1-ea' }],
-      {version: '11.3.3+5.2.1231421', versionInPath: '11.3.3-ea.5.2.1231421'}
+    ['11.2.1-ea', { version: '11.2.1', versionInPath: '11.2.1-ea' }]
-    ],
+  ])('should choose correct java from tool-cache for input %s', (input, expected) => {
-    ['11.2-ea', {version: '11.2.1', versionInPath: '11.2.1-ea'}],
+    spyTcFindAllVersions.mockReturnValue([
-    ['11.2.1-ea', {version: '11.2.1', versionInPath: '11.2.1-ea'}]
+      '17.4.4-ea',
-  ])(
+      '11.0.2',
-    'should choose correct java from tool-cache for input %s',
+      '15.0.2-4',
-    (input, expected) => {
+      '11.0.3-2',
-      spyTcFindAllVersions.mockReturnValue([
+      '11.2.1-ea',
-        '17.4.4-ea',
+      '11.3.2-ea',
-        '11.0.2',
+      '11.3.2-ea.5',
-        '15.0.2-4',
+      '11.3.3-ea.5.2.1231421',
-        '11.0.3-2',
+      '12.3.2-0',
-        '11.2.1-ea',
+      '11.0.1'
-        '11.3.2-ea',
+    ]);
-        '11.3.2-ea.5',
+    spyGetToolcachePath.mockImplementation(
-        '11.3.3-ea.5.2.1231421',
+      (toolname: string, javaVersion: string, architecture: string) =>
-        '12.3.2-0',
+        `/hostedtoolcache/${toolname}/${javaVersion}/${architecture}`
-        '11.0.1'
+    );
-      ]);
+    mockJavaBase = new EmptyJavaBase({
-      spyGetToolcachePath.mockImplementation(
+      version: input,
-        (toolname: string, javaVersion: string, architecture: string) =>
+      architecture: 'x64',
-          `/hostedtoolcache/${toolname}/${javaVersion}/${architecture}`
+      packageType: 'jdk',
-      );
+      checkLatest: false
-      mockJavaBase = new EmptyJavaBase({
+    });
-        version: input,
+    const foundVersion = mockJavaBase['findInToolcache']();
-        architecture: 'x64',
+    expect(foundVersion).toEqual({
-        packageType: 'jdk',
+      version: expected.version,
-        checkLatest: false
+      path: `/hostedtoolcache/Java_Empty_jdk/${expected.versionInPath}/x64`
-      });
+    });
-      const foundVersion = mockJavaBase['findInToolcache']();
+  });
-      expect(foundVersion).toEqual({
-        version: expected.version,
-        path: `/hostedtoolcache/Java_Empty_jdk/${expected.versionInPath}/x64`
-      });
-    }
-  );
 });
 
 describe('setupJava', () => {
   const actualJavaVersion = '11.0.9';
   const installedJavaVersion = '11.0.8';
   const javaPath = path.join('Java_Empty_jdk', installedJavaVersion, 'x86');
-  const javaPathInstalled = path.join(
+  const javaPathInstalled = path.join('toolcache', 'Java_Empty_jdk', actualJavaVersion, 'x86');
-    'toolcache',
-    'Java_Empty_jdk',
-    actualJavaVersion,
-    'x86'
-  );
 
   let mockJavaBase: EmptyJavaBase;
 
@@ -255,16 +168,11 @@ describe('setupJava', () => {
       (toolname: string, javaVersion: string, architecture: string) => {
         const semverVersion = new semver.Range(javaVersion);
 
-        if (
+        if (path.basename(javaPath) !== architecture || !javaPath.includes(toolname)) {
-          path.basename(javaPath) !== architecture ||
-          !javaPath.includes(toolname)
-        ) {
           return '';
         }
 
-        return semver.satisfies(installedJavaVersion, semverVersion)
+        return semver.satisfies(installedJavaVersion, semverVersion) ? javaPath : '';
-          ? javaPath
-          : '';
       }
     );
 
@@ -298,46 +206,27 @@ describe('setupJava', () => {
 
   it.each([
     [
-      {
+      { version: '11', architecture: 'x86', packageType: 'jdk', checkLatest: false },
-        version: '11',
+      { version: installedJavaVersion, path: javaPath }
-        architecture: 'x86',
-        packageType: 'jdk',
-        checkLatest: false
-      },
-      {version: installedJavaVersion, path: javaPath}
     ],
     [
-      {
+      { version: '11.0', architecture: 'x86', packageType: 'jdk', checkLatest: false },
-        version: '11.0',
+      { version: installedJavaVersion, path: javaPath }
-        architecture: 'x86',
-        packageType: 'jdk',
-        checkLatest: false
-      },
-      {version: installedJavaVersion, path: javaPath}
     ],
     [
-      {
+      { version: '11.0.8', architecture: 'x86', packageType: 'jdk', checkLatest: false },
-        version: '11.0.8',
+      { version: installedJavaVersion, path: javaPath }
-        architecture: 'x86',
-        packageType: 'jdk',
-        checkLatest: false
-      },
-      {version: installedJavaVersion, path: javaPath}
     ],
     [
-      {version: '11', architecture: '', packageType: 'jdk', checkLatest: false},
+      { version: '11', architecture: '', packageType: 'jdk', checkLatest: false },
-      {version: installedJavaVersion, path: javaPath}
+      { version: installedJavaVersion, path: javaPath }
     ]
-  ])('should find java locally for %s', async (input, expected) => {
+  ])('should find java locally for %s', (input, expected) => {
     mockJavaBase = new EmptyJavaBase(input);
-    await expect(mockJavaBase.setupJava()).resolves.toEqual(expected);
+    expect(mockJavaBase.setupJava()).resolves.toEqual(expected);
     expect(spyGetToolcachePath).toHaveBeenCalled();
-    expect(spyCoreInfo).toHaveBeenCalledWith(
+    expect(spyCoreInfo).toHaveBeenCalledWith(`Resolved Java ${expected.version} from tool-cache`);
-      `Resolved Java ${expected.version} from tool-cache`
+    expect(spyCoreInfo).toHaveBeenCalledWith(`Setting Java ${expected.version} as the default`);
-    );
-    expect(spyCoreInfo).toHaveBeenCalledWith(
-      `Setting Java ${expected.version} as the default`
-    );
     expect(spyCoreInfo).not.toHaveBeenCalledWith(
       'Trying to resolve the latest version from remote'
     );
@@ -346,47 +235,20 @@ describe('setupJava', () => {
 
   it.each([
     [
-      {
+      { version: '11', architecture: 'x86', packageType: 'jre', checkLatest: false },
-        version: '11',
+      { path: path.join('toolcache', 'Java_Empty_jre', '11.0.9', 'x86'), version: '11.0.9' }
-        architecture: 'x86',
-        packageType: 'jre',
-        checkLatest: false
-      },
-      {
-        path: path.join('toolcache', 'Java_Empty_jre', '11.0.9', 'x86'),
-        version: '11.0.9'
-      }
     ],
     [
-      {
+      { version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '11',
+      { path: path.join('toolcache', 'Java_Empty_jdk', '11.0.9', 'x64'), version: '11.0.9' }
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
-      {
-        path: path.join('toolcache', 'Java_Empty_jdk', '11.0.9', 'x64'),
-        version: '11.0.9'
-      }
     ],
     [
-      {
+      { version: '11', architecture: 'x64', packageType: 'jre', checkLatest: false },
-        version: '11',
+      { path: path.join('toolcache', 'Java_Empty_jre', '11.0.9', 'x64'), version: '11.0.9' }
-        architecture: 'x64',
-        packageType: 'jre',
-        checkLatest: false
-      },
-      {
-        path: path.join('toolcache', 'Java_Empty_jre', '11.0.9', 'x64'),
-        version: '11.0.9'
-      }
     ],
     [
-      {version: '11', architecture: '', packageType: 'jre', checkLatest: false},
+      { version: '11', architecture: '', packageType: 'jre', checkLatest: false },
-      {
+      { path: path.join('toolcache', 'Java_Empty_jre', '11.0.9', 'x86'), version: '11.0.9' }
-        path: path.join('toolcache', 'Java_Empty_jre', '11.0.9', 'x86'),
-        version: '11.0.9'
-      }
     ]
   ])('download java with configuration %s', async (input, expected) => {
     mockJavaBase = new EmptyJavaBase(input);
@@ -395,176 +257,93 @@ describe('setupJava', () => {
     expect(spyCoreAddPath).toHaveBeenCalled();
     expect(spyCoreExportVariable).toHaveBeenCalled();
     expect(spyCoreExportVariable).toHaveBeenCalledWith(
-      `JAVA_HOME_${input.version}_${(
+      `JAVA_HOME_${input.version}_${(input.architecture || 'x86').toLocaleUpperCase()}`,
-        input.architecture || 'x86'
-      ).toLocaleUpperCase()}`,
       expected.path
     );
     expect(spyCoreSetOutput).toHaveBeenCalled();
-    expect(spyCoreInfo).toHaveBeenCalledWith(
+    expect(spyCoreInfo).toHaveBeenCalledWith('Trying to resolve the latest version from remote');
-      'Trying to resolve the latest version from remote'
+    expect(spyCoreInfo).toHaveBeenCalledWith(`Resolved latest version as ${expected.version}`);
-    );
-    expect(spyCoreInfo).toHaveBeenCalledWith(
-      `Resolved latest version as ${expected.version}`
-    );
     expect(spyCoreInfo).toHaveBeenCalledWith('Trying to download...');
-    expect(spyCoreInfo).toHaveBeenCalledWith(
+    expect(spyCoreInfo).toHaveBeenCalledWith(`Java ${expected.version} was downloaded`);
-      `Java ${expected.version} was downloaded`
+    expect(spyCoreInfo).toHaveBeenCalledWith(`Setting Java ${expected.version} as the default`);
-    );
-    expect(spyCoreInfo).toHaveBeenCalledWith(
-      `Setting Java ${expected.version} as the default`
-    );
   });
 
   it.each([
     [
-      {
+      { version: '11.0.9', architecture: 'x86', packageType: 'jdk', checkLatest: true },
-        version: '11.0.9',
+      { version: '11.0.9', path: javaPathInstalled }
-        architecture: 'x86',
-        packageType: 'jdk',
-        checkLatest: true
-      },
-      {version: '11.0.9', path: javaPathInstalled}
     ],
     [
-      {
+      { version: '11.0.9', architecture: '', packageType: 'jdk', checkLatest: true },
-        version: '11.0.9',
+      { version: '11.0.9', path: javaPathInstalled }
-        architecture: '',
-        packageType: 'jdk',
-        checkLatest: true
-      },
-      {version: '11.0.9', path: javaPathInstalled}
     ]
-  ])(
+  ])('should check the latest java version for %s and resolve locally', async (input, expected) => {
-    'should check the latest java version for %s and resolve locally',
+    mockJavaBase = new EmptyJavaBase(input);
-    async (input, expected) => {
+    mockJavaBase['findInToolcache'] = () => ({ version: '11.0.9', path: expected.path });
-      mockJavaBase = new EmptyJavaBase(input);
+    await expect(mockJavaBase.setupJava()).resolves.toEqual(expected);
-      mockJavaBase['findInToolcache'] = () => ({
+    expect(spyCoreInfo).toHaveBeenCalledWith('Trying to resolve the latest version from remote');
-        version: '11.0.9',
+    expect(spyCoreInfo).toHaveBeenCalledWith(`Resolved latest version as ${expected.version}`);
-        path: expected.path
+    expect(spyCoreInfo).toHaveBeenCalledWith(`Resolved Java ${expected.version} from tool-cache`);
-      });
+    expect(spyCoreInfo).toHaveBeenCalledWith(`Setting Java ${expected.version} as the default`);
-      await expect(mockJavaBase.setupJava()).resolves.toEqual(expected);
+  });
-      expect(spyCoreInfo).toHaveBeenCalledWith(
-        'Trying to resolve the latest version from remote'
-      );
-      expect(spyCoreInfo).toHaveBeenCalledWith(
-        `Resolved latest version as ${expected.version}`
-      );
-      expect(spyCoreInfo).toHaveBeenCalledWith(
-        `Resolved Java ${expected.version} from tool-cache`
-      );
-      expect(spyCoreInfo).toHaveBeenCalledWith(
-        `Setting Java ${expected.version} as the default`
-      );
-    }
-  );
 
   it.each([
     [
-      {
+      { version: '11', architecture: 'x86', packageType: 'jdk', checkLatest: true },
-        version: '11',
+      { version: actualJavaVersion, path: javaPathInstalled }
-        architecture: 'x86',
-        packageType: 'jdk',
-        checkLatest: true
-      },
-      {version: actualJavaVersion, path: javaPathInstalled}
     ],
     [
-      {
+      { version: '11.0', architecture: 'x86', packageType: 'jdk', checkLatest: true },
-        version: '11.0',
+      { version: actualJavaVersion, path: javaPathInstalled }
-        architecture: 'x86',
-        packageType: 'jdk',
-        checkLatest: true
-      },
-      {version: actualJavaVersion, path: javaPathInstalled}
     ],
     [
-      {
+      { version: '11.0.x', architecture: 'x86', packageType: 'jdk', checkLatest: true },
-        version: '11.0.x',
+      { version: actualJavaVersion, path: javaPathInstalled }
-        architecture: 'x86',
-        packageType: 'jdk',
-        checkLatest: true
-      },
-      {version: actualJavaVersion, path: javaPathInstalled}
     ],
     [
-      {version: '11', architecture: '', packageType: 'jdk', checkLatest: true},
+      { version: '11', architecture: '', packageType: 'jdk', checkLatest: true },
-      {version: actualJavaVersion, path: javaPathInstalled}
+      { version: actualJavaVersion, path: javaPathInstalled }
     ]
-  ])(
+  ])('should check the latest java version for %s and download', async (input, expected) => {
-    'should check the latest java version for %s and download',
+    mockJavaBase = new EmptyJavaBase(input);
-    async (input, expected) => {
+    await expect(mockJavaBase.setupJava()).resolves.toEqual(expected);
-      mockJavaBase = new EmptyJavaBase(input);
+    expect(spyGetToolcachePath).toHaveBeenCalled();
-      await expect(mockJavaBase.setupJava()).resolves.toEqual(expected);
+    expect(spyCoreInfo).toHaveBeenCalledWith('Trying to resolve the latest version from remote');
-      expect(spyGetToolcachePath).toHaveBeenCalled();
+    expect(spyCoreInfo).toHaveBeenCalledWith(`Resolved latest version as ${actualJavaVersion}`);
-      expect(spyCoreInfo).toHaveBeenCalledWith(
+    expect(spyCoreInfo).toHaveBeenCalledWith('Trying to download...');
-        'Trying to resolve the latest version from remote'
+    expect(spyCoreInfo).toHaveBeenCalledWith(`Java ${actualJavaVersion} was downloaded`);
-      );
+    expect(spyCoreInfo).toHaveBeenCalledWith(`Setting Java ${expected.version} as the default`);
-      expect(spyCoreInfo).toHaveBeenCalledWith(
+  });
-        `Resolved latest version as ${actualJavaVersion}`
-      );
-      expect(spyCoreInfo).toHaveBeenCalledWith('Trying to download...');
-      expect(spyCoreInfo).toHaveBeenCalledWith(
-        `Java ${actualJavaVersion} was downloaded`
-      );
-      expect(spyCoreInfo).toHaveBeenCalledWith(
-        `Setting Java ${expected.version} as the default`
-      );
-    }
-  );
 
   it.each([
-    [
+    [{ version: '15', architecture: 'x86', packageType: 'jre', checkLatest: false }],
-      {
+    [{ version: '11.0.7', architecture: 'x64', packageType: 'jre', checkLatest: false }]
-        version: '15',
+  ])('should throw an error for Available version not found for %s', async input => {
-        architecture: 'x86',
+    mockJavaBase = new EmptyJavaBase(input);
-        packageType: 'jre',
+    await expect(mockJavaBase.setupJava()).rejects.toThrowError('Available version not found');
-        checkLatest: false
+    expect(spyTcFindAllVersions).toHaveBeenCalled();
-      }
+    expect(spyCoreAddPath).not.toHaveBeenCalled();
-    ],
+    expect(spyCoreExportVariable).not.toHaveBeenCalled();
-    [
+    expect(spyCoreSetOutput).not.toHaveBeenCalled();
-      {
+  });
-        version: '11.0.7',
-        architecture: 'x64',
-        packageType: 'jre',
-        checkLatest: false
-      }
-    ]
-  ])(
-    'should throw an error for Available version not found for %s',
-    async input => {
-      mockJavaBase = new EmptyJavaBase(input);
-      await expect(mockJavaBase.setupJava()).rejects.toThrow(
-        'Available version not found'
-      );
-      expect(spyTcFindAllVersions).toHaveBeenCalled();
-      expect(spyCoreAddPath).not.toHaveBeenCalled();
-      expect(spyCoreExportVariable).not.toHaveBeenCalled();
-      expect(spyCoreSetOutput).not.toHaveBeenCalled();
-    }
-  );
 });
 
 describe('normalizeVersion', () => {
   const DummyJavaBase = JavaBase as any;
 
   it.each([
-    ['11', {version: '11', stable: true}],
+    ['11', { version: '11', stable: true }],
-    ['11.0', {version: '11.0', stable: true}],
+    ['11.0', { version: '11.0', stable: true }],
-    ['11.0.10', {version: '11.0.10', stable: true}],
+    ['11.0.10', { version: '11.0.10', stable: true }],
-    ['11-ea', {version: '11', stable: false}],
+    ['11-ea', { version: '11', stable: false }],
-    ['11.0.2-ea', {version: '11.0.2', stable: false}]
+    ['11.0.2-ea', { version: '11.0.2', stable: false }]
   ])('normalizeVersion from %s to %s', (input, expected) => {
-    expect(DummyJavaBase.prototype.normalizeVersion.call(null, input)).toEqual(
+    expect(DummyJavaBase.prototype.normalizeVersion.call(null, input)).toEqual(expected);
-      expected
-    );
   });
 
   it('normalizeVersion should throw an error for non semver', () => {
     const version = '11g';
-    expect(
+    expect(DummyJavaBase.prototype.normalizeVersion.bind(null, version)).toThrowError(
-      DummyJavaBase.prototype.normalizeVersion.bind(null, version)
-    ).toThrow(
       `The string '${version}' is not valid SemVer notation for a Java version. Please check README file for code snippets and more detailed information`
     );
   });
@@ -574,14 +353,14 @@ describe('getToolcacheVersionName', () => {
   const DummyJavaBase = JavaBase as any;
 
   it.each([
-    [{version: '11', stable: true}, '11'],
+    [{ version: '11', stable: true }, '11'],
-    [{version: '11.0.2', stable: true}, '11.0.2'],
+    [{ version: '11.0.2', stable: true }, '11.0.2'],
-    [{version: '11.0.2+4', stable: true}, '11.0.2-4'],
+    [{ version: '11.0.2+4', stable: true }, '11.0.2-4'],
-    [{version: '11.0.2+4.1.2563234', stable: true}, '11.0.2-4.1.2563234'],
+    [{ version: '11.0.2+4.1.2563234', stable: true }, '11.0.2-4.1.2563234'],
-    [{version: '11.0', stable: false}, '11.0-ea'],
+    [{ version: '11.0', stable: false }, '11.0-ea'],
-    [{version: '11.0.3', stable: false}, '11.0.3-ea'],
+    [{ version: '11.0.3', stable: false }, '11.0.3-ea'],
-    [{version: '11.0.3+4', stable: false}, '11.0.3-ea.4'],
+    [{ version: '11.0.3+4', stable: false }, '11.0.3-ea.4'],
-    [{version: '11.0.3+4.2.256', stable: false}, '11.0.3-ea.4.2.256']
+    [{ version: '11.0.3+4.2.256', stable: false }, '11.0.3-ea.4.2.256']
   ])('returns correct version name for %s', (input, expected) => {
     const inputVersion = input.stable ? '11' : '11-ea';
     const mockJavaBase = new EmptyJavaBase({

__tests__/distributors/corretto-installer.test.ts

@@ -1,12 +1,12 @@
-import {HttpClient} from '@actions/http-client';
+import { HttpClient } from '@actions/http-client';
-import {JavaInstallerOptions} from '../../src/distributions/base-models';
+import { JavaInstallerOptions } from '../../src/distributions/base-models';
 
-import {CorrettoDistribution} from '../../src/distributions/corretto/installer';
+import { CorrettoDistribution } from '../../src/distributions/corretto/installer';
 import * as util from '../../src/util';
 import os from 'os';
-import {isGeneratorFunction} from 'util/types';
+import { isGeneratorFunction } from 'util/types';
 
-import manifestData from '../data/corretto.json';
+const manifestData = require('../data/corretto.json') as [];
 
 describe('getAvailableVersions', () => {
   let spyHttpClient: jest.SpyInstance;
@@ -19,10 +19,7 @@ describe('getAvailableVersions', () => {
       headers: {},
       result: manifestData
     });
-    spyGetDownloadArchiveExtension = jest.spyOn(
+    spyGetDownloadArchiveExtension = jest.spyOn(util, 'getDownloadArchiveExtension');
-      util,
-      'getDownloadArchiveExtension'
-    );
   });
 
   afterEach(() => {
@@ -47,66 +44,16 @@ describe('getAvailableVersions', () => {
     });
 
     it.each([
+      [{ version: '16', architecture: 'x64', packageType: 'jdk', checkLatest: false }, 'macos', 6],
+      [{ version: '16', architecture: 'x86', packageType: 'jdk', checkLatest: false }, 'macos', 0],
+      [{ version: '16', architecture: 'x64', packageType: 'jre', checkLatest: false }, 'macos', 0],
+      [{ version: '16', architecture: 'x64', packageType: 'jdk', checkLatest: false }, 'linux', 6],
       [
-        {
+        { version: '18', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-          version: '16',
-          architecture: 'x64',
-          packageType: 'jdk',
-          checkLatest: false
-        },
-        'macos',
-        6
-      ],
-      [
-        {
-          version: '16',
-          architecture: 'x86',
-          packageType: 'jdk',
-          checkLatest: false
-        },
-        'macos',
-        0
-      ],
-      [
-        {
-          version: '16',
-          architecture: 'x64',
-          packageType: 'jre',
-          checkLatest: false
-        },
-        'macos',
-        0
-      ],
-      [
-        {
-          version: '16',
-          architecture: 'x64',
-          packageType: 'jdk',
-          checkLatest: false
-        },
-        'linux',
-        6
-      ],
-      [
-        {
-          version: '18',
-          architecture: 'x64',
-          packageType: 'jdk',
-          checkLatest: false
-        },
         'windows',
         6
       ],
-      [
+      [{ version: '18', architecture: 'x64', packageType: 'jre', checkLatest: false }, 'windows', 1]
-        {
-          version: '18',
-          architecture: 'x64',
-          packageType: 'jre',
-          checkLatest: false
-        },
-        'windows',
-        1
-      ]
     ])(
       'fetch expected amount of available versions for %s',
       async (
@@ -119,9 +66,7 @@ describe('getAvailableVersions', () => {
 
         const availableVersions = await distribution['getAvailableVersions']();
         expect(availableVersions).not.toBeNull();
-        expect(availableVersions.length).toBe(
+        expect(availableVersions.length).toBe(expectedAmountOfAvailableVersions);
-          expectedAmountOfAvailableVersions
-        );
       }
     );
   });
@@ -150,9 +95,7 @@ describe('getAvailableVersions', () => {
       });
       mockPlatform(distribution, platform);
 
-      const availableVersion = await distribution['findPackageForDownload'](
+      const availableVersion = await distribution['findPackageForDownload'](version);
-        version
-      );
       expect(availableVersion).not.toBeNull();
       expect(availableVersion.url).toBe(expectedLink);
     });
@@ -167,9 +110,9 @@ describe('getAvailableVersions', () => {
       });
       mockPlatform(distribution, 'linux');
 
-      await expect(
+      await expect(distribution['findPackageForDownload'](version)).rejects.toThrowError(
-        distribution['findPackageForDownload'](version)
+        'Early access versions are not supported'
-      ).rejects.toThrow('Early access versions are not supported');
+      );
     });
 
     it('with non major version expect to throw not supported error', async () => {
@@ -182,9 +125,9 @@ describe('getAvailableVersions', () => {
       });
       mockPlatform(distribution, 'linux');
 
-      await expect(
+      await expect(distribution['findPackageForDownload'](version)).rejects.toThrowError(
-        distribution['findPackageForDownload'](version)
+        'Only major versions are supported'
-      ).rejects.toThrow('Only major versions are supported');
+      );
     });
 
     it('with unfound version throw could not find error', async () => {
@@ -197,9 +140,9 @@ describe('getAvailableVersions', () => {
       });
       mockPlatform(distribution, 'linux');
 
-      await expect(
+      await expect(distribution['findPackageForDownload'](version)).rejects.toThrowError(
-        distribution['findPackageForDownload'](version)
+        "Could not find satisfied version for SemVer '4'"
-      ).rejects.toThrow("Could not find satisfied version for SemVer '4'");
+      );
     });
 
     it.each([
@@ -223,19 +166,14 @@ describe('getAvailableVersions', () => {
 
         const expectedLink = `https://corretto.aws/downloads/resources/17.0.2.8.1/amazon-corretto-17.0.2.8.1-macosx-${distroArch}.tar.gz`;
 
-        const availableVersion = await distribution['findPackageForDownload'](
+        const availableVersion = await distribution['findPackageForDownload'](version);
-          version
-        );
         expect(availableVersion).not.toBeNull();
         expect(availableVersion.url).toBe(expectedLink);
       }
     );
   });
 
-  const mockPlatform = (
+  const mockPlatform = (distribution: CorrettoDistribution, platform: string) => {
-    distribution: CorrettoDistribution,
-    platform: string
-  ) => {
     distribution['getPlatformOption'] = () => platform;
     const mockedExtension = platform === 'windows' ? 'zip' : 'tar.gz';
     spyGetDownloadArchiveExtension.mockReturnValue(mockedExtension);

__tests__/distributors/dragonwell-installer.test.ts

@@ -1,226 +0,0 @@
-import {HttpClient} from '@actions/http-client';
-import {DragonwellDistribution} from '../../src/distributions/dragonwell/installer';
-import * as utils from '../../src/util';
-
-import manifestData from '../data/dragonwell.json';
-
-describe('getAvailableVersions', () => {
-  let spyHttpClient: jest.SpyInstance;
-  let spyUtilGetDownloadArchiveExtension: jest.SpyInstance;
-
-  beforeEach(() => {
-    spyHttpClient = jest.spyOn(HttpClient.prototype, 'getJson');
-    spyHttpClient.mockReturnValue({
-      statusCode: 200,
-      headers: {},
-      result: manifestData
-    });
-
-    spyUtilGetDownloadArchiveExtension = jest.spyOn(
-      utils,
-      'getDownloadArchiveExtension'
-    );
-    spyUtilGetDownloadArchiveExtension.mockReturnValue('tar.gz');
-  });
-
-  afterEach(() => {
-    jest.resetAllMocks();
-    jest.clearAllMocks();
-    jest.restoreAllMocks();
-  });
-
-  const mockPlatform = (
-    distribution: DragonwellDistribution,
-    platform: string
-  ) => {
-    distribution['getPlatformOption'] = () => platform;
-    const mockedExtension = platform == 'windows' ? 'zip' : 'tar.gz';
-    spyUtilGetDownloadArchiveExtension.mockReturnValue(mockedExtension);
-  };
-
-  describe('getAvailableVersions', () => {
-    it.each([
-      ['8', 'x86', 'linux', 0],
-      ['8', 'aarch64', 'linux', 24],
-      ['8.6.6', 'x64', 'linux', 27],
-      ['8', 'x86', 'anolis', 0],
-      ['8', 'x86', 'windows', 0],
-      ['8', 'x86', 'mac', 0],
-      ['11', 'x64', 'linux', 27],
-      ['11', 'aarch64', 'linux', 24],
-      ['17', 'riscv', 'linux', 0],
-      ['16.0.1', 'x64', 'linux', 27]
-    ])(
-      'should get right number of available versions from JSON',
-      async (
-        jdkVersion: string,
-        arch: string,
-        platform: string,
-        len: number
-      ) => {
-        const distribution = new DragonwellDistribution({
-          version: jdkVersion,
-          architecture: arch,
-          packageType: 'jdk',
-          checkLatest: false
-        });
-        mockPlatform(distribution, platform);
-
-        const availableVersions = await distribution['getAvailableVersions']();
-        expect(availableVersions).not.toBeNull();
-        expect(availableVersions.length).toBe(len);
-      }
-    );
-  });
-
-  describe('findPackageForDownload', () => {
-    it.each([
-      [
-        '8',
-        'linux',
-        'x64',
-        'https://github.com/alibaba/dragonwell8/releases/download/dragonwell-extended-8.13.14_jdk8u352-ga/Alibaba_Dragonwell_Extended_8.13.14_x64_linux.tar.gz'
-      ],
-      [
-        '8',
-        'linux',
-        'aarch64',
-        'https://github.com/alibaba/dragonwell8/releases/download/dragonwell-extended-8.13.14_jdk8u352-ga/Alibaba_Dragonwell_Extended_8.13.14_aarch64_linux.tar.gz'
-      ],
-      [
-        '8',
-        'windows',
-        'x64',
-        'https://github.com/alibaba/dragonwell8/releases/download/dragonwell-extended-8.13.14_jdk8u352-ga/Alibaba_Dragonwell_Extended_8.13.14_x64_windows.zip'
-      ],
-      [
-        '8.13.14',
-        'linux',
-        'x64',
-        'https://github.com/alibaba/dragonwell8/releases/download/dragonwell-extended-8.13.14_jdk8u352-ga/Alibaba_Dragonwell_Extended_8.13.14_x64_linux.tar.gz'
-      ],
-      [
-        '11',
-        'linux',
-        'x64',
-        'https://github.com/alibaba/dragonwell11/releases/download/dragonwell-extended-11.0.17.13_jdk-11.0.17-ga/Alibaba_Dragonwell_Extended_11.0.17.13.8_x64_linux.tar.gz'
-      ],
-      [
-        '11',
-        'linux',
-        'aarch64',
-        'https://github.com/alibaba/dragonwell11/releases/download/dragonwell-extended-11.0.17.13_jdk-11.0.17-ga/Alibaba_Dragonwell_Extended_11.0.17.13.8_aarch64_linux.tar.gz'
-      ],
-      [
-        '11',
-        'windows',
-        'x64',
-        'https://github.com/alibaba/dragonwell11/releases/download/dragonwell-extended-11.0.17.13_jdk-11.0.17-ga/Alibaba_Dragonwell_Extended_11.0.17.13.8_x64_windows.zip'
-      ],
-      [
-        '11',
-        'alpine-linux',
-        'x64',
-        'https://github.com/alibaba/dragonwell11/releases/download/dragonwell-extended-11.0.17.13_jdk-11.0.17-ga/Alibaba_Dragonwell_Extended_11.0.17.13.8_x64_alpine-linux.tar.gz'
-      ],
-      [
-        '11.0.17',
-        'linux',
-        'x64',
-        'https://github.com/alibaba/dragonwell11/releases/download/dragonwell-extended-11.0.17.13_jdk-11.0.17-ga/Alibaba_Dragonwell_Extended_11.0.17.13.8_x64_linux.tar.gz'
-      ],
-      [
-        '17',
-        'linux',
-        'x64',
-        'https://github.com/alibaba/dragonwell17/releases/download/dragonwell-standard-17.0.5.0.5%2B8_jdk-17.0.5-ga/Alibaba_Dragonwell_Standard_17.0.5.0.5.8_x64_linux.tar.gz'
-      ],
-      [
-        '17',
-        'linux',
-        'aarch64',
-        'https://github.com/alibaba/dragonwell17/releases/download/dragonwell-standard-17.0.5.0.5%2B8_jdk-17.0.5-ga/Alibaba_Dragonwell_Standard_17.0.5.0.5.8_aarch64_linux.tar.gz'
-      ],
-      [
-        '17',
-        'windows',
-        'x64',
-        'https://github.com/alibaba/dragonwell17/releases/download/dragonwell-standard-17.0.5.0.5%2B8_jdk-17.0.5-ga/Alibaba_Dragonwell_Standard_17.0.5.0.5.8_x64_windows.zip'
-      ],
-      [
-        '17',
-        'alpine-linux',
-        'x64',
-        'https://github.com/alibaba/dragonwell17/releases/download/dragonwell-standard-17.0.5.0.5%2B8_jdk-17.0.5-ga/Alibaba_Dragonwell_Standard_17.0.5.0.5.8_x64_alpine-linux.tar.gz'
-      ],
-      [
-        '17.0.4',
-        'linux',
-        'x64',
-        'https://github.com/alibaba/dragonwell17/releases/download/dragonwell-standard-17.0.4.0.4%2B8_jdk-17.0.4-ga/Alibaba_Dragonwell_Standard_17.0.4.0.4%2B8_x64_linux.tar.gz'
-      ]
-    ])(
-      'should return proper link according to the specified java-version, platform and arch',
-      async (
-        jdkVersion: string,
-        platform: string,
-        arch: string,
-        expectedLink: string
-      ) => {
-        const distribution = new DragonwellDistribution({
-          version: jdkVersion,
-          architecture: arch,
-          packageType: 'jdk',
-          checkLatest: false
-        });
-        mockPlatform(distribution, platform);
-
-        const availableVersion = await distribution['findPackageForDownload'](
-          jdkVersion
-        );
-        expect(availableVersion).not.toBeNull();
-        expect(availableVersion.url).toBe(expectedLink);
-      }
-    );
-
-    it.each([
-      ['8', 'alpine-linux', 'x64'],
-      ['8', 'macos', 'aarch64'],
-      ['11', 'macos', 'aarch64'],
-      ['17', 'linux', 'riscv']
-    ])(
-      'should throw when required version of JDK can not be found in the JSON',
-      async (jdkVersion: string, platform: string, arch: string) => {
-        const distribution = new DragonwellDistribution({
-          version: jdkVersion,
-          architecture: arch,
-          packageType: 'jdk',
-          checkLatest: false
-        });
-        mockPlatform(distribution, platform);
-
-        await expect(
-          distribution['findPackageForDownload'](jdkVersion)
-        ).rejects.toThrow(
-          `Couldn't find any satisfied version for the specified java-version: "${jdkVersion}" and architecture: "${arch}".`
-        );
-      }
-    );
-
-    it('should throw when required package type is not jdk', async () => {
-      const jdkVersion = '17';
-      const arch = 'x64';
-      const platform = 'linux';
-      const distribution = new DragonwellDistribution({
-        version: jdkVersion,
-        architecture: arch,
-        packageType: 'jre',
-        checkLatest: false
-      });
-      mockPlatform(distribution, platform);
-      await expect(
-        distribution['findPackageForDownload'](jdkVersion)
-      ).rejects.toThrow('Dragonwell provides only the `jdk` package type');
-    });
-  });
-});

__tests__/distributors/liberica-installer.test.ts

@@ -1,12 +1,9 @@
-import {LibericaDistributions} from '../../src/distributions/liberica/installer';
+import { LibericaDistributions } from '../../src/distributions/liberica/installer';
-import {
+import { ArchitectureOptions, LibericaVersion } from '../../src/distributions/liberica/models';
-  ArchitectureOptions,
+import { HttpClient } from '@actions/http-client';
-  LibericaVersion
-} from '../../src/distributions/liberica/models';
-import {HttpClient} from '@actions/http-client';
 import os from 'os';
 
-import manifestData from '../data/liberica.json';
+const manifestData = require('../data/liberica.json') as LibericaVersion[];
 
 describe('getAvailableVersions', () => {
   let spyHttpClient: jest.SpyInstance;
@@ -16,7 +13,7 @@ describe('getAvailableVersions', () => {
     spyHttpClient.mockReturnValue({
       statusCode: 200,
       headers: {},
-      result: manifestData as LibericaVersion[]
+      result: manifestData
     });
   });
 
@@ -28,57 +25,27 @@ describe('getAvailableVersions', () => {
 
   it.each([
     [
-      {
+      { version: '11.x', architecture: 'x86', packageType: 'jdk', checkLatest: false },
-        version: '11.x',
-        architecture: 'x86',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       'bundle-type=jdk&bitness=32&arch=x86&build-type=all'
     ],
     [
-      {
+      { version: '11-ea', architecture: 'x86', packageType: 'jdk', checkLatest: false },
-        version: '11-ea',
-        architecture: 'x86',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       'bundle-type=jdk&bitness=32&arch=x86&build-type=ea'
     ],
     [
-      {
+      { version: '16.0.2', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '16.0.2',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       'bundle-type=jdk&bitness=64&arch=x86&build-type=all'
     ],
     [
-      {
+      { version: '16.0.2', architecture: 'x64', packageType: 'jre', checkLatest: false },
-        version: '16.0.2',
-        architecture: 'x64',
-        packageType: 'jre',
-        checkLatest: false
-      },
       'bundle-type=jre&bitness=64&arch=x86&build-type=all'
     ],
     [
-      {
+      { version: '8', architecture: 'armv7', packageType: 'jdk+fx', checkLatest: false },
-        version: '8',
-        architecture: 'armv7',
-        packageType: 'jdk+fx',
-        checkLatest: false
-      },
       'bundle-type=jdk-full&bitness=32&arch=arm&build-type=all'
     ],
     [
-      {
+      { version: '8', architecture: 'aarch64', packageType: 'jre+fx', checkLatest: false },
-        version: '8',
-        architecture: 'aarch64',
-        packageType: 'jre+fx',
-        checkLatest: false
-      },
       'bundle-type=jre-full&bitness=64&arch=arm&build-type=all'
     ]
   ])('build correct url for %s -> %s', async (input, urlParams) => {
@@ -100,8 +67,8 @@ describe('getAvailableVersions', () => {
     arch: string;
   };
   it.each([
-    ['amd64', {bitness: '64', arch: 'x86'}],
+    ['amd64', { bitness: '64', arch: 'x86' }],
-    ['arm64', {bitness: '64', arch: 'arm'}]
+    ['arm64', { bitness: '64', arch: 'arm' }]
   ])(
     'defaults to os.arch(): %s mapped to distro arch: %s',
     async (osArch: string, distroArch: DistroArch) => {
@@ -142,24 +109,21 @@ describe('getAvailableVersions', () => {
 
 describe('getArchitectureOptions', () => {
   it.each([
-    ['x86', {bitness: '32', arch: 'x86'}],
+    ['x86', { bitness: '32', arch: 'x86' }],
-    ['x64', {bitness: '64', arch: 'x86'}],
+    ['x64', { bitness: '64', arch: 'x86' }],
-    ['armv7', {bitness: '32', arch: 'arm'}],
+    ['armv7', { bitness: '32', arch: 'arm' }],
-    ['aarch64', {bitness: '64', arch: 'arm'}],
+    ['aarch64', { bitness: '64', arch: 'arm' }],
-    ['ppc64le', {bitness: '64', arch: 'ppc'}]
+    ['ppc64le', { bitness: '64', arch: 'ppc' }]
-  ] as [string, ArchitectureOptions][])(
+  ] as [string, ArchitectureOptions][])('parse architecture %s -> %s', (input, expected) => {
-    'parse architecture %s -> %s',
+    const distributions = new LibericaDistributions({
-    (input, expected) => {
+      architecture: input,
-      const distributions = new LibericaDistributions({
+      checkLatest: false,
-        architecture: input,
+      packageType: '',
-        checkLatest: false,
+      version: ''
-        packageType: '',
+    });
-        version: ''
-      });
 
-      expect(distributions['getArchitectureOptions']()).toEqual(expected);
+    expect(distributions['getArchitectureOptions']()).toEqual(expected);
-    }
+  });
-  );
 
   it.each(['armv6', 's390x'])('not support architecture %s', input => {
     const distributions = new LibericaDistributions({
@@ -235,9 +199,9 @@ describe('getPlatformOption', () => {
   it.each(['aix', 'android', 'freebsd', 'openbsd', 'netbsd'])(
     'not support os version %s',
     input => {
-      expect(() =>
+      expect(() => distributions['getPlatformOption'](input as NodeJS.Platform)).toThrow(
-        distributions['getPlatformOption'](input as NodeJS.Platform)
+        /Platform '\w+' is not supported\. Supported platforms: .+/
-      ).toThrow(/Platform '\w+' is not supported\. Supported platforms: .+/);
+      );
     }
   );
 });
@@ -251,33 +215,9 @@ describe('convertVersionToSemver', () => {
   });
 
   it.each([
-    [
+    [{ featureVersion: 11, interimVersion: 0, updateVersion: 12, buildVersion: 7 }, '11.0.12+7'],
-      {
+    [{ featureVersion: 11, interimVersion: 0, updateVersion: 12, buildVersion: 0 }, '11.0.12'],
-        featureVersion: 11,
+    [{ featureVersion: 11, interimVersion: 0, updateVersion: 0, buildVersion: 13 }, '11.0.0+13']
-        interimVersion: 0,
-        updateVersion: 12,
-        buildVersion: 7
-      },
-      '11.0.12+7'
-    ],
-    [
-      {
-        featureVersion: 11,
-        interimVersion: 0,
-        updateVersion: 12,
-        buildVersion: 0
-      },
-      '11.0.12'
-    ],
-    [
-      {
-        featureVersion: 11,
-        interimVersion: 0,
-        updateVersion: 0,
-        buildVersion: 13
-      },
-      '11.0.0+13'
-    ]
   ])('%s -> %s', (input, expected) => {
     const actual = distributions['convertVersionToSemver']({
       downloadUrl: '',

__tests__/distributors/local-installer.test.ts

@@ -7,7 +7,7 @@ import path from 'path';
 import * as semver from 'semver';
 import * as util from '../../src/util';
 
-import {LocalDistribution} from '../../src/distributions/local/installer';
+import { LocalDistribution } from '../../src/distributions/local/installer';
 
 describe('setupJava', () => {
   const actualJavaVersion = '11.1.10';
@@ -27,7 +27,7 @@ describe('setupJava', () => {
   let spyFsReadDir: jest.SpyInstance;
   let spyUtilsExtractJdkFile: jest.SpyInstance;
   let spyPathResolve: jest.SpyInstance;
-  const expectedJdkFile = 'JavaLocalJdkFile';
+  let expectedJdkFile = 'JavaLocalJdkFile';
 
   beforeEach(() => {
     spyGetToolcachePath = jest.spyOn(util, 'getToolcachePath');
@@ -35,27 +35,18 @@ describe('setupJava', () => {
       (toolname: string, javaVersion: string, architecture: string) => {
         const semverVersion = new semver.Range(javaVersion);
 
-        if (
+        if (path.basename(javaPath) !== architecture || !javaPath.includes(toolname)) {
-          path.basename(javaPath) !== architecture ||
-          !javaPath.includes(toolname)
-        ) {
           return '';
         }
 
-        return semver.satisfies(actualJavaVersion, semverVersion)
+        return semver.satisfies(actualJavaVersion, semverVersion) ? javaPath : '';
-          ? javaPath
-          : '';
       }
     );
 
     spyTcCacheDir = jest.spyOn(tc, 'cacheDir');
     spyTcCacheDir.mockImplementation(
-      (
+      (archivePath: string, toolcacheFolderName: string, version: string, architecture: string) =>
-        archivePath: string,
+        path.join(toolcacheFolderName, version, architecture)
-        toolcacheFolderName: string,
-        version: string,
-        architecture: string
-      ) => path.join(toolcacheFolderName, version, architecture)
     );
 
     spyTcFindAllVersions = jest.spyOn(tc, 'findAllVersions');
@@ -83,7 +74,7 @@ describe('setupJava', () => {
 
     spyFsStat = jest.spyOn(fs, 'statSync');
     spyFsStat.mockImplementation((file: string) => {
-      return {isFile: () => file === expectedJdkFile};
+      return { isFile: () => file === expectedJdkFile };
     });
 
     // Spy on util methods
@@ -117,9 +108,7 @@ describe('setupJava', () => {
     mockJavaBase = new LocalDistribution(inputs, jdkFile);
     await expect(mockJavaBase.setupJava()).resolves.toEqual(expected);
     expect(spyGetToolcachePath).toHaveBeenCalled();
-    expect(spyCoreInfo).toHaveBeenCalledWith(
+    expect(spyCoreInfo).toHaveBeenCalledWith(`Resolved Java ${actualJavaVersion} from tool-cache`);
-      `Resolved Java ${actualJavaVersion} from tool-cache`
-    );
     expect(spyCoreInfo).not.toHaveBeenCalledWith(
       `Java ${inputs.version} was not found in tool-cache. Trying to unpack JDK file...`
     );
@@ -141,9 +130,7 @@ describe('setupJava', () => {
     mockJavaBase = new LocalDistribution(inputs, jdkFile);
     await expect(mockJavaBase.setupJava()).resolves.toEqual(expected);
     expect(spyGetToolcachePath).toHaveBeenCalled();
-    expect(spyCoreInfo).toHaveBeenCalledWith(
+    expect(spyCoreInfo).toHaveBeenCalledWith(`Resolved Java ${actualJavaVersion} from tool-cache`);
-      `Resolved Java ${actualJavaVersion} from tool-cache`
-    );
     expect(spyCoreInfo).not.toHaveBeenCalledWith(
       `Java ${inputs.version} was not found in tool-cache. Trying to unpack JDK file...`
     );
@@ -168,9 +155,7 @@ describe('setupJava', () => {
     expect(spyCoreInfo).not.toHaveBeenCalledWith(
       `Resolved Java ${actualJavaVersion} from tool-cache`
     );
-    expect(spyCoreInfo).toHaveBeenCalledWith(
+    expect(spyCoreInfo).toHaveBeenCalledWith(`Extracting Java from '${jdkFile}'`);
-      `Extracting Java from '${jdkFile}'`
-    );
     expect(spyCoreInfo).toHaveBeenCalledWith(
       `Java ${inputs.version} was not found in tool-cache. Trying to unpack JDK file...`
     );
@@ -186,163 +171,46 @@ describe('setupJava', () => {
     const jdkFile = 'not_existing_one';
     const expected = {
       javaVersion: '11.0.289',
-      javaPath: path.join(
+      javaPath: path.join('Java_jdkfile_jdk', inputs.version, inputs.architecture)
-        'Java_jdkfile_jdk',
-        inputs.version,
-        inputs.architecture
-      )
     };
 
     mockJavaBase = new LocalDistribution(inputs, jdkFile);
-    expected.javaPath = path.join(
+    expected.javaPath = path.join('Java_jdkfile_jdk', inputs.version, inputs.architecture);
-      'Java_jdkfile_jdk',
+    await expect(mockJavaBase.setupJava()).rejects.toThrowError(
-      inputs.version,
-      inputs.architecture
-    );
-    await expect(mockJavaBase.setupJava()).rejects.toThrow(
       "JDK file was not found in path 'not_existing_one'"
     );
     expect(spyTcFindAllVersions).toHaveBeenCalled();
     expect(spyCoreInfo).not.toHaveBeenCalledWith(
       `Resolved Java ${actualJavaVersion} from tool-cache`
     );
-    expect(spyCoreInfo).not.toHaveBeenCalledWith(
+    expect(spyCoreInfo).not.toHaveBeenCalledWith(`Extracting Java from '${jdkFile}'`);
-      `Extracting Java from '${jdkFile}'`
-    );
     expect(spyCoreInfo).toHaveBeenCalledWith(
       `Java ${inputs.version} was not found in tool-cache. Trying to unpack JDK file...`
     );
   });
 
-  it('java is resolved from toolcache including Contents/Home on MacOS', async () => {
-    const inputs = {
-      version: actualJavaVersion,
-      architecture: 'x86',
-      packageType: 'jdk',
-      checkLatest: false
-    };
-    const jdkFile = 'not_existing_one';
-    const expected = {
-      version: actualJavaVersion,
-      path: path.join(
-        'Java_jdkfile_jdk',
-        inputs.version,
-        inputs.architecture,
-        'Contents',
-        'Home'
-      )
-    };
-    const originalPlatform = process.platform;
-    Object.defineProperty(process, 'platform', {
-      value: 'darwin'
-    });
-
-    spyFsStat = jest.spyOn(fs, 'existsSync');
-    spyFsStat.mockImplementation((file: string) => {
-      return file.endsWith('Home');
-    });
-
-    mockJavaBase = new LocalDistribution(inputs, jdkFile);
-    await expect(mockJavaBase.setupJava()).resolves.toEqual(expected);
-    expect(spyGetToolcachePath).toHaveBeenCalled();
-    expect(spyCoreInfo).toHaveBeenCalledWith(
-      `Resolved Java ${actualJavaVersion} from tool-cache`
-    );
-    expect(spyCoreInfo).not.toHaveBeenCalledWith(
-      `Java ${inputs.version} was not found in tool-cache. Trying to unpack JDK file...`
-    );
-
-    Object.defineProperty(process, 'platform', {
-      value: originalPlatform
-    });
-  });
-
-  it('java is unpacked from jdkfile including Contents/Home on MacOS', async () => {
-    const inputs = {
-      version: '11.0.289',
-      architecture: 'x86',
-      packageType: 'jdk',
-      checkLatest: false
-    };
-    const jdkFile = expectedJdkFile;
-    const expected = {
-      version: '11.0.289',
-      path: path.join(
-        'Java_jdkfile_jdk',
-        inputs.version,
-        inputs.architecture,
-        'Contents',
-        'Home'
-      )
-    };
-    const originalPlatform = process.platform;
-    Object.defineProperty(process, 'platform', {
-      value: 'darwin'
-    });
-    spyFsStat = jest.spyOn(fs, 'existsSync');
-    spyFsStat.mockImplementation((file: string) => {
-      return file.endsWith('Home');
-    });
-
-    mockJavaBase = new LocalDistribution(inputs, jdkFile);
-    await expect(mockJavaBase.setupJava()).resolves.toEqual(expected);
-    expect(spyTcFindAllVersions).toHaveBeenCalled();
-    expect(spyCoreInfo).not.toHaveBeenCalledWith(
-      `Resolved Java ${actualJavaVersion} from tool-cache`
-    );
-    expect(spyCoreInfo).toHaveBeenCalledWith(
-      `Extracting Java from '${jdkFile}'`
-    );
-    expect(spyCoreInfo).toHaveBeenCalledWith(
-      `Java ${inputs.version} was not found in tool-cache. Trying to unpack JDK file...`
-    );
-    Object.defineProperty(process, 'platform', {
-      value: originalPlatform
-    });
-  });
-
   it.each([
     [
-      {
+      { version: '8.0.289', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '8.0.289',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       'otherJdkFile'
     ],
     [
-      {
+      { version: '11.0.289', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '11.0.289',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       'otherJdkFile'
     ],
     [
-      {
+      { version: '12.0.289', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '12.0.289',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       'otherJdkFile'
     ],
     [
-      {
+      { version: '11.1.11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '11.1.11',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       'not_existing_one'
     ]
   ])(
     `Throw an error if jdkfile has wrong path, inputs %s, jdkfile %s, real name ${expectedJdkFile}`,
     async (inputs, jdkFile) => {
       mockJavaBase = new LocalDistribution(inputs, jdkFile);
-      await expect(mockJavaBase.setupJava()).rejects.toThrow(
+      await expect(mockJavaBase.setupJava()).rejects.toThrowError(
         /JDK file was not found in path */
       );
       expect(spyTcFindAllVersions).toHaveBeenCalled();
@@ -350,41 +218,18 @@ describe('setupJava', () => {
   );
 
   it.each([
+    [{ version: '8.0.289', architecture: 'x64', packageType: 'jdk', checkLatest: false }, ''],
     [
-      {
+      { version: '7.0.289', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '8.0.289',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
-      ''
-    ],
-    [
-      {
-        version: '7.0.289',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       undefined
     ],
     [
-      {
+      { version: '11.0.289', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '11.0.289',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       undefined
     ]
-  ])(
+  ])('Throw an error if jdkfile is not specified, inputs %s', async (inputs, jdkFile) => {
-    'Throw an error if jdkfile is not specified, inputs %s',
+    mockJavaBase = new LocalDistribution(inputs, jdkFile);
-    async (inputs, jdkFile) => {
+    await expect(mockJavaBase.setupJava()).rejects.toThrowError("'jdkFile' is not specified");
-      mockJavaBase = new LocalDistribution(inputs, jdkFile);
+    expect(spyTcFindAllVersions).toHaveBeenCalled();
-      await expect(mockJavaBase.setupJava()).rejects.toThrow(
+  });
-        "'jdkFile' is not specified"
-      );
-      expect(spyTcFindAllVersions).toHaveBeenCalled();
-    }
-  );
 });

__tests__/distributors/microsoft-installer.test.ts

@@ -1,6 +1,6 @@
-import {MicrosoftDistributions} from '../../src/distributions/microsoft/installer';
+import { MicrosoftDistributions } from '../../src/distributions/microsoft/installer';
 import os from 'os';
-import data from '../data/microsoft.json';
+import data from '../../src/distributions/microsoft/microsoft-openjdk-versions.json';
 import * as httpm from '@actions/http-client';
 import * as core from '@actions/core';
 
@@ -29,11 +29,6 @@ describe('findPackageForDownload', () => {
   });
 
   it.each([
-    [
-      '21.x',
-      '21.0.0',
-      'https://aka.ms/download-jdk/microsoft-jdk-21.0.0-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
-    ],
     [
       '17.0.1',
       '17.0.1+12.1',
@@ -41,8 +36,8 @@ describe('findPackageForDownload', () => {
     ],
     [
       '17.x',
-      '17.0.7',
+      '17.0.3',
-      'https://aka.ms/download-jdk/microsoft-jdk-17.0.7-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
+      'https://aka.ms/download-jdk/microsoft-jdk-17.0.3-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
     ],
     [
       '16.0.x',
@@ -58,11 +53,6 @@ describe('findPackageForDownload', () => {
       '11.0.15',
       '11.0.15',
       'https://aka.ms/download-jdk/microsoft-jdk-11.0.15-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
-    ],
-    [
-      '11.x',
-      '11.0.19',
-      'https://aka.ms/download-jdk/microsoft-jdk-11.0.19-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
     ]
   ])('version is %s -> %s', async (input, expectedVersion, expectedUrl) => {
     const result = await distribution['findPackageForDownload'](input);
@@ -83,9 +73,7 @@ describe('findPackageForDownload', () => {
         archive = 'tar.gz';
         break;
     }
-    const url = expectedUrl
+    const url = expectedUrl.replace('{{OS_TYPE}}', os).replace('{{ARCHIVE_TYPE}}', archive);
-      .replace('{{OS_TYPE}}', os)
-      .replace('{{ARCHIVE_TYPE}}', archive);
     expect(result.url).toBe(url);
   });
 
@@ -107,7 +95,7 @@ describe('findPackageForDownload', () => {
       });
 
       const result = await distro['findPackageForDownload'](version);
-      const expectedUrl = `https://aka.ms/download-jdk/microsoft-jdk-17.0.7-linux-${distroArch}.tar.gz`;
+      const expectedUrl = `https://aka.ms/download-jdk/microsoft-jdk-17.0.3-linux-${distroArch}.tar.gz`;
 
       expect(result.url).toBe(expectedUrl);
     }

__tests__/distributors/oracle-installer.test.ts

@@ -1,13 +1,11 @@
-import {OracleDistribution} from '../../src/distributions/oracle/installer';
+import { OracleDistribution } from '../../src/distributions/oracle/installer';
 import os from 'os';
 import * as core from '@actions/core';
-import {getDownloadArchiveExtension} from '../../src/util';
+import { getDownloadArchiveExtension } from '../../src/util';
-import {HttpClient} from '@actions/http-client';
 
 describe('findPackageForDownload', () => {
   let distribution: OracleDistribution;
   let spyDebug: jest.SpyInstance;
-  let spyHttpClient: jest.SpyInstance;
 
   beforeEach(() => {
     distribution = new OracleDistribution({
@@ -23,19 +21,19 @@ describe('findPackageForDownload', () => {
 
   it.each([
     [
-      '20',
+      '19',
-      '20',
+      '19',
-      'https://download.oracle.com/java/20/latest/jdk-20_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
+      'https://download.oracle.com/java/19/latest/jdk-19_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
     ],
     [
-      '18',
+      '19.0.1',
-      '18',
+      '19.0.1',
-      'https://download.oracle.com/java/18/archive/jdk-18_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
+      'https://download.oracle.com/java/19/archive/jdk-19.0.1_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
     ],
     [
-      '20.0.1',
+      '18.0.2.1',
-      '20.0.1',
+      '18.0.2.1',
-      'https://download.oracle.com/java/20/archive/jdk-20.0.1_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
+      'https://download.oracle.com/java/18/archive/jdk-18.0.2.1_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
     ],
     [
       '17',
@@ -48,39 +46,11 @@ describe('findPackageForDownload', () => {
       'https://download.oracle.com/java/17/archive/jdk-17.0.1_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
     ]
   ])('version is %s -> %s', async (input, expectedVersion, expectedUrl) => {
-    /* Needed only for this particular test because some urls might change */
-    spyHttpClient = jest.spyOn(HttpClient.prototype, 'head');
-    spyHttpClient.mockReturnValue(
-      Promise.resolve({
-        message: {
-          statusCode: 200
-        }
-      })
-    );
-
-    /**
-     * NOTE - Should fail to retrieve 18 from latest and check archive instead
-     */
-    if (input === '18') {
-      spyHttpClient.mockReturnValueOnce(
-        Promise.resolve({
-          message: {
-            statusCode: 404
-          }
-        })
-      );
-    }
-
     const result = await distribution['findPackageForDownload'](input);
-
-    jest.restoreAllMocks();
-
     expect(result.version).toBe(expectedVersion);
     const osType = distribution.getPlatform();
     const archiveType = getDownloadArchiveExtension();
-    const url = expectedUrl
+    const url = expectedUrl.replace('{{OS_TYPE}}', osType).replace('{{ARCHIVE_TYPE}}', archiveType);
-      .replace('{{OS_TYPE}}', osType)
-      .replace('{{ARCHIVE_TYPE}}', archiveType);
     expect(result.url).toBe(url);
   });
 
@@ -93,7 +63,7 @@ describe('findPackageForDownload', () => {
       jest.spyOn(os, 'arch').mockReturnValue(osArch);
       jest.spyOn(os, 'platform').mockReturnValue('linux');
 
-      const version = '18';
+      const version = '17';
       const distro = new OracleDistribution({
         version,
         architecture: '', // to get default value
@@ -107,7 +77,7 @@ describe('findPackageForDownload', () => {
       }
       const archiveType = getDownloadArchiveExtension();
       const result = await distro['findPackageForDownload'](version);
-      const expectedUrl = `https://download.oracle.com/java/18/archive/jdk-18_${osType}-${distroArch}_bin.${archiveType}`;
+      const expectedUrl = `https://download.oracle.com/java/17/latest/jdk-17_${osType}-${distroArch}_bin.${archiveType}`;
 
       expect(result.url).toBe(expectedUrl);
     }
@@ -120,5 +90,8 @@ describe('findPackageForDownload', () => {
     await expect(distribution['findPackageForDownload']('11')).rejects.toThrow(
       /Oracle JDK is only supported for JDK 17 and later/
     );
+    await expect(distribution['findPackageForDownload']('18')).rejects.toThrow(
+      /Could not find Oracle JDK for SemVer */
+    );
   });
 });

__tests__/distributors/semeru-installer.test.ts

@@ -1,287 +0,0 @@
-import {HttpClient} from '@actions/http-client';
-
-import {JavaInstallerOptions} from '../../src/distributions/base-models';
-import {SemeruDistribution} from '../../src/distributions/semeru/installer';
-
-import manifestData from '../data/semeru.json';
-
-describe('getAvailableVersions', () => {
-  let spyHttpClient: jest.SpyInstance;
-
-  beforeEach(() => {
-    spyHttpClient = jest.spyOn(HttpClient.prototype, 'getJson');
-    spyHttpClient.mockReturnValue({
-      statusCode: 200,
-      headers: {},
-      result: []
-    });
-  });
-
-  afterEach(() => {
-    jest.resetAllMocks();
-    jest.clearAllMocks();
-    jest.restoreAllMocks();
-  });
-
-  it.each([
-    [
-      {
-        version: '16',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
-      'os=mac&architecture=x64&image_type=jdk&release_type=ga&jvm_impl=openj9&page_size=20&page=0'
-    ],
-    [
-      {
-        version: '16',
-        architecture: 'x86',
-        packageType: 'jdk',
-        checkLatest: false
-      },
-      'os=mac&architecture=x86&image_type=jdk&release_type=ga&jvm_impl=openj9&page_size=20&page=0'
-    ],
-    [
-      {
-        version: '16',
-        architecture: 'x64',
-        packageType: 'jre',
-        checkLatest: false
-      },
-      'os=mac&architecture=x64&image_type=jre&release_type=ga&jvm_impl=openj9&page_size=20&page=0'
-    ],
-    [
-      {
-        version: '16',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
-      'os=mac&architecture=x64&image_type=jdk&release_type=ga&jvm_impl=openj9&page_size=20&page=0'
-    ]
-  ])(
-    'build correct url for %s',
-    async (installerOptions: JavaInstallerOptions, expectedParameters) => {
-      const distribution = new SemeruDistribution(installerOptions);
-      const baseUrl =
-        'https://api.adoptopenjdk.net/v3/assets/version/%5B1.0,100.0%5D';
-      const expectedUrl = `${baseUrl}?project=jdk&vendor=ibm&heap_size=normal&sort_method=DEFAULT&sort_order=DESC&${expectedParameters}`;
-      distribution['getPlatformOption'] = () => 'mac';
-
-      await distribution['getAvailableVersions']();
-
-      expect(spyHttpClient.mock.calls).toHaveLength(1);
-      expect(spyHttpClient.mock.calls[0][0]).toBe(expectedUrl);
-    }
-  );
-
-  it('load available versions', async () => {
-    spyHttpClient = jest.spyOn(HttpClient.prototype, 'getJson');
-    spyHttpClient
-      .mockReturnValueOnce({
-        statusCode: 200,
-        headers: {},
-        result: manifestData as any
-      })
-      .mockReturnValueOnce({
-        statusCode: 200,
-        headers: {},
-        result: manifestData as any
-      })
-      .mockReturnValueOnce({
-        statusCode: 200,
-        headers: {},
-        result: []
-      });
-
-    const distribution = new SemeruDistribution({
-      version: '8',
-      architecture: 'x64',
-      packageType: 'jdk',
-      checkLatest: false
-    });
-    const availableVersions = await distribution['getAvailableVersions']();
-    expect(availableVersions).not.toBeNull();
-    expect(availableVersions.length).toBe(manifestData.length * 2);
-  });
-
-  it.each([
-    ['jdk', 'Java_IBM_Semeru_jdk'],
-    ['jre', 'Java_IBM_Semeru_jre']
-  ])('find right toolchain folder', (packageType: string, expected: string) => {
-    const distribution = new SemeruDistribution({
-      version: '8',
-      architecture: 'x64',
-      packageType: packageType,
-      checkLatest: false
-    });
-
-    // @ts-ignore - because it is protected
-    expect(distribution.toolcacheFolderName).toBe(expected);
-  });
-});
-
-describe('findPackageForDownload', () => {
-  it.each([
-    ['8', '8.0.322+6'],
-    ['16', '16.0.2+7'],
-    ['16.0', '16.0.2+7'],
-    ['16.0.2', '16.0.2+7'],
-    ['8.x', '8.0.322+6'],
-    ['x', '17.0.2+8']
-  ])('version is resolved correctly %s -> %s', async (input, expected) => {
-    const distribution = new SemeruDistribution({
-      version: '8',
-      architecture: 'x64',
-      packageType: 'jdk',
-      checkLatest: false
-    });
-    distribution['getAvailableVersions'] = async () => manifestData as any;
-    const resolvedVersion = await distribution['findPackageForDownload'](input);
-    expect(resolvedVersion.version).toBe(expected);
-  });
-
-  it('version is found but binaries list is empty', async () => {
-    const distribution = new SemeruDistribution({
-      version: '9.0.8',
-      architecture: 'x64',
-      packageType: 'jdk',
-      checkLatest: false
-    });
-    distribution['getAvailableVersions'] = async () => manifestData as any;
-    await expect(
-      distribution['findPackageForDownload']('9.0.8')
-    ).rejects.toThrow(/Could not find satisfied version for SemVer */);
-  });
-
-  it('version is not found', async () => {
-    const distribution = new SemeruDistribution({
-      version: '7.x',
-      architecture: 'x64',
-      packageType: 'jdk',
-      checkLatest: false
-    });
-    distribution['getAvailableVersions'] = async () => manifestData as any;
-    await expect(distribution['findPackageForDownload']('7.x')).rejects.toThrow(
-      /Could not find satisfied version for SemVer */
-    );
-  });
-
-  it('version list is empty', async () => {
-    const distribution = new SemeruDistribution({
-      version: '8',
-      architecture: 'x64',
-      packageType: 'jdk',
-      checkLatest: false
-    });
-    distribution['getAvailableVersions'] = async () => [];
-    await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
-      /Could not find satisfied version for SemVer */
-    );
-  });
-
-  it.each(['x64', 'x86', 'ppc64le', 'ppc64', 's390x', 'aarch64'])(
-    'correct Semeru `%s` architecture resolves',
-    async (arch: string) => {
-      const distribution = new SemeruDistribution({
-        version: '8',
-        architecture: arch,
-        packageType: 'jdk',
-        checkLatest: false
-      });
-      distribution['getAvailableVersions'] = async () => manifestData as any;
-      const resolvedVersion = await distribution['findPackageForDownload']('8');
-      expect(resolvedVersion.version).not.toBeNull();
-    }
-  );
-
-  it.each(['zos', 'z/OS', 'z/os', 'test0987654321=', '++=++', 'myArch'])(
-    'incorrect Semeru `%s` architecture throws',
-    async (arch: string) => {
-      const distribution = new SemeruDistribution({
-        version: '8',
-        architecture: arch,
-        packageType: 'jdk',
-        checkLatest: false
-      });
-      distribution['getAvailableVersions'] = async () => [];
-      await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
-        `Unsupported architecture for IBM Semeru: ${arch}, the following are supported: x64, x86, ppc64le, ppc64, s390x, aarch64`
-      );
-    }
-  );
-
-  it.each(['9-ea', '17-ea', '8-ea', '4-ea'])(
-    'early access version are illegal for Semeru (%s)',
-    async (version: string) => {
-      const distribution = new SemeruDistribution({
-        version: version,
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      });
-      distribution['getAvailableVersions'] = async () => manifestData as any;
-      await expect(
-        distribution['findPackageForDownload'](version)
-      ).rejects.toThrow(
-        'IBM Semeru does not provide builds for early access versions'
-      );
-    }
-  );
-
-  it.each([
-    'jdk+fx',
-    'jre+fx',
-    'test',
-    'test2',
-    'jdk-fx',
-    'javafx',
-    'jdk-javafx',
-    'ibm',
-    ' '
-  ])(
-    'rejects incorrect `%s` Semeru package type',
-    async (packageType: string) => {
-      const distribution = new SemeruDistribution({
-        version: '8',
-        architecture: 'x64',
-        packageType: packageType,
-        checkLatest: false
-      });
-      distribution['getAvailableVersions'] = async () => manifestData as any;
-      await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
-        'IBM Semeru only provide `jdk` and `jre` package types'
-      );
-    }
-  );
-
-  it.each(['jdk', 'jre'])(
-    'accepts correct `%s` Semeru package type',
-    async (packageType: string) => {
-      const distribution = new SemeruDistribution({
-        version: '8',
-        architecture: 'x64',
-        packageType: packageType,
-        checkLatest: false
-      });
-      distribution['getAvailableVersions'] = async () => manifestData as any;
-      const resolvedVersion = await distribution['findPackageForDownload']('8');
-      await expect(resolvedVersion.version).toMatch(/8[0-9.]+/);
-    }
-  );
-
-  it('fails when long release name is used', async () => {
-    expect(
-      () =>
-        new SemeruDistribution({
-          version: 'jdk-16.0.2+7_openj9-0.27.1',
-          architecture: 'x64',
-          packageType: 'jdk',
-          checkLatest: false
-        })
-    ).toThrow(
-      "The string 'jdk-16.0.2+7_openj9-0.27.1' is not valid SemVer notation for a Java version. Please check README file for code snippets and more detailed information"
-    );
-  });
-});

__tests__/distributors/temurin-installer.test.ts

@@ -1,12 +1,12 @@
-import {HttpClient} from '@actions/http-client';
+import { HttpClient } from '@actions/http-client';
 import os from 'os';
 import {
   TemurinDistribution,
   TemurinImplementation
 } from '../../src/distributions/temurin/installer';
-import {JavaInstallerOptions} from '../../src/distributions/base-models';
+import { JavaInstallerOptions } from '../../src/distributions/base-models';
 
-import manifestData from '../data/temurin.json';
+let manifestData = require('../data/temurin.json') as [];
 
 describe('getAvailableVersions', () => {
   let spyHttpClient: jest.SpyInstance;
@@ -28,42 +28,22 @@ describe('getAvailableVersions', () => {
 
   it.each([
     [
-      {
+      { version: '16', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '16',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       TemurinImplementation.Hotspot,
       'os=mac&architecture=x64&image_type=jdk&release_type=ga&jvm_impl=hotspot&page_size=20&page=0'
     ],
     [
-      {
+      { version: '16', architecture: 'x86', packageType: 'jdk', checkLatest: false },
-        version: '16',
-        architecture: 'x86',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       TemurinImplementation.Hotspot,
       'os=mac&architecture=x86&image_type=jdk&release_type=ga&jvm_impl=hotspot&page_size=20&page=0'
     ],
     [
-      {
+      { version: '16', architecture: 'x64', packageType: 'jre', checkLatest: false },
-        version: '16',
-        architecture: 'x64',
-        packageType: 'jre',
-        checkLatest: false
-      },
       TemurinImplementation.Hotspot,
       'os=mac&architecture=x64&image_type=jre&release_type=ga&jvm_impl=hotspot&page_size=20&page=0'
     ],
     [
-      {
+      { version: '16-ea', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '16-ea',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       TemurinImplementation.Hotspot,
       'os=mac&architecture=x64&image_type=jdk&release_type=ea&jvm_impl=hotspot&page_size=20&page=0'
     ]
@@ -75,8 +55,7 @@ describe('getAvailableVersions', () => {
       expectedParameters
     ) => {
       const distribution = new TemurinDistribution(installerOptions, impl);
-      const baseUrl =
+      const baseUrl = 'https://api.adoptium.net/v3/assets/version/%5B1.0,100.0%5D';
-        'https://api.adoptium.net/v3/assets/version/%5B1.0,100.0%5D';
       const expectedUrl = `${baseUrl}?project=jdk&vendor=adoptium&heap_size=normal&sort_method=DEFAULT&sort_order=DESC&${expectedParameters}`;
       distribution['getPlatformOption'] = () => 'mac';
 
@@ -93,12 +72,12 @@ describe('getAvailableVersions', () => {
       .mockReturnValueOnce({
         statusCode: 200,
         headers: {},
-        result: manifestData as any
+        result: manifestData
       })
       .mockReturnValueOnce({
         statusCode: 200,
         headers: {},
-        result: manifestData as any
+        result: manifestData
       })
       .mockReturnValueOnce({
         statusCode: 200,
@@ -107,12 +86,7 @@ describe('getAvailableVersions', () => {
       });
 
     const distribution = new TemurinDistribution(
-      {
+      { version: '8', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '8',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       TemurinImplementation.Hotspot
     );
     const availableVersions = await distribution['getAvailableVersions']();
@@ -127,12 +101,7 @@ describe('getAvailableVersions', () => {
     'find right toolchain folder',
     (impl: TemurinImplementation, packageType: string, expected: string) => {
       const distribution = new TemurinDistribution(
-        {
+        { version: '8', architecture: 'x64', packageType: packageType, checkLatest: false },
-          version: '8',
-          architecture: 'x64',
-          packageType: packageType,
-          checkLatest: false
-        },
         impl
       );
 
@@ -158,12 +127,8 @@ describe('getAvailableVersions', () => {
 
       const expectedParameters = `os=mac&architecture=${distroArch}&image_type=jdk&release_type=ga&jvm_impl=hotspot&page_size=20&page=0`;
 
-      const distribution = new TemurinDistribution(
+      const distribution = new TemurinDistribution(installerOptions, TemurinImplementation.Hotspot);
-        installerOptions,
+      const baseUrl = 'https://api.adoptium.net/v3/assets/version/%5B1.0,100.0%5D';
-        TemurinImplementation.Hotspot
-      );
-      const baseUrl =
-        'https://api.adoptium.net/v3/assets/version/%5B1.0,100.0%5D';
       const expectedUrl = `${baseUrl}?project=jdk&vendor=adoptium&heap_size=normal&sort_method=DEFAULT&sort_order=DESC&${expectedParameters}`;
       distribution['getPlatformOption'] = () => 'mac';
 
@@ -185,63 +150,43 @@ describe('findPackageForDownload', () => {
     ['x', '16.0.2+7']
   ])('version is resolved correctly %s -> %s', async (input, expected) => {
     const distribution = new TemurinDistribution(
-      {
+      { version: '8', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '8',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       TemurinImplementation.Hotspot
     );
-    distribution['getAvailableVersions'] = async () => manifestData as any;
+    distribution['getAvailableVersions'] = async () => manifestData;
     const resolvedVersion = await distribution['findPackageForDownload'](input);
     expect(resolvedVersion.version).toBe(expected);
   });
 
   it('version is found but binaries list is empty', async () => {
     const distribution = new TemurinDistribution(
-      {
+      { version: '9.0.8', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '9.0.8',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       TemurinImplementation.Hotspot
     );
-    distribution['getAvailableVersions'] = async () => manifestData as any;
+    distribution['getAvailableVersions'] = async () => manifestData;
-    await expect(
+    await expect(distribution['findPackageForDownload']('9.0.8')).rejects.toThrowError(
-      distribution['findPackageForDownload']('9.0.8')
+      /Could not find satisfied version for SemVer */
-    ).rejects.toThrow(/Could not find satisfied version for SemVer */);
+    );
   });
 
   it('version is not found', async () => {
     const distribution = new TemurinDistribution(
-      {
+      { version: '7.x', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '7.x',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       TemurinImplementation.Hotspot
     );
-    distribution['getAvailableVersions'] = async () => manifestData as any;
+    distribution['getAvailableVersions'] = async () => manifestData;
-    await expect(distribution['findPackageForDownload']('7.x')).rejects.toThrow(
+    await expect(distribution['findPackageForDownload']('7.x')).rejects.toThrowError(
       /Could not find satisfied version for SemVer */
     );
   });
 
   it('version list is empty', async () => {
     const distribution = new TemurinDistribution(
-      {
+      { version: '8', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '8',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       TemurinImplementation.Hotspot
     );
     distribution['getAvailableVersions'] = async () => [];
-    await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
+    await expect(distribution['findPackageForDownload']('8')).rejects.toThrowError(
       /Could not find satisfied version for SemVer */
     );
   });

__tests__/distributors/zulu-installer.test.ts

@@ -1,11 +1,11 @@
-import {HttpClient} from '@actions/http-client';
+import { HttpClient } from '@actions/http-client';
 import * as semver from 'semver';
-import {ZuluDistribution} from '../../src/distributions/zulu/installer';
+import { ZuluDistribution } from '../../src/distributions/zulu/installer';
-import {IZuluVersions} from '../../src/distributions/zulu/models';
+import { IZuluVersions } from '../../src/distributions/zulu/models';
 import * as utils from '../../src/util';
 import os from 'os';
 
-import manifestData from '../data/zulu-releases-default.json';
+const manifestData = require('../data/zulu-releases-default.json') as [];
 
 describe('getAvailableVersions', () => {
   let spyHttpClient: jest.SpyInstance;
@@ -19,10 +19,7 @@ describe('getAvailableVersions', () => {
       result: manifestData as IZuluVersions[]
     });
 
-    spyUtilGetDownloadArchiveExtension = jest.spyOn(
+    spyUtilGetDownloadArchiveExtension = jest.spyOn(utils, 'getDownloadArchiveExtension');
-      utils,
-      'getDownloadArchiveExtension'
-    );
     spyUtilGetDownloadArchiveExtension.mockReturnValue('tar.gz');
   });
 
@@ -34,75 +31,35 @@ describe('getAvailableVersions', () => {
 
   it.each([
     [
-      {
+      { version: '11', architecture: 'x86', packageType: 'jdk', checkLatest: false },
-        version: '11',
-        architecture: 'x86',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       '?os=macos&ext=tar.gz&bundle_type=jdk&javafx=false&arch=x86&hw_bitness=32&release_status=ga'
     ],
     [
-      {
+      { version: '11-ea', architecture: 'x86', packageType: 'jdk', checkLatest: false },
-        version: '11-ea',
-        architecture: 'x86',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       '?os=macos&ext=tar.gz&bundle_type=jdk&javafx=false&arch=x86&hw_bitness=32&release_status=ea'
     ],
     [
-      {
+      { version: '8', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-        version: '8',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       '?os=macos&ext=tar.gz&bundle_type=jdk&javafx=false&arch=x86&hw_bitness=64&release_status=ga'
     ],
     [
-      {
+      { version: '8', architecture: 'x64', packageType: 'jre', checkLatest: false },
-        version: '8',
-        architecture: 'x64',
-        packageType: 'jre',
-        checkLatest: false
-      },
       '?os=macos&ext=tar.gz&bundle_type=jre&javafx=false&arch=x86&hw_bitness=64&release_status=ga'
     ],
     [
-      {
+      { version: '8', architecture: 'x64', packageType: 'jdk+fx', checkLatest: false },
-        version: '8',
-        architecture: 'x64',
-        packageType: 'jdk+fx',
-        checkLatest: false
-      },
       '?os=macos&ext=tar.gz&bundle_type=jdk&javafx=true&arch=x86&hw_bitness=64&release_status=ga&features=fx'
     ],
     [
-      {
+      { version: '8', architecture: 'x64', packageType: 'jre+fx', checkLatest: false },
-        version: '8',
-        architecture: 'x64',
-        packageType: 'jre+fx',
-        checkLatest: false
-      },
       '?os=macos&ext=tar.gz&bundle_type=jre&javafx=true&arch=x86&hw_bitness=64&release_status=ga&features=fx'
     ],
     [
-      {
+      { version: '11', architecture: 'arm64', packageType: 'jdk', checkLatest: false },
-        version: '11',
-        architecture: 'arm64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       '?os=macos&ext=tar.gz&bundle_type=jdk&javafx=false&arch=arm&hw_bitness=64&release_status=ga'
     ],
     [
-      {
+      { version: '11', architecture: 'arm', packageType: 'jdk', checkLatest: false },
-        version: '11',
-        architecture: 'arm',
-        packageType: 'jdk',
-        checkLatest: false
-      },
       '?os=macos&ext=tar.gz&bundle_type=jdk&javafx=false&arch=arm&hw_bitness=&release_status=ga'
     ]
   ])('build correct url for %s -> %s', async (input, parsedUrl) => {
@@ -121,8 +78,8 @@ describe('getAvailableVersions', () => {
     arch: string;
   };
   it.each([
-    ['amd64', {bitness: '64', arch: 'x86'}],
+    ['amd64', { bitness: '64', arch: 'x86' }],
-    ['arm64', {bitness: '64', arch: 'arm'}]
+    ['arm64', { bitness: '64', arch: 'arm' }]
   ])(
     'defaults to os.arch(): %s mapped to distro arch: %s',
     async (osArch: string, distroArch: DistroArch) => {
@@ -158,10 +115,10 @@ describe('getAvailableVersions', () => {
 
 describe('getArchitectureOptions', () => {
   it.each([
-    [{architecture: 'x64'}, {arch: 'x86', hw_bitness: '64', abi: ''}],
+    [{ architecture: 'x64' }, { arch: 'x86', hw_bitness: '64', abi: '' }],
-    [{architecture: 'x86'}, {arch: 'x86', hw_bitness: '32', abi: ''}],
+    [{ architecture: 'x86' }, { arch: 'x86', hw_bitness: '32', abi: '' }],
-    [{architecture: 'x32'}, {arch: 'x32', hw_bitness: '', abi: ''}],
+    [{ architecture: 'x32' }, { arch: 'x32', hw_bitness: '', abi: '' }],
-    [{architecture: 'arm'}, {arch: 'arm', hw_bitness: '', abi: ''}]
+    [{ architecture: 'arm' }, { arch: 'arm', hw_bitness: '', abi: '' }]
   ])('%s -> %s', (input, expected) => {
     const distribution = new ZuluDistribution({
       version: '11',
@@ -194,9 +151,7 @@ describe('findPackageForDownload', () => {
       checkLatest: false
     });
     distribution['getAvailableVersions'] = async () => manifestData;
-    const result = await distribution['findPackageForDownload'](
+    const result = await distribution['findPackageForDownload'](distribution['version']);
-      distribution['version']
-    );
     expect(result.version).toBe(expected);
   });
 
@@ -224,6 +179,25 @@ describe('findPackageForDownload', () => {
     distribution['getAvailableVersions'] = async () => manifestData;
     await expect(
       distribution['findPackageForDownload'](distribution['version'])
-    ).rejects.toThrow(/Could not find satisfied version for semver */);
+    ).rejects.toThrowError(/Could not find satisfied version for semver */);
+  });
+});
+
+describe('convertVersionToSemver', () => {
+  it.each([
+    [[12], '12'],
+    [[12, 0], '12.0'],
+    [[12, 0, 2], '12.0.2'],
+    [[12, 0, 2, 1], '12.0.2+1'],
+    [[12, 0, 2, 1, 3], '12.0.2+1']
+  ])('%s -> %s', (input: number[], expected: string) => {
+    const distribution = new ZuluDistribution({
+      version: '18',
+      architecture: 'x86',
+      packageType: 'jdk',
+      checkLatest: false
+    });
+    const actual = distribution['convertVersionToSemver'](input);
+    expect(actual).toBe(expected);
   });
 });

__tests__/gpg.test.ts

@@ -1,7 +1,6 @@
-import * as path from 'path';
+import path = require('path');
-import * as io from '@actions/io';
+import io = require('@actions/io');
-import * as exec from '@actions/exec';
+import exec = require('@actions/exec');
-import * as gpg from '../src/gpg';
 
 jest.mock('@actions/exec', () => {
   return {
@@ -12,6 +11,8 @@ jest.mock('@actions/exec', () => {
 const tempDir = path.join(__dirname, 'runner', 'temp');
 process.env['RUNNER_TEMP'] = tempDir;
 
+import gpg = require('../src/gpg');
+
 describe('gpg tests', () => {
   beforeEach(async () => {
     await io.mkdirP(tempDir);
@@ -32,11 +33,7 @@ describe('gpg tests', () => {
 
       expect(keyId).toBeNull();
 
-      expect(exec.exec).toHaveBeenCalledWith(
+      expect(exec.exec).toHaveBeenCalledWith('gpg', expect.anything(), expect.anything());
-        'gpg',
-        expect.anything(),
-        expect.anything()
-      );
     });
   });
 
@@ -45,11 +42,7 @@ describe('gpg tests', () => {
       const keyId = 'asdfhjkl';
       await gpg.deleteKey(keyId);
 
-      expect(exec.exec).toHaveBeenCalledWith(
+      expect(exec.exec).toHaveBeenCalledWith('gpg', expect.anything(), expect.anything());
-        'gpg',
-        expect.anything(),
-        expect.anything()
-      );
     });
   });
 });

__tests__/toolchains.test.ts

@@ -4,7 +4,7 @@ import * as path from 'path';
 import * as core from '@actions/core';
 import * as io from '@actions/io';
 import * as toolchains from '../src/toolchains';
-import {M2_DIR, MVN_TOOLCHAINS_FILE} from '../src/constants';
+import { M2_DIR, MVN_TOOLCHAINS_FILE } from '../src/constants';
 
 const m2Dir = path.join(__dirname, M2_DIR);
 const toolchainsFile = path.join(m2Dir, MVN_TOOLCHAINS_FILE);
@@ -77,9 +77,9 @@ describe('toolchains tests', () => {
     };
 
     const result = `<?xml version="1.0"?>
-<toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0"
+<toolchains xmlns="https://maven.apache.org/TOOLCHAINS/1.1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd">
+  xsi:schemaLocation="https://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd">
   <toolchain>
     <type>jdk</type>
     <provides>
@@ -168,7 +168,7 @@ describe('toolchains tests', () => {
   </toolchain>
 </toolchains>`;
 
-    fs.mkdirSync(m2Dir, {recursive: true});
+    fs.mkdirSync(m2Dir, { recursive: true });
     fs.writeFileSync(toolchainsFile, originalFile);
     expect(fs.existsSync(m2Dir)).toBe(true);
     expect(fs.existsSync(toolchainsFile)).toBe(true);
@@ -223,7 +223,7 @@ describe('toolchains tests', () => {
         </toolchain>
       </toolchains>`;
 
-    fs.mkdirSync(m2Dir, {recursive: true});
+    fs.mkdirSync(m2Dir, { recursive: true });
     fs.writeFileSync(toolchainsFile, originalFile);
     expect(fs.existsSync(m2Dir)).toBe(true);
     expect(fs.existsSync(toolchainsFile)).toBe(true);
@@ -248,9 +248,9 @@ describe('toolchains tests', () => {
     };
 
     const expectedToolchains = `<?xml version="1.0"?>
-<toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0"
+<toolchains xmlns="https://maven.apache.org/TOOLCHAINS/1.1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd">
+  xsi:schemaLocation="https://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd">
   <toolchain>
     <type>jdk</type>
     <provides>
@@ -279,26 +279,14 @@ describe('toolchains tests', () => {
     const version = '17';
     const distributionName = 'temurin';
     const id = 'temurin_17';
-    const jdkHome =
+    const jdkHome = '/opt/hostedtoolcache/Java_Temurin-Hotspot_jdk/17.0.1-12/x64';
-      '/opt/hostedtoolcache/Java_Temurin-Hotspot_jdk/17.0.1-12/x64';
 
-    await toolchains.configureToolchains(
+    await toolchains.configureToolchains(version, distributionName, jdkHome, undefined);
-      version,
-      distributionName,
-      jdkHome,
-      undefined
-    );
 
     expect(fs.existsSync(m2Dir)).toBe(true);
     expect(fs.existsSync(toolchainsFile)).toBe(true);
     expect(fs.readFileSync(toolchainsFile, 'utf-8')).toEqual(
-      toolchains.generateToolchainDefinition(
+      toolchains.generateToolchainDefinition('', version, distributionName, id, jdkHome)
-        '',
-        version,
-        distributionName,
-        id,
-        jdkHome
-      )
     );
   }, 100000);
 });

__tests__/util.test.ts

@@ -1,10 +1,6 @@
 import * as cache from '@actions/cache';
 import * as core from '@actions/core';
-import {
+import { isVersionSatisfies, isCacheFeatureAvailable } from '../src/util';
-  convertVersionToSemver,
-  isVersionSatisfies,
-  isCacheFeatureAvailable
-} from '../src/util';
 
 jest.mock('@actions/cache');
 jest.mock('@actions/core');
@@ -24,13 +20,10 @@ describe('isVersionSatisfies', () => {
     ['2.5.1+3', '2.5.1+2', false],
     ['15.0.0+14', '15.0.0+14.1.202003190635', false],
     ['15.0.0+14.1.202003190635', '15.0.0+14.1.202003190635', true]
-  ])(
+  ])('%s, %s -> %s', (inputRange: string, inputVersion: string, expected: boolean) => {
-    '%s, %s -> %s',
+    const actual = isVersionSatisfies(inputRange, inputVersion);
-    (inputRange: string, inputVersion: string, expected: boolean) => {
+    expect(actual).toBe(expected);
-      const actual = isVersionSatisfies(inputRange, inputVersion);
+  });
-      expect(actual).toBe(expected);
-    }
-  );
 });
 
 describe('isCacheFeatureAvailable', () => {
@@ -51,8 +44,7 @@ describe('isCacheFeatureAvailable', () => {
   it('isCacheFeatureAvailable disabled on dotcom', () => {
     jest.spyOn(cache, 'isFeatureAvailable').mockImplementation(() => false);
     const infoMock = jest.spyOn(core, 'warning');
-    const message =
+    const message = 'The runner was not able to contact the cache service. Caching will be skipped';
-      'The runner was not able to contact the cache service. Caching will be skipped';
     try {
       process.env['GITHUB_SERVER_URL'] = 'http://github.com';
       expect(isCacheFeatureAvailable()).toBe(false);
@@ -67,16 +59,3 @@ describe('isCacheFeatureAvailable', () => {
     expect(isCacheFeatureAvailable()).toBe(true);
   });
 });
-
-describe('convertVersionToSemver', () => {
-  it.each([
-    ['12', '12'],
-    ['12.0', '12.0'],
-    ['12.0.2', '12.0.2'],
-    ['12.0.2.1', '12.0.2+1'],
-    ['12.0.2.1.0', '12.0.2+1.0']
-  ])('%s -> %s', (input: string, expected: string) => {
-    const actual = convertVersionToSemver(input);
-    expect(actual).toBe(expected);
-  });
-});

action.yml

@@ -56,9 +56,6 @@ inputs:
   cache:
     description: 'Name of the build platform to cache dependencies. It can be "maven", "gradle" or "sbt".'
     required: false
-  cache-dependency-path:
-    description: 'The path to a dependency file: pom.xml, build.gradle, build.sbt, etc. This option can be used with the `cache` option. If this option is omitted, the action searches for the dependency file in the entire repository. This option supports wildcards and a list of file names for caching multiple dependencies.'
-    required: false
   job-status:
     description: 'Workaround to pass job status to post job step. This variable is not intended for manual setting'
     default: ${{ job.status }}
@@ -81,6 +78,6 @@ outputs:
   cache-hit:
     description: 'A boolean value to indicate an exact match was found for the primary key'
 runs:
-  using: 'node20'
+  using: 'node16'
   main: 'dist/setup/index.js'
   post: 'dist/cleanup/index.js'

docs/advanced-usage.md

@@ -7,7 +7,6 @@
   - [Microsoft](#Microsoft)
   - [Amazon Corretto](#Amazon-Corretto)
   - [Oracle](#Oracle)
-  - [Alibaba Dragonwell](#Alibaba-Dragonwell)
 - [Installing custom Java package type](#Installing-custom-Java-package-type)
 - [Installing custom Java architecture](#Installing-custom-Java-architecture)
 - [Installing custom Java distribution from local file](#Installing-Java-from-local-file)
@@ -125,18 +124,6 @@ steps:
 - run: java -cp java HelloWorldApp
 ```
 
-### Alibaba Dragonwell
-**NOTE:** Alibaba Dragonwell only provides jdk.
-```yaml
-steps:
-- uses: actions/checkout@v3
-- uses: actions/setup-java@v3
-  with:
-    distribution: 'dragonwell'
-    java-version: '8'
-- run: java -cp java HelloWorldApp
-```
-
 ## Installing custom Java package type
 ```yaml
 steps:
@@ -159,7 +146,7 @@ steps:
   with:
     distribution: '<distribution>'
     java-version: '11'
-    architecture: x86 # optional - default value derived from the runner machine
+    architecture: x86 # optional - defaults to x64
 - run: java -cp java HelloWorldApp
 ```
 
@@ -181,31 +168,6 @@ steps:
 - run: java -cp java HelloWorldApp
 ```
 
-If your use-case requires a custom distribution (in the example, alpine-linux is used) or a version that is not provided by setup-java and you want to always install the latest version during runtime, then you can use the following code to auto-download the latest JDK, determine the semver needed for setup-java, and setup-java will take care of the installation and caching on the VM:
-
-```yaml
-   steps:
-      - name: fetch latest temurin JDK
-        id: fetch_latest_jdk
-        run: |
-          major_version={{ env.JAVA_VERSION }} # Example 8 or 11 or 17
-          cd $RUNNER_TEMP
-          response=$(curl -s "https://api.github.com/repos/adoptium/temurin${major_version}-binaries/releases")
-          latest_jdk_download_url=$(echo "$response" | jq -r '.[0].assets[] | select(.name | contains("jdk_x64_alpine-linux") and endswith(".tar.gz")) | .browser_download_url')
-          curl -Ls "$latest_jdk_download_url" -o java_package.tar.gz
-          latest_jdk_json_url=$(jdk_download_url "$response" | jq -r '.[0].assets[] | select(.name | contains("jdk_x64_alpine-linux") and endswith(".tar.gz.json")) | .browser_download_url')
-          latest_semver_version=$(curl -sL $latest_jdk_json_url | jq -r 'version.semver')
-          echo "java_version=$latest_semver_version" >> "$GITHUB_OUTPUT"
-
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'jdkfile'
-          jdkFile: ${{ runner.temp }}/java_package.tar.gz
-          java-version: {{ steps.fetch_latest_jdk.outputs.java_version }}
-          architecture: x64
-       - run: java -cp java HelloWorldApp
-```
-
 ## Testing against different Java distributions
 **NOTE:** The different distributors can provide discrepant list of available versions / supported configurations. Please refer to the official documentation to see the list of supported versions.
 ```yaml

docs/contributors.md

@@ -60,7 +60,6 @@ Pull requests are the easiest way to contribute changes to git repos at GitHub.
 
 - To implement new features or fix bugs, you need to make changes to the `.ts` files, which are located in the `src` folder
 - To comply with the code style, **you need to run the `format` script**
-- To lint the code, **you need to run the `lint:fix` script**
 - To transpile source code to `javascript` we use [NCC](https://github.com/vercel/ncc). **It is very important to run the `build` script after making changes**, otherwise your changes will not get into the final `javascript` build
 
 **Learn more about how to implement tests:**

package.json

@@ -1,15 +1,14 @@
 {
   "name": "setup-java",
-  "version": "4.0.0",
+  "version": "3.4.1",
   "private": true,
   "description": "setup java action",
   "main": "dist/setup/index.js",
   "scripts": {
     "build": "ncc build -o dist/setup src/setup-java.ts && ncc build -o dist/cleanup src/cleanup-java.ts",
-    "format": "prettier --no-error-on-unmatched-pattern --config ./.prettierrc.js --write \"**/*.{ts,yml,yaml}\"",
+    "format": "prettier --write \"{,!(node_modules)/**/}*.ts\"",
-    "format-check": "prettier --no-error-on-unmatched-pattern --config ./.prettierrc.js --check \"**/*.{ts,yml,yaml}\"",
+    "format-check": "prettier --check \"{,!(node_modules)/**/}*.ts\"",
-    "lint": "eslint --config ./.eslintrc.js \"**/*.ts\"",
+    "lint": "echo \"Fake command that does nothing. It is used in reusable workflows\"",
-    "lint:fix": "eslint --config ./.eslintrc.js \"**/*.ts\" --fix",
     "prerelease": "npm run-script build",
     "release": "git add -f dist/setup/index.js dist/cleanup/index.js",
     "test": "jest"
@@ -29,33 +28,22 @@
     "@actions/cache": "^3.0.4",
     "@actions/core": "^1.10.0",
     "@actions/exec": "^1.0.4",
-    "@actions/glob": "^0.4.0",
+    "@actions/glob": "^0.2.0",
-    "@actions/http-client": "^2.2.0",
+    "@actions/http-client": "^1.0.11",
     "@actions/io": "^1.0.2",
-    "@actions/tool-cache": "^2.0.1",
+    "@actions/tool-cache": "^1.6.1",
     "semver": "^7.3.4",
     "xmlbuilder2": "^2.4.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.9",
+    "@types/jest": "^27.0.2",
-    "@types/node": "^20.9.3",
+    "@types/node": "^16.11.25",
     "@types/semver": "^7.3.4",
-    "@typescript-eslint/eslint-plugin": "^5.54.0",
+    "@vercel/ncc": "^0.33.4",
-    "@typescript-eslint/parser": "^5.54.0",
+    "jest": "^27.2.5",
-    "@vercel/ncc": "^0.38.1",
+    "jest-circus": "^27.2.5",
-    "eslint": "^8.35.0",
+    "prettier": "^1.19.1",
-    "eslint-config-prettier": "^8.6.0",
+    "ts-jest": "^27.0.5",
-    "eslint-plugin-jest": "^27.2.1",
+    "typescript": "^4.2.3"
-    "eslint-plugin-node": "^11.1.0",
+  }
-    "jest": "^29.7.0",
-    "jest-circus": "^29.7.0",
-    "prettier": "^2.8.4",
-    "ts-jest": "^29.1.1",
-    "typescript": "^5.3.2"
-  },
-  "bugs": {
-    "url": "https://github.com/actions/setup-java/issues"
-  },
-  "homepage": "https://github.com/actions/setup-java#readme"
-  
 }

src/auth.ts

@@ -5,25 +5,20 @@ import * as io from '@actions/io';
 import * as fs from 'fs';
 import * as os from 'os';
 
-import {create as xmlCreate} from 'xmlbuilder2';
+import { create as xmlCreate } from 'xmlbuilder2';
 import * as constants from './constants';
 import * as gpg from './gpg';
-import {getBooleanInput} from './util';
+import { getBooleanInput } from './util';
 
 export async function configureAuthentication() {
   const id = core.getInput(constants.INPUT_SERVER_ID);
   const username = core.getInput(constants.INPUT_SERVER_USERNAME);
   const password = core.getInput(constants.INPUT_SERVER_PASSWORD);
   const settingsDirectory =
-    core.getInput(constants.INPUT_SETTINGS_PATH) ||
+    core.getInput(constants.INPUT_SETTINGS_PATH) || path.join(os.homedir(), constants.M2_DIR);
-    path.join(os.homedir(), constants.M2_DIR);
+  const overwriteSettings = getBooleanInput(constants.INPUT_OVERWRITE_SETTINGS, true);
-  const overwriteSettings = getBooleanInput(
-    constants.INPUT_OVERWRITE_SETTINGS,
-    true
-  );
   const gpgPrivateKey =
-    core.getInput(constants.INPUT_GPG_PRIVATE_KEY) ||
+    core.getInput(constants.INPUT_GPG_PRIVATE_KEY) || constants.INPUT_DEFAULT_GPG_PRIVATE_KEY;
-    constants.INPUT_DEFAULT_GPG_PRIVATE_KEY;
   const gpgPassphrase =
     core.getInput(constants.INPUT_GPG_PASSPHRASE) ||
     (gpgPrivateKey ? constants.INPUT_DEFAULT_GPG_PASSPHRASE : undefined);
@@ -74,7 +69,7 @@ export function generate(
   password: string,
   gpgPassphrase?: string | undefined
 ) {
-  const xmlObj: {[key: string]: any} = {
+  const xmlObj: { [key: string]: any } = {
     settings: {
       '@xmlns': 'http://maven.apache.org/SETTINGS/1.0.0',
       '@xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
@@ -107,11 +102,7 @@ export function generate(
   });
 }
 
-async function write(
+async function write(directory: string, settings: string, overwriteSettings: boolean) {
-  directory: string,
-  settings: string,
-  overwriteSettings: boolean
-) {
   const location = path.join(directory, constants.MVN_SETTINGS_FILE);
   const settingsExists = fs.existsSync(location);
   if (settingsExists && overwriteSettings) {

src/cache.ts

@@ -2,7 +2,7 @@
  * @fileoverview this file provides methods handling dependency cache
  */
 
-import {join} from 'path';
+import { join } from 'path';
 import os from 'os';
 import * as cache from '@actions/cache';
 import * as core from '@actions/core';
@@ -29,18 +29,14 @@ const supportedPackageManager: PackageManager[] = [
   },
   {
     id: 'gradle',
-    path: [
+    path: [join(os.homedir(), '.gradle', 'caches'), join(os.homedir(), '.gradle', 'wrapper')],
-      join(os.homedir(), '.gradle', 'caches'),
-      join(os.homedir(), '.gradle', 'wrapper')
-    ],
     // https://github.com/actions/cache/blob/0638051e9af2c23d10bb70fa9beffcad6cff9ce3/examples.md#java---gradle
     pattern: [
       '**/*.gradle*',
       '**/gradle-wrapper.properties',
       'buildSrc/**/Versions.kt',
       'buildSrc/**/Dependencies.kt',
-      'gradle/*.versions.toml',
+      'gradle/*.versions.toml'
-      '**/versions.properties'
     ]
   },
   {
@@ -54,26 +50,18 @@ const supportedPackageManager: PackageManager[] = [
       '!' + join(os.homedir(), '.sbt', '*.lock'),
       '!' + join(os.homedir(), '**', 'ivydata-*.properties')
     ],
-    pattern: [
+    pattern: ['**/*.sbt', '**/project/build.properties', '**/project/**.{scala,sbt}']
-      '**/*.sbt',
-      '**/project/build.properties',
-      '**/project/**.scala',
-      '**/project/**.sbt'
-    ]
   }
 ];
 
 function getCoursierCachePath(): string {
   if (os.type() === 'Linux') return join(os.homedir(), '.cache', 'coursier');
-  if (os.type() === 'Darwin')
+  if (os.type() === 'Darwin') return join(os.homedir(), 'Library', 'Caches', 'Coursier');
-    return join(os.homedir(), 'Library', 'Caches', 'Coursier');
   return join(os.homedir(), 'AppData', 'Local', 'Coursier', 'Cache');
 }
 
 function findPackageManager(id: string): PackageManager {
-  const packageManager = supportedPackageManager.find(
+  const packageManager = supportedPackageManager.find(packageManager => packageManager.id === id);
-    packageManager => packageManager.id === id
-  );
   if (packageManager === undefined) {
     throw new Error(`unknown package manager specified: ${id}`);
   }
@@ -83,34 +71,31 @@ function findPackageManager(id: string): PackageManager {
 /**
  * A function that generates a cache key to use.
  * Format of the generated key will be "${{ platform }}-${{ id }}-${{ fileHash }}"".
+ * If there is no file matched to {@link PackageManager.path}, the generated key ends with a dash (-).
  * @see {@link https://docs.github.com/en/actions/guides/caching-dependencies-to-speed-up-workflows#matching-a-cache-key|spec of cache key}
  */
-async function computeCacheKey(
+async function computeCacheKey(packageManager: PackageManager) {
-  packageManager: PackageManager,
+  const hash = await glob.hashFiles(packageManager.pattern.join('\n'));
-  cacheDependencyPath: string
+  return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${hash}`;
-) {
-  const pattern = cacheDependencyPath
-    ? cacheDependencyPath.trim().split('\n')
-    : packageManager.pattern;
-  const fileHash = await glob.hashFiles(pattern.join('\n'));
-  if (!fileHash) {
-    throw new Error(
-      `No file in ${process.cwd()} matched to [${pattern}], make sure you have checked out the target repository`
-    );
-  }
-  return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${fileHash}`;
 }
 
 /**
  * Restore the dependency cache
  * @param id ID of the package manager, should be "maven" or "gradle"
- * @param cacheDependencyPath The path to a dependency file
  */
-export async function restore(id: string, cacheDependencyPath: string) {
+export async function restore(id: string) {
   const packageManager = findPackageManager(id);
-  const primaryKey = await computeCacheKey(packageManager, cacheDependencyPath);
+  const primaryKey = await computeCacheKey(packageManager);
+
   core.debug(`primary key is ${primaryKey}`);
   core.saveState(STATE_CACHE_PRIMARY_KEY, primaryKey);
+  if (primaryKey.endsWith('-')) {
+    throw new Error(
+      `No file in ${process.cwd()} matched to [${
+        packageManager.pattern
+      }], make sure you have checked out the target repository`
+    );
+  }
 
   // No "restoreKeys" is set, to start with a clear cache after dependency update (see https://github.com/actions/setup-java/issues/269)
   const matchedKey = await cache.restoreCache(packageManager.path, primaryKey);
@@ -140,21 +125,17 @@ export async function save(id: string) {
     return;
   } else if (matchedKey === primaryKey) {
     // no change in target directories
-    core.info(
+    core.info(`Cache hit occurred on the primary key ${primaryKey}, not saving cache.`);
-      `Cache hit occurred on the primary key ${primaryKey}, not saving cache.`
-    );
     return;
   }
   try {
     await cache.saveCache(packageManager.path, primaryKey);
     core.info(`Cache saved with the key: ${primaryKey}`);
   } catch (error) {
-    const err = error as Error;
+    if (error.name === cache.ReserveCacheError.name) {
-
+      core.info(error.message);
-    if (err.name === cache.ReserveCacheError.name) {
-      core.info(err.message);
     } else {
-      if (isProbablyGradleDaemonProblem(packageManager, err)) {
+      if (isProbablyGradleDaemonProblem(packageManager, error)) {
         core.warning(
           'Failed to save Gradle cache on Windows. If tar.exe reported "Permission denied", try to run Gradle with `--no-daemon` option. Refer to https://github.com/actions/cache/issues/454 for details.'
         );
@@ -170,14 +151,8 @@ export async function save(id: string) {
  * @returns true if the given error seems related to the {@link https://github.com/actions/cache/issues/454|running Gradle Daemon issue}.
  * @see {@link https://github.com/actions/cache/issues/454#issuecomment-840493935|why --no-daemon is necessary}
  */
-function isProbablyGradleDaemonProblem(
+function isProbablyGradleDaemonProblem(packageManager: PackageManager, error: Error) {
-  packageManager: PackageManager,
+  if (packageManager.id !== 'gradle' || process.env['RUNNER_OS'] !== 'Windows') {
-  error: Error
-) {
-  if (
-    packageManager.id !== 'gradle' ||
-    process.env['RUNNER_OS'] !== 'Windows'
-  ) {
     return false;
   }
   const message = error.message || '';

src/cleanup-java.ts

@@ -1,21 +1,17 @@
 import * as core from '@actions/core';
 import * as gpg from './gpg';
 import * as constants from './constants';
-import {isJobStatusSuccess} from './util';
+import { isJobStatusSuccess } from './util';
-import {save} from './cache';
+import { save } from './cache';
 
 async function removePrivateKeyFromKeychain() {
-  if (core.getInput(constants.INPUT_GPG_PRIVATE_KEY, {required: false})) {
+  if (core.getInput(constants.INPUT_GPG_PRIVATE_KEY, { required: false })) {
     core.info('Removing private key from keychain');
     try {
-      const keyFingerprint = core.getState(
+      const keyFingerprint = core.getState(constants.STATE_GPG_PRIVATE_KEY_FINGERPRINT);
-        constants.STATE_GPG_PRIVATE_KEY_FINGERPRINT
-      );
       await gpg.deleteKey(keyFingerprint);
     } catch (error) {
-      core.setFailed(
+      core.setFailed(`Failed to remove private key due to: ${error.message}`);
-        `Failed to remove private key due to: ${(error as Error).message}`
-      );
     }
   }
 }

src/constants.ts

@@ -18,7 +18,6 @@ export const INPUT_DEFAULT_GPG_PRIVATE_KEY = undefined;
 export const INPUT_DEFAULT_GPG_PASSPHRASE = 'GPG_PASSPHRASE';
 
 export const INPUT_CACHE = 'cache';
-export const INPUT_CACHE_DEPENDENCY_PATH = 'cache-dependency-path';
 export const INPUT_JOB_STATUS = 'job-status';
 
 export const STATE_GPG_PRIVATE_KEY_FINGERPRINT = 'gpg-private-key-fingerprint';

src/distributions/adopt/installer.ts

@@ -5,18 +5,10 @@ import fs from 'fs';
 import path from 'path';
 import semver from 'semver';
 
-import {JavaBase} from '../base-installer';
+import { JavaBase } from '../base-installer';
-import {IAdoptAvailableVersions} from './models';
+import { IAdoptAvailableVersions } from './models';
-import {
+import { JavaDownloadRelease, JavaInstallerOptions, JavaInstallerResults } from '../base-models';
-  JavaDownloadRelease,
+import { extractJdkFile, getDownloadArchiveExtension, isVersionSatisfies } from '../../util';
-  JavaInstallerOptions,
-  JavaInstallerResults
-} from '../base-models';
-import {
-  extractJdkFile,
-  getDownloadArchiveExtension,
-  isVersionSatisfies
-} from '../../util';
 
 export enum AdoptImplementation {
   Hotspot = 'Hotspot',
@@ -31,9 +23,7 @@ export class AdoptDistribution extends JavaBase {
     super(`Adopt-${jvmImpl}`, installerOptions);
   }
 
-  protected async findPackageForDownload(
+  protected async findPackageForDownload(version: string): Promise<JavaDownloadRelease> {
-    version: string
-  ): Promise<JavaDownloadRelease> {
     const availableVersionsRaw = await this.getAvailableVersions();
     const availableVersionsWithBinaries = availableVersionsRaw
       .filter(item => item.binaries.length > 0)
@@ -50,12 +40,9 @@ export class AdoptDistribution extends JavaBase {
         return -semver.compareBuild(a.version, b.version);
       });
 
-    const resolvedFullVersion =
+    const resolvedFullVersion = satisfiedVersions.length > 0 ? satisfiedVersions[0] : null;
-      satisfiedVersions.length > 0 ? satisfiedVersions[0] : null;
     if (!resolvedFullVersion) {
-      const availableOptions = availableVersionsWithBinaries
+      const availableOptions = availableVersionsWithBinaries.map(item => item.version).join(', ');
-        .map(item => item.version)
-        .join(', ');
       const availableOptionsMessage = availableOptions
         ? `\nAvailable versions: ${availableOptions}`
         : '';
@@ -67,31 +54,27 @@ export class AdoptDistribution extends JavaBase {
     return resolvedFullVersion;
   }
 
-  protected async downloadTool(
+  protected async downloadTool(javaRelease: JavaDownloadRelease): Promise<JavaInstallerResults> {
-    javaRelease: JavaDownloadRelease
+    let javaPath: string;
-  ): Promise<JavaInstallerResults> {
+    let extractedJavaPath: string;
+
     core.info(
       `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
     );
     const javaArchivePath = await tc.downloadTool(javaRelease.url);
 
     core.info(`Extracting Java archive...`);
-    const extension = getDownloadArchiveExtension();
+    let extension = getDownloadArchiveExtension();
 
-    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
+    extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
 
     const archiveName = fs.readdirSync(extractedJavaPath)[0];
     const archivePath = path.join(extractedJavaPath, archiveName);
     const version = this.getToolcacheVersionName(javaRelease.version);
 
-    const javaPath = await tc.cacheDir(
+    javaPath = await tc.cacheDir(archivePath, this.toolcacheFolderName, version, this.architecture);
-      archivePath,
-      this.toolcacheFolderName,
-      version,
-      this.architecture
-    );
 
-    return {version: javaRelease.version, path: javaPath};
+    return { version: javaRelease.version, path: javaPath };
   }
 
   protected get toolcacheFolderName(): string {
@@ -111,7 +94,7 @@ export class AdoptDistribution extends JavaBase {
     const releaseType = this.stable ? 'ga' : 'ea';
 
     if (core.isDebug()) {
-      console.time('Retrieving available versions for Adopt took'); // eslint-disable-line no-console
+      console.time('adopt-retrieve-available-versions');
     }
 
     const baseRequestArguments = [
@@ -136,9 +119,7 @@ export class AdoptDistribution extends JavaBase {
       const availableVersionsUrl = `https://api.adoptopenjdk.net/v3/assets/version/${versionRange}?${requestArguments}`;
       if (core.isDebug() && page_index === 0) {
         // url is identical except page_index so print it once for debug
-        core.debug(
+        core.debug(`Gathering available versions from '${availableVersionsUrl}'`);
-          `Gathering available versions from '${availableVersionsUrl}'`
-        );
       }
 
       const paginationPage = (
@@ -155,11 +136,9 @@ export class AdoptDistribution extends JavaBase {
 
     if (core.isDebug()) {
       core.startGroup('Print information about available versions');
-      console.timeEnd('Retrieving available versions for Adopt took'); // eslint-disable-line no-console
+      console.timeEnd('adopt-retrieve-available-versions');
-      core.debug(`Available versions: [${availableVersions.length}]`);
+      console.log(`Available versions: [${availableVersions.length}]`);
-      core.debug(
+      console.log(availableVersions.map(item => item.version_data.semver).join(', '));
-        availableVersions.map(item => item.version_data.semver).join(', ')
-      );
       core.endGroup();
     }
 

src/distributions/base-installer.ts

@@ -4,13 +4,9 @@ import * as fs from 'fs';
 import semver from 'semver';
 import path from 'path';
 import * as httpm from '@actions/http-client';
-import {getToolcachePath, isVersionSatisfies} from '../util';
+import { getToolcachePath, isVersionSatisfies } from '../util';
-import {
+import { JavaDownloadRelease, JavaInstallerOptions, JavaInstallerResults } from './base-models';
-  JavaDownloadRelease,
+import { MACOS_JAVA_CONTENT_POSTFIX } from '../constants';
-  JavaInstallerOptions,
-  JavaInstallerResults
-} from './base-models';
-import {MACOS_JAVA_CONTENT_POSTFIX} from '../constants';
 import os from 'os';
 
 export abstract class JavaBase {
@@ -21,16 +17,13 @@ export abstract class JavaBase {
   protected stable: boolean;
   protected checkLatest: boolean;
 
-  constructor(
+  constructor(protected distribution: string, installerOptions: JavaInstallerOptions) {
-    protected distribution: string,
-    installerOptions: JavaInstallerOptions
-  ) {
     this.http = new httpm.HttpClient('actions/setup-java', undefined, {
       allowRetries: true,
       maxRetries: 3
     });
 
-    ({version: this.version, stable: this.stable} = this.normalizeVersion(
+    ({ version: this.version, stable: this.stable } = this.normalizeVersion(
       installerOptions.version
     ));
     this.architecture = installerOptions.architecture || os.arch();
@@ -38,12 +31,8 @@ export abstract class JavaBase {
     this.checkLatest = installerOptions.checkLatest;
   }
 
-  protected abstract downloadTool(
+  protected abstract downloadTool(javaRelease: JavaDownloadRelease): Promise<JavaInstallerResults>;
-    javaRelease: JavaDownloadRelease
+  protected abstract findPackageForDownload(range: string): Promise<JavaDownloadRelease>;
-  ): Promise<JavaInstallerResults>;
-  protected abstract findPackageForDownload(
-    range: string
-  ): Promise<JavaDownloadRelease>;
 
   public async setupJava(): Promise<JavaInstallerResults> {
     let foundJava = this.findInToolcache();
@@ -63,10 +52,7 @@ export abstract class JavaBase {
     }
 
     // JDK folder may contain postfix "Contents/Home" on macOS
-    const macOSPostfixPath = path.join(
+    const macOSPostfixPath = path.join(foundJava.path, MACOS_JAVA_CONTENT_POSTFIX);
-      foundJava.path,
-      MACOS_JAVA_CONTENT_POSTFIX
-    );
     if (process.platform === 'darwin' && fs.existsSync(macOSPostfixPath)) {
       foundJava.path = macOSPostfixPath;
     }
@@ -110,12 +96,7 @@ export abstract class JavaBase {
             // so replace "/hostedtoolcache/Java/11.0.3-4/x64" to "/hostedtoolcache/Java/11.0.3+4/x64" when retrieves  to cache
             // related issue: https://github.com/actions/virtual-environments/issues/3014
             .replace('-', '+'),
-          path:
+          path: getToolcachePath(this.toolcacheFolderName, item, this.architecture) || '',
-            getToolcachePath(
-              this.toolcacheFolderName,
-              item,
-              this.architecture
-            ) || '',
           stable: !item.includes('-ea')
         };
       })
@@ -168,10 +149,7 @@ export abstract class JavaBase {
     core.setOutput('distribution', this.distribution);
     core.setOutput('path', toolPath);
     core.setOutput('version', version);
-    core.exportVariable(
+    core.exportVariable(`JAVA_HOME_${majorVersion}_${this.architecture.toUpperCase()}`, toolPath);
-      `JAVA_HOME_${majorVersion}_${this.architecture.toUpperCase()}`,
-      toolPath
-    );
   }
 
   protected distributionArchitecture(): string {

src/distributions/corretto/installer.ts

@@ -2,30 +2,17 @@ import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
 import fs from 'fs';
 import path from 'path';
-import {
+import { extractJdkFile, getDownloadArchiveExtension } from '../../util';
-  extractJdkFile,
+import { JavaBase } from '../base-installer';
-  getDownloadArchiveExtension,
+import { JavaDownloadRelease, JavaInstallerOptions, JavaInstallerResults } from '../base-models';
-  convertVersionToSemver
+import { ICorrettoAllAvailableVersions, ICorrettoAvailableVersions } from './models';
-} from '../../util';
-import {JavaBase} from '../base-installer';
-import {
-  JavaDownloadRelease,
-  JavaInstallerOptions,
-  JavaInstallerResults
-} from '../base-models';
-import {
-  ICorrettoAllAvailableVersions,
-  ICorrettoAvailableVersions
-} from './models';
 
 export class CorrettoDistribution extends JavaBase {
   constructor(installerOptions: JavaInstallerOptions) {
     super('Corretto', installerOptions);
   }
 
-  protected async downloadTool(
+  protected async downloadTool(javaRelease: JavaDownloadRelease): Promise<JavaInstallerResults> {
-    javaRelease: JavaDownloadRelease
-  ): Promise<JavaInstallerResults> {
     core.info(
       `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
     );
@@ -33,10 +20,7 @@ export class CorrettoDistribution extends JavaBase {
 
     core.info(`Extracting Java archive...`);
 
-    const extractedJavaPath = await extractJdkFile(
+    const extractedJavaPath = await extractJdkFile(javaArchivePath, getDownloadArchiveExtension());
-      javaArchivePath,
-      getDownloadArchiveExtension()
-    );
 
     const archiveName = fs.readdirSync(extractedJavaPath)[0];
     const archivePath = path.join(extractedJavaPath, archiveName);
@@ -49,12 +33,10 @@ export class CorrettoDistribution extends JavaBase {
       this.architecture
     );
 
-    return {version: javaRelease.version, path: javaPath};
+    return { version: javaRelease.version, path: javaPath };
   }
 
-  protected async findPackageForDownload(
+  protected async findPackageForDownload(version: string): Promise<JavaDownloadRelease> {
-    version: string
-  ): Promise<JavaDownloadRelease> {
     if (!this.stable) {
       throw new Error('Early access versions are not supported');
     }
@@ -66,17 +48,14 @@ export class CorrettoDistribution extends JavaBase {
       .filter(item => item.version == version)
       .map(item => {
         return {
-          version: convertVersionToSemver(item.correttoVersion),
+          version: item.correttoVersion,
           url: item.downloadLink
         } as JavaDownloadRelease;
       });
 
-    const resolvedVersion =
+    const resolvedVersion = matchingVersions.length > 0 ? matchingVersions[0] : null;
-      matchingVersions.length > 0 ? matchingVersions[0] : null;
     if (!resolvedVersion) {
-      const availableOptions = availableVersions
+      const availableOptions = availableVersions.map(item => item.version).join(', ');
-        .map(item => item.version)
-        .join(', ');
       const availableOptionsMessage = availableOptions
         ? `\nAvailable versions: ${availableOptions}`
         : '';
@@ -93,61 +72,43 @@ export class CorrettoDistribution extends JavaBase {
     const imageType = this.packageType;
 
     if (core.isDebug()) {
-      console.time('Retrieving available versions for Coretto took'); // eslint-disable-line no-console
+      console.time('corretto-retrieve-available-versions');
     }
 
     const availableVersionsUrl =
       'https://corretto.github.io/corretto-downloads/latest_links/indexmap_with_checksum.json';
-    const fetchCurrentVersions =
+    const fetchCurrentVersions = await this.http.getJson<ICorrettoAllAvailableVersions>(
-      await this.http.getJson<ICorrettoAllAvailableVersions>(
+      availableVersionsUrl
-        availableVersionsUrl
+    );
-      );
     const fetchedCurrentVersions = fetchCurrentVersions.result;
     if (!fetchedCurrentVersions) {
-      throw Error(
+      throw Error(`Could not fetch latest corretto versions from ${availableVersionsUrl}`);
-        `Could not fetch latest corretto versions from ${availableVersionsUrl}`
-      );
     }
 
-    const eligibleVersions =
+    const eligibleVersions = fetchedCurrentVersions?.[platform]?.[arch]?.[imageType];
-      fetchedCurrentVersions?.[platform]?.[arch]?.[imageType];
+    const availableVersions = this.getAvailableVersionsForPlatform(eligibleVersions);
-    const availableVersions =
-      this.getAvailableVersionsForPlatform(eligibleVersions);
 
     if (core.isDebug()) {
-      core.startGroup('Print information about available versions');
+      this.printAvailableVersions(availableVersions);
-      console.timeEnd('Retrieving available versions for Coretto took'); // eslint-disable-line no-console
-      core.debug(`Available versions: [${availableVersions.length}]`);
-      core.debug(
-        availableVersions
-          .map(item => `${item.version}: ${item.correttoVersion}`)
-          .join(', ')
-      );
-      core.endGroup();
     }
 
     return availableVersions;
   }
 
   private getAvailableVersionsForPlatform(
-    eligibleVersions:
+    eligibleVersions: ICorrettoAllAvailableVersions['os']['arch']['imageType'] | undefined
-      | ICorrettoAllAvailableVersions['os']['arch']['imageType']
-      | undefined
   ): ICorrettoAvailableVersions[] {
     const availableVersions: ICorrettoAvailableVersions[] = [];
 
     for (const version in eligibleVersions) {
       const availableVersion = eligibleVersions[version];
       for (const fileType in availableVersion) {
-        const skipNonExtractableBinaries =
+        const skipNonExtractableBinaries = fileType != getDownloadArchiveExtension();
-          fileType != getDownloadArchiveExtension();
         if (skipNonExtractableBinaries) {
           continue;
         }
         const availableVersionDetails = availableVersion[fileType];
-        const correttoVersion = this.getCorrettoVersion(
+        const correttoVersion = this.getCorrettoVersion(availableVersionDetails.resource);
-          availableVersionDetails.resource
-        );
 
         availableVersions.push({
           checksum: availableVersionDetails.checksum,
@@ -163,6 +124,16 @@ export class CorrettoDistribution extends JavaBase {
     return availableVersions;
   }
 
+  private printAvailableVersions(availableVersions: ICorrettoAvailableVersions[]) {
+    core.startGroup('Print information about available versions');
+    console.timeEnd('corretto-retrieve-available-versions');
+    console.log(`Available versions: [${availableVersions.length}]`);
+    console.log(
+      availableVersions.map(item => `${item.version}: ${item.correttoVersion}`).join(', ')
+    );
+    core.endGroup();
+  }
+
   private getPlatformOption(): string {
     // Corretto has its own platform names so we need to map them
     switch (process.platform) {

src/distributions/distribution-factory.ts

@@ -1,15 +1,13 @@
-import {JavaBase} from './base-installer';
+import { JavaBase } from './base-installer';
-import {JavaInstallerOptions} from './base-models';
+import { JavaInstallerOptions } from './base-models';
-import {LocalDistribution} from './local/installer';
+import { LocalDistribution } from './local/installer';
-import {ZuluDistribution} from './zulu/installer';
+import { ZuluDistribution } from './zulu/installer';
-import {AdoptDistribution, AdoptImplementation} from './adopt/installer';
+import { AdoptDistribution, AdoptImplementation } from './adopt/installer';
-import {TemurinDistribution, TemurinImplementation} from './temurin/installer';
+import { TemurinDistribution, TemurinImplementation } from './temurin/installer';
-import {LibericaDistributions} from './liberica/installer';
+import { LibericaDistributions } from './liberica/installer';
-import {MicrosoftDistributions} from './microsoft/installer';
+import { MicrosoftDistributions } from './microsoft/installer';
-import {SemeruDistribution} from './semeru/installer';
+import { CorrettoDistribution } from './corretto/installer';
-import {CorrettoDistribution} from './corretto/installer';
+import { OracleDistribution } from './oracle/installer';
-import {OracleDistribution} from './oracle/installer';
-import {DragonwellDistribution} from './dragonwell/installer';
 
 enum JavaDistribution {
   Adopt = 'adopt',
@@ -20,10 +18,8 @@ enum JavaDistribution {
   Liberica = 'liberica',
   JdkFile = 'jdkfile',
   Microsoft = 'microsoft',
-  Semeru = 'semeru',
   Corretto = 'corretto',
-  Oracle = 'oracle',
+  Oracle = 'oracle'
-  Dragonwell = 'dragonwell'
 }
 
 export function getJavaDistribution(
@@ -36,34 +32,21 @@ export function getJavaDistribution(
       return new LocalDistribution(installerOptions, jdkFile);
     case JavaDistribution.Adopt:
     case JavaDistribution.AdoptHotspot:
-      return new AdoptDistribution(
+      return new AdoptDistribution(installerOptions, AdoptImplementation.Hotspot);
-        installerOptions,
-        AdoptImplementation.Hotspot
-      );
     case JavaDistribution.AdoptOpenJ9:
-      return new AdoptDistribution(
+      return new AdoptDistribution(installerOptions, AdoptImplementation.OpenJ9);
-        installerOptions,
-        AdoptImplementation.OpenJ9
-      );
     case JavaDistribution.Temurin:
-      return new TemurinDistribution(
+      return new TemurinDistribution(installerOptions, TemurinImplementation.Hotspot);
-        installerOptions,
-        TemurinImplementation.Hotspot
-      );
     case JavaDistribution.Zulu:
       return new ZuluDistribution(installerOptions);
     case JavaDistribution.Liberica:
       return new LibericaDistributions(installerOptions);
     case JavaDistribution.Microsoft:
       return new MicrosoftDistributions(installerOptions);
-    case JavaDistribution.Semeru:
-      return new SemeruDistribution(installerOptions);
     case JavaDistribution.Corretto:
       return new CorrettoDistribution(installerOptions);
     case JavaDistribution.Oracle:
       return new OracleDistribution(installerOptions);
-    case JavaDistribution.Dragonwell:
-      return new DragonwellDistribution(installerOptions);
     default:
       return null;
   }

src/distributions/dragonwell/installer.ts

@@ -1,244 +0,0 @@
-import * as core from '@actions/core';
-import * as tc from '@actions/tool-cache';
-import semver from 'semver';
-
-import fs from 'fs';
-import path from 'path';
-
-import {JavaBase} from '../base-installer';
-import {
-  convertVersionToSemver,
-  extractJdkFile,
-  getDownloadArchiveExtension,
-  getGitHubHttpHeaders,
-  isVersionSatisfies
-} from '../../util';
-import {IDragonwellVersions, IDragonwellAllVersions} from './models';
-import {
-  JavaDownloadRelease,
-  JavaInstallerOptions,
-  JavaInstallerResults
-} from '../base-models';
-
-export class DragonwellDistribution extends JavaBase {
-  constructor(installerOptions: JavaInstallerOptions) {
-    super('Dragonwell', installerOptions);
-  }
-
-  protected async findPackageForDownload(
-    version: string
-  ): Promise<JavaDownloadRelease> {
-    if (!this.stable) {
-      throw new Error('Early access versions are not supported by Dragonwell');
-    }
-
-    if (this.packageType !== 'jdk') {
-      throw new Error('Dragonwell provides only the `jdk` package type');
-    }
-
-    const availableVersions = await this.getAvailableVersions();
-
-    const matchedVersions = availableVersions
-      .filter(item => {
-        return isVersionSatisfies(version, item.jdk_version);
-      })
-      .map(item => {
-        return {
-          version: item.jdk_version,
-          url: item.download_link
-        } as JavaDownloadRelease;
-      });
-
-    if (!matchedVersions.length) {
-      throw new Error(
-        `Couldn't find any satisfied version for the specified java-version: "${version}" and architecture: "${this.architecture}".`
-      );
-    }
-
-    const resolvedVersion = matchedVersions[0];
-    return resolvedVersion;
-  }
-
-  private async getAvailableVersions(): Promise<IDragonwellVersions[]> {
-    const platform = this.getPlatformOption();
-    const arch = this.distributionArchitecture();
-
-    let fetchedDragonwellJson = await this.fetchJsonFromPrimaryUrl();
-
-    if (!fetchedDragonwellJson) {
-      fetchedDragonwellJson = await this.fetchJsonFromBackupUrl();
-    }
-
-    if (!fetchedDragonwellJson) {
-      throw new Error(
-        `Couldn't fetch Dragonwell versions information from both primary and backup urls`
-      );
-    }
-
-    core.debug(
-      'Successfully fetched information about available Dragonwell versions'
-    );
-
-    const availableVersions = this.parseVersions(
-      platform,
-      arch,
-      fetchedDragonwellJson
-    );
-
-    if (core.isDebug()) {
-      core.startGroup('Print information about available versions');
-      core.debug(availableVersions.map(item => item.jdk_version).join(', '));
-      core.endGroup();
-    }
-
-    return availableVersions;
-  }
-
-  protected async downloadTool(
-    javaRelease: JavaDownloadRelease
-  ): Promise<JavaInstallerResults> {
-    core.info(
-      `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
-    );
-    const javaArchivePath = await tc.downloadTool(javaRelease.url);
-
-    core.info(`Extracting Java archive...`);
-
-    const extractedJavaPath = await extractJdkFile(
-      javaArchivePath,
-      getDownloadArchiveExtension()
-    );
-
-    const archiveName = fs.readdirSync(extractedJavaPath)[0];
-    const archivePath = path.join(extractedJavaPath, archiveName);
-    const version = this.getToolcacheVersionName(javaRelease.version);
-
-    const javaPath = await tc.cacheDir(
-      archivePath,
-      this.toolcacheFolderName,
-      version,
-      this.architecture
-    );
-
-    return {version: javaRelease.version, path: javaPath};
-  }
-
-  private parseVersions(
-    platform: string,
-    arch: string,
-    dragonwellVersions: IDragonwellAllVersions
-  ): IDragonwellVersions[] {
-    const eligibleVersions: IDragonwellVersions[] = [];
-
-    for (const majorVersion in dragonwellVersions) {
-      const majorVersionMap = dragonwellVersions[majorVersion];
-      for (let jdkVersion in majorVersionMap) {
-        const jdkVersionMap = majorVersionMap[jdkVersion];
-        if (!(platform in jdkVersionMap)) {
-          continue;
-        }
-        const platformMap = jdkVersionMap[platform];
-        if (!(arch in platformMap)) {
-          continue;
-        }
-        const archMap = platformMap[arch];
-
-        if (jdkVersion === 'latest') {
-          continue;
-        }
-
-        // Some version of Dragonwell JDK are numerated with help of non-semver notation (more then 3 digits).
-        // Common practice is to transform excess digits to the so-called semver build part, which is prefixed with the plus sign, to be able to operate with them using semver tools.
-        if (jdkVersion.split('.').length > 3) {
-          jdkVersion = convertVersionToSemver(jdkVersion);
-        }
-
-        for (const edition in archMap) {
-          eligibleVersions.push({
-            os: platform,
-            architecture: arch,
-            jdk_version: jdkVersion,
-            checksum: archMap[edition].sha256 ?? '',
-            download_link: archMap[edition].download_url,
-            edition: edition,
-            image_type: 'jdk'
-          });
-          break; // Get the first available link to the JDK. In most cases it should point to the Extended version of JDK, in rare cases like with v17 it points to the Standard version (the only available).
-        }
-      }
-    }
-
-    const sortedVersions = this.sortParsedVersions(eligibleVersions);
-
-    return sortedVersions;
-  }
-
-  // Sorts versions in descending order as by default data in JSON isn't sorted
-  private sortParsedVersions(
-    eligibleVersions: IDragonwellVersions[]
-  ): IDragonwellVersions[] {
-    const sortedVersions = eligibleVersions.sort((versionObj1, versionObj2) => {
-      const version1 = versionObj1.jdk_version;
-      const version2 = versionObj2.jdk_version;
-      return semver.compareBuild(version1, version2);
-    });
-    return sortedVersions.reverse();
-  }
-
-  private getPlatformOption(): string {
-    switch (process.platform) {
-      case 'win32':
-        return 'windows';
-      default:
-        return process.platform;
-    }
-  }
-
-  private async fetchJsonFromPrimaryUrl(): Promise<IDragonwellAllVersions | null> {
-    const primaryUrl = 'https://dragonwell-jdk.io/map_with_checksum.json';
-    try {
-      core.debug(
-        `Trying to fetch available Dragonwell versions info from the primary url: ${primaryUrl}`
-      );
-      const fetchedDragonwellJson = (
-        await this.http.getJson<IDragonwellAllVersions>(primaryUrl)
-      ).result;
-      return fetchedDragonwellJson;
-    } catch (err) {
-      core.debug(
-        `Fetching Dragonwell versions info from the primary link: ${primaryUrl} ended up with the error: ${
-          (err as Error).message
-        }`
-      );
-      return null;
-    }
-  }
-
-  private async fetchJsonFromBackupUrl(): Promise<IDragonwellAllVersions | null> {
-    const owner = 'dragonwell-releng';
-    const repository = 'dragonwell-setup-java';
-    const branch = 'main';
-    const filePath = 'releases.json';
-
-    const backupUrl = `https://api.github.com/repos/${owner}/${repository}/contents/${filePath}?ref=${branch}`;
-
-    const headers = getGitHubHttpHeaders();
-
-    try {
-      core.debug(
-        `Trying to fetch available Dragonwell versions info from the backup url: ${backupUrl}`
-      );
-      const fetchedDragonwellJson = (
-        await this.http.getJson<IDragonwellAllVersions>(backupUrl, headers)
-      ).result;
-      return fetchedDragonwellJson;
-    } catch (err) {
-      core.debug(
-        `Fetching Dragonwell versions info from the backup url: ${backupUrl} ended up with the error: ${
-          (err as Error).message
-        }`
-      );
-      return null;
-    }
-  }
-}

src/distributions/dragonwell/models.ts

@@ -1,26 +0,0 @@
-export interface IDragonwellAllVersions {
-  [major: string]: {
-    [jdk_version: string]: {
-      [os: string]: {
-        [arch: string]: {
-          [edition: string]: {
-            content_type: string;
-            sha256: string;
-            name: string;
-            download_url: string;
-          };
-        };
-      };
-    };
-  };
-}
-
-export interface IDragonwellVersions {
-  os: string;
-  architecture: string;
-  jdk_version: string;
-  checksum: string;
-  download_link: string;
-  edition: string;
-  image_type: string;
-}

src/distributions/liberica/installer.ts

@@ -1,17 +1,9 @@
-import {JavaBase} from '../base-installer';
+import { JavaBase } from '../base-installer';
-import {
+import { JavaDownloadRelease, JavaInstallerOptions, JavaInstallerResults } from '../base-models';
-  JavaDownloadRelease,
-  JavaInstallerOptions,
-  JavaInstallerResults
-} from '../base-models';
 import semver from 'semver';
-import {
+import { extractJdkFile, getDownloadArchiveExtension, isVersionSatisfies } from '../../util';
-  extractJdkFile,
-  getDownloadArchiveExtension,
-  isVersionSatisfies
-} from '../../util';
 import * as core from '@actions/core';
-import {ArchitectureOptions, LibericaVersion, OsVersions} from './models';
+import { ArchitectureOptions, LibericaVersion, OsVersions } from './models';
 import * as tc from '@actions/tool-cache';
 import fs from 'fs';
 import path from 'path';
@@ -25,9 +17,7 @@ export class LibericaDistributions extends JavaBase {
     super('Liberica', installerOptions);
   }
 
-  protected async downloadTool(
+  protected async downloadTool(javaRelease: JavaDownloadRelease): Promise<JavaInstallerResults> {
-    javaRelease: JavaDownloadRelease
-  ): Promise<JavaInstallerResults> {
     core.info(
       `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
     );
@@ -47,12 +37,10 @@ export class LibericaDistributions extends JavaBase {
       this.architecture
     );
 
-    return {version: javaRelease.version, path: javaPath};
+    return { version: javaRelease.version, path: javaPath };
   }
 
-  protected async findPackageForDownload(
+  protected async findPackageForDownload(range: string): Promise<JavaDownloadRelease> {
-    range: string
-  ): Promise<JavaDownloadRelease> {
     const availableVersionsRaw = await this.getAvailableVersions();
 
     const availableVersions = availableVersionsRaw.map(item => ({
@@ -65,9 +53,7 @@ export class LibericaDistributions extends JavaBase {
       .sort((a, b) => -semver.compareBuild(a.version, b.version))[0];
 
     if (!satisfiedVersion) {
-      const availableOptions = availableVersions
+      const availableOptions = availableVersions.map(item => item.version).join(', ');
-        .map(item => item.version)
-        .join(', ');
       const availableOptionsMessage = availableOptions
         ? `\nAvailable versions: ${availableOptions}`
         : '';
@@ -81,20 +67,21 @@ export class LibericaDistributions extends JavaBase {
 
   private async getAvailableVersions(): Promise<LibericaVersion[]> {
     if (core.isDebug()) {
-      console.time('Retrieving available versions for Liberica took'); // eslint-disable-line no-console
+      console.time('liberica-retrieve-available-versions');
     }
     const url = this.prepareAvailableVersionsUrl();
 
-    core.debug(`Gathering available versions from '${url}'`);
+    if (core.isDebug()) {
+      core.debug(`Gathering available versions from '${url}'`);
+    }
 
-    const availableVersions =
+    const availableVersions = (await this.http.getJson<LibericaVersion[]>(url)).result ?? [];
-      (await this.http.getJson<LibericaVersion[]>(url)).result ?? [];
 
     if (core.isDebug()) {
       core.startGroup('Print information about available versions');
-      console.timeEnd('Retrieving available versions for Liberica took'); // eslint-disable-line no-console
+      console.timeEnd('liberica-retrieve-available-versions');
-      core.debug(`Available versions: [${availableVersions.length}]`);
+      console.log(`Available versions: [${availableVersions.length}]`);
-      core.debug(availableVersions.map(item => item.version).join(', '));
+      console.log(availableVersions.map(item => item.version));
       core.endGroup();
     }
 
@@ -108,8 +95,7 @@ export class LibericaDistributions extends JavaBase {
       ...this.getArchitectureOptions(),
       'build-type': this.stable ? 'all' : 'ea',
       'installation-type': 'archive',
-      fields:
+      fields: 'downloadUrl,version,featureVersion,interimVersion,updateVersion,buildVersion'
-        'downloadUrl,version,featureVersion,interimVersion,updateVersion,buildVersion'
     };
 
     const searchParams = new URLSearchParams(urlOptions).toString();
@@ -129,15 +115,15 @@ export class LibericaDistributions extends JavaBase {
     const arch = this.distributionArchitecture();
     switch (arch) {
       case 'x86':
-        return {bitness: '32', arch: 'x86'};
+        return { bitness: '32', arch: 'x86' };
       case 'x64':
-        return {bitness: '64', arch: 'x86'};
+        return { bitness: '64', arch: 'x86' };
       case 'armv7':
-        return {bitness: '32', arch: 'arm'};
+        return { bitness: '32', arch: 'arm' };
       case 'aarch64':
-        return {bitness: '64', arch: 'arm'};
+        return { bitness: '64', arch: 'arm' };
       case 'ppc64le':
-        return {bitness: '64', arch: 'ppc'};
+        return { bitness: '64', arch: 'ppc' };
       default:
         throw new Error(
           `Architecture '${this.architecture}' is not supported. Supported architectures: ${supportedArchitectures}`
@@ -145,9 +131,7 @@ export class LibericaDistributions extends JavaBase {
     }
   }
 
-  private getPlatformOption(
+  private getPlatformOption(platform: NodeJS.Platform = process.platform): OsVersions {
-    platform: NodeJS.Platform = process.platform
-  ): OsVersions {
     switch (platform) {
       case 'darwin':
         return 'macos';
@@ -166,11 +150,8 @@ export class LibericaDistributions extends JavaBase {
   }
 
   private convertVersionToSemver(version: LibericaVersion): string {
-    const {buildVersion, featureVersion, interimVersion, updateVersion} =
+    let { buildVersion, featureVersion, interimVersion, updateVersion } = version;
-      version;
+    const mainVersion = [featureVersion, interimVersion, updateVersion].join('.');
-    const mainVersion = [featureVersion, interimVersion, updateVersion].join(
-      '.'
-    );
     if (buildVersion != 0) {
       return `${mainVersion}+${buildVersion}`;
     }
@@ -178,7 +159,7 @@ export class LibericaDistributions extends JavaBase {
   }
 
   protected distributionArchitecture(): string {
-    const arch = super.distributionArchitecture();
+    let arch = super.distributionArchitecture();
     switch (arch) {
       case 'arm':
         return 'armv7';

src/distributions/liberica/models.ts

@@ -3,12 +3,7 @@
 export type Bitness = '32' | '64';
 export type ArchType = 'arm' | 'ppc' | 'sparc' | 'x86';
 
-export type OsVersions =
+export type OsVersions = 'linux' | 'linux-musl' | 'macos' | 'solaris' | 'windows';
-  | 'linux'
-  | 'linux-musl'
-  | 'macos'
-  | 'solaris'
-  | 'windows';
 
 export interface ArchitectureOptions {
   bitness: Bitness;