Rename v2-preview to v2 in docs and tests

.github/workflows/build.yml

@@ -20,12 +20,14 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
       - uses: actions/checkout@v2
-      - name: Setup Node.JS 16
+      - name: Setup Node.JS 12
         uses: actions/setup-node@v2
         with:
-          node-version: 16.x
-          cache: npm
+          node-version: 12.x
       - run: npm ci
       - run: npm run build
       - run: npm run format-check
-      - run: npm test
+      - run: npm test
+      - name: Verify no unstaged changes
+        if: runner.os != 'windows'
+        run: bash __tests__/verify-no-unstaged-changes.sh

.github/workflows/check-dist.yml

@@ -1,51 +0,0 @@
-# `dist/index.js` is a special file in Actions.
-# When you reference an action with `uses:` in a workflow,
-# `index.js` is the code that will run.
-# For our project, we generate this file through a build process from other source files.
-# We need to make sure the checked-in `index.js` actually matches what we expect it to be.
-name: Check dist/
-
-on:
-  push:
-    branches:
-      - main
-    paths-ignore:
-      - '**.md'
-  pull_request:
-    paths-ignore:
-      - '**.md'
-  workflow_dispatch:
-
-jobs:
-  check-dist:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set Node.js 16.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: 16.x
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Rebuild the dist/ directory
-        run: npm run build
-
-      - name: Compare the expected and actual dist/ directories
-        run: |
-          if [ "$(git diff --ignore-space-at-eol dist/ | wc -l)" -gt "0" ]; then
-            echo "Detected uncommitted changes after build.  See status below:"
-            git diff
-            exit 1
-          fi
-        id: diff
-
-      # If index.js was different than expected, upload the expected version as an artifact
-      - uses: actions/upload-artifact@v2
-        if: ${{ failure() && steps.diff.conclusion == 'failure' }}
-        with:
-          name: dist
-          path: dist/

.github/workflows/e2e-cache.yml

@@ -1,113 +0,0 @@
-name: Validate cache
-on:
-  push:
-    branches:
-      - main
-      - releases/*
-    paths-ignore:
-      - '**.md'
-  pull_request:
-    paths-ignore:
-      - '**.md'
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  gradle-save:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Run setup-java with the cache for gradle
-        uses: ./
-        id: setup-java
-        with:
-          distribution: 'adopt'
-          java-version: '11'
-          cache: 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/gradle
-          if [ ! -d ~/.gradle/caches ]; then
-            echo "::error::The ~/.gradle/caches directory does not exist unexpectedly"
-            exit 1
-          fi
-  gradle-restore:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-    needs: gradle-save
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Run setup-java with the cache for gradle
-        uses: ./
-        id: setup-java
-        with:
-          distribution: 'adopt'
-          java-version: '11'
-          cache: 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/
-  maven-save:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Run setup-java with the cache for maven
-        uses: ./
-        id: setup-java
-        with:
-          distribution: 'adopt'
-          java-version: '11'
-          cache: maven
-      - name: Create files to cache
-        run: |
-          mvn verify -f __tests__/cache/maven/pom.xml
-          if [ ! -d ~/.m2/repository ]; then
-            echo "::error::The ~/.m2/repository directory does not exist unexpectedly"
-            exit 1
-          fi
-  maven-restore:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-    needs: maven-save
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Run setup-java with the cache for maven
-        uses: ./
-        id: setup-java
-        with:
-          distribution: 'adopt'
-          java-version: '11'
-          cache: maven
-      - name: Confirm that ~/.m2/repository directory has been made
-        run: |
-          if [ ! -d ~/.m2/repository ]; then
-            echo "::error::The ~/.m2/repository directory does not exist unexpectedly"
-            exit 1
-          fi
-          ls ~/.m2/repository

.github/workflows/e2e-local-file.yml

@@ -83,41 +83,4 @@ jobs:
           architecture: x64
       - name: Verify Java version
         run: bash __tests__/verify-java.sh "11.0" "${{ steps.setup-java.outputs.path }}"
-        shell: bash
-
-  setup-java-local-file-temurin:
-    name: Validate installation from local file Eclipse Temurin
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Download Eclipse Temurin file
-        run: |
-          if ($IsLinux) {
-            $downloadUrl = "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz"
-            $localFilename = "java_package.tar.gz"
-          } elseif ($IsMacOS) {
-            $downloadUrl = "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.12_7.tar.gz"
-            $localFilename = "java_package.tar.gz"
-          } elseif ($IsWindows) {
-            $downloadUrl = "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_windows_hotspot_11.0.12_7.zip"
-            $localFilename = "java_package.zip"
-          }
-          echo "LocalFilename=$localFilename" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          (New-Object System.Net.WebClient).DownloadFile($downloadUrl, "$env:RUNNER_TEMP/$localFilename")
-        shell: pwsh
-      - name: setup-java
-        uses: ./
-        id: setup-java
-        with:
-          distribution: 'jdkfile'
-          jdkFile: ${{ runner.temp }}/${{ env.LocalFilename }}
-          java-version: '11.0.0-ea'
-          architecture: x64
-      - name: Verify Java version
-        run: bash __tests__/verify-java.sh "11.0.12" "${{ steps.setup-java.outputs.path }}"
-        shell: bash
+        shell: bash

.github/workflows/e2e-versions.yml

@@ -9,9 +9,7 @@ on:
   pull_request:
     paths-ignore:
       - '**.md'
-  schedule:
-    - cron:  '0 */12 * * *'
-  workflow_dispatch:
+
 jobs:
   setup-java-major-versions:
     name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
@@ -20,11 +18,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['temurin', 'adopt', 'adopt-openj9', 'zulu', 'liberica', 'microsoft' ] # internally 'adopt-hotspot' is the same as 'adopt'
-        version: ['8', '11', '16']
-        exclude:
-        - distribution: microsoft
-          version: 8
+        distribution: ['adopt', 'zulu']
+        version: ['8', '11', '15']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -46,11 +41,21 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['temurin', 'zulu', 'liberica']
+        distribution: ['adopt', 'zulu']
         version:
         - '11.0'
-        - '8.0.302'
-        - '16.0.2+7'
+        - '8.0.282'
+        - '11.0.2+7'
+        include:
+          - distribution: 'adopt'
+            version: '12.0.2+10.1'
+            os: macos-latest
+          - distribution: 'adopt'
+            version: '12.0.2+10.1'
+            os: windows-latest
+          - distribution: 'adopt'
+            version: '12.0.2+10.1'
+            os: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -72,7 +77,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['temurin', 'zulu', 'liberica']
+        distribution: ['adopt', 'zulu']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -86,7 +91,7 @@ jobs:
       - name: Verify Java
         run: bash __tests__/verify-java.sh "11" "${{ steps.setup-java.outputs.path }}"
         shell: bash
-
+  
   setup-java-ea-versions-zulu:
     name: zulu ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
     needs: setup-java-major-minor-versions
@@ -109,15 +114,15 @@ jobs:
         run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
         shell: bash
 
-  setup-java-ea-versions-temurin:
-    name: temurin ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
+  setup-java-ea-versions-adopt:
+    name: adopt ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
     needs: setup-java-major-minor-versions
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        version: ['17-ea']
+        version: ['17-ea', '15.0.0-ea.14.1.202003160455']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -126,7 +131,7 @@ jobs:
         id: setup-java
         with:
           java-version: ${{ matrix.version }}
-          distribution: temurin
+          distribution: adopt
       - name: Verify Java
         run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
         shell: bash
@@ -139,9 +144,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['temurin', 'zulu', 'liberica']
+        distribution: ['adopt', 'zulu']
         java-package: ['jre']
-        version: ['16.0']
+        version:
+        - '15.0'
         include:
           - distribution: 'zulu'
             java-package: jre+fx
@@ -151,18 +157,6 @@ jobs:
             java-package: jdk+fx
             version: '8.0.242'
             os: ubuntu-latest
-          - distribution: 'liberica'
-            java-package: jdk+fx
-            version: '8'
-            os: ubuntu-latest
-          - distribution: 'liberica'
-            java-package: jre+fx
-            version: '11'
-            os: ubuntu-latest
-        exclude:
-          # Eclipse Temurin currently doesn't publish JREs, only JDKs
-          - distribution: 'temurin'
-            java-package: 'jre'
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -177,17 +171,16 @@ jobs:
         run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
         shell: bash
 
-  # Only Liberica and Zulu provide x86
-  setup-java-x86:
-    name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-${{ matrix.architecture }}) - ${{ matrix.os }}
+  setup-java-custom-architecture:
+    name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-x86) - ${{ matrix.os }}
     needs: setup-java-major-minor-versions
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        # x86 is not supported on macOS
+        # Only Zulu provides x86 arch for now and only for windows / ubuntu
         os: [windows-latest, ubuntu-latest]
-        distribution: ['liberica', 'zulu']
+        distribution: ['zulu']
         version: ['11']
     steps:
       - name: Checkout
@@ -198,9 +191,7 @@ jobs:
         with:
           distribution: ${{ matrix.distribution }}
           java-version: ${{ matrix.version }}
-          architecture: 'x86'
+          architecture: x86
       - name: Verify Java
         run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
-        shell: bash
-
-  # Only Microsoft provides AArch64. However, GitHub-hosted runners do not support this architecture.
+        shell: bash

.github/workflows/licensed.yml

@@ -1,13 +1,8 @@
 name: Licensed
 
 on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-  workflow_dispatch:
+  push: {branches: main}
+  pull_request: {branches: main}
 
 jobs:
   test:
@@ -19,7 +14,7 @@ jobs:
       - name: Install licensed
         run: |
           cd $RUNNER_TEMP
-          curl -Lfs -o licensed.tar.gz https://github.com/github/licensed/releases/download/3.4.4/licensed-3.4.4-linux-x64.tar.gz
+          curl -Lfs -o licensed.tar.gz https://github.com/github/licensed/releases/download/2.12.2/licensed-2.12.2-linux-x64.tar.gz
           sudo tar -xzf licensed.tar.gz
           sudo mv licensed /usr/local/bin/licensed
-      - run: licensed status
+      - run: licensed status

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

@@ -1,28 +0,0 @@
-name: Release new action version
-on:
-  release:
-    types: [released]
-  workflow_dispatch:
-    inputs:
-      TAG_NAME:
-        description: 'Tag name that the major tag will point to'
-        required: true
-
-env:
-  TAG_NAME: ${{ github.event.inputs.TAG_NAME || github.event.release.tag_name }}
-permissions:
-  contents: write
-
-jobs:
-  update_tag:
-    name: Update the major tag to include the ${{ github.event.inputs.TAG_NAME || github.event.release.tag_name }} changes
-    environment:
-      name: releaseNewActionVersion
-    runs-on: ubuntu-latest
-    steps:
-    - name: Update the ${{ env.TAG_NAME }} tag
-      id: update-major-tag
-      uses: actions/publish-action@v0.1.0
-      with:
-        source-tag: ${{ env.TAG_NAME }}
-        slack-webhook: ${{ secrets.SLACK_WEBHOOK }}

.licensed.yml

@@ -3,7 +3,6 @@ sources:
 
 allowed:
   - apache-2.0
-  - 0bsd
   - bsd-2-clause
   - bsd-3-clause
   - isc

README.md

@@ -11,25 +11,23 @@ This action provides the following functionality for GitHub Actions runners:
 - Configuring runner for publishing using Gradle
 - Configuring runner for using GPG private key
 - Registering problem matchers for error output
-- Caching dependencies managed by Apache Maven
-- Caching dependencies managed by Gradle
 
 ## V2 vs V1
-- V2 supports custom distributions and provides support for Zulu OpenJDK, Eclipse Temurin and Adopt OpenJDK  out of the box. V1 supports only Zulu OpenJDK
+- V2 supports custom distributions and provides support for Zulu OpenJDK and Adopt OpenJDK out of the box. V1 supports only Zulu OpenJDK
 - V2 requires you to specify distribution along with the version. V1 defaults to Zulu OpenJDK, only version input is required. Follow [the migration guide](docs/switching-to-v2.md) to switch from V1 to V2
 
 ## Usage
-Inputs `java-version` and `distribution` are mandatory. See [Supported distributions](#supported-distributions) section for a list of available options.
+Inputs `java-version` and `distribution` are mandatory. See [Supported distributions](../README.md#Supported-distributions) section for a list of available options.
 
 ### Basic
-**Eclipse Temurin**
+**Adopt OpenJDK**
 ```yaml
 steps:
 - uses: actions/checkout@v2
 - uses: actions/setup-java@v2
   with:
-    distribution: 'temurin' # See 'Supported distributions' for available options
-    java-version: '17'
+    distribution: 'adopt' # See 'Supported distributions' for available options
+    java-version: '11'
 - run: java -cp java HelloWorldApp
 ```
 
@@ -46,57 +44,19 @@ steps:
 
 #### Supported version syntax
 The `java-version` input supports an exact version or a version range using [SemVer](https://semver.org/) notation:
-- major versions: `8`, `11`, `16`, `17`
-- more specific versions: `17.0`, `11.0`, `11.0.4`, `8.0.232`, `8.0.282+8`
+- major versions: `8`, `11`, `15`
+- more specific versions: `11.0`, `11.0.4`, `8.0.232`, `8.0.282+8`
 - early access (EA) versions: `15-ea`, `15.0.0-ea`, `15.0.0-ea.2`, `15.0.0+2-ea`
 
 #### Supported distributions
 Currently, the following distributions are supported:
-| Keyword | Distribution | Official site | License
+| Keyword | Distribution | Official site | License |
 |-|-|-|-|
-| `temurin` | Eclipse Temurin | [Link](https://adoptium.net/) | [Link](https://adoptium.net/about.html)
 | `zulu` | Zulu OpenJDK | [Link](https://www.azul.com/downloads/zulu-community/?package=jdk) | [Link](https://www.azul.com/products/zulu-and-zulu-enterprise/zulu-terms-of-use/) |
-| `adopt` or `adopt-hotspot` | Adopt OpenJDK Hotspot | [Link](https://adoptopenjdk.net/) | [Link](https://adoptopenjdk.net/about.html) |
-| `adopt-openj9` | Adopt OpenJDK OpenJ9 | [Link](https://adoptopenjdk.net/) | [Link](https://adoptopenjdk.net/about.html) |
-| `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)
+| `adopt` | Adopt OpenJDK | [Link](https://adoptopenjdk.net/) | [Link](https://adoptopenjdk.net/about.html)
 
 **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:** Adopt OpenJDK 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/).
-
-### Caching packages dependencies
-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 and maven. 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`
-- maven: `**/pom.xml`
-
-The cache input is optional, and caching is turned off by default.
-
-#### Caching gradle dependencies
-```yaml
-steps:
-- uses: actions/checkout@v2
-- uses: actions/setup-java@v2
-  with:
-    distribution: 'temurin'
-    java-version: '11'
-    cache: 'gradle'
-- run: ./gradlew build --no-daemon
-```
-
-#### Caching maven dependencies
-```yaml
-steps:
-- uses: actions/checkout@v2
-- uses: actions/setup-java@v2
-  with:
-    distribution: 'temurin'
-    java-version: '11'
-    cache: 'maven'
-- name: Build with Maven
-  run: mvn -B package --file pom.xml
-```
-
 ### 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.
 
@@ -137,10 +97,8 @@ jobs:
 
 ### Advanced
 - [Selecting a Java distribution](docs/advanced-usage.md#Selecting-a-Java-distribution)
-  - [Eclipse Temurin](docs/advanced-usage.md#Eclipse-Temurin)
   - [Adopt](docs/advanced-usage.md#Adopt)
   - [Zulu](docs/advanced-usage.md#Zulu)
-  - [Liberica](docs/advanced-usage.md#Liberica)
 - [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)
@@ -152,8 +110,8 @@ jobs:
 
 ## License
 
-The scripts and documentation in this project are released under the [MIT License](LICENSE).
+The scripts and documentation in this project are released under the [MIT License](LICENSE)
 
 ## Contributions
 
-Contributions are welcome! See [Contributor's Guide](CONTRIBUTING.md)
+Contributions are welcome!  See [Contributor's Guide](docs/contributors.md)

__tests__/auth.test.ts

@@ -1,7 +1,6 @@
 import io = require('@actions/io');
 import fs = require('fs');
 import path = require('path');
-import * as core from '@actions/core';
 import os from 'os';
 
 import * as auth from '../src/auth';
@@ -11,14 +10,11 @@ const settingsFile = path.join(m2Dir, auth.SETTINGS_FILE);
 
 describe('auth tests', () => {
   let spyOSHomedir: jest.SpyInstance;
-  let spyInfo: jest.SpyInstance;
 
   beforeEach(async () => {
     await io.rmRF(m2Dir);
     spyOSHomedir = jest.spyOn(os, 'homedir');
     spyOSHomedir.mockReturnValue(__dirname);
-    spyInfo = jest.spyOn(core, 'info');
-    spyInfo.mockImplementation(() => null);
   }, 300000);
 
   afterAll(async () => {

__tests__/cache.test.ts

@@ -1,245 +0,0 @@
-import { mkdtempSync } from 'fs';
-import { tmpdir } from 'os';
-import { join } from 'path';
-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';
-
-describe('dependency cache', () => {
-  const ORIGINAL_RUNNER_OS = process.env['RUNNER_OS'];
-  const ORIGINAL_GITHUB_WORKSPACE = process.env['GITHUB_WORKSPACE'];
-  const ORIGINAL_CWD = process.cwd();
-  let workspace: string;
-  let spyInfo: jest.SpyInstance<void, Parameters<typeof core.info>>;
-  let spyWarning: jest.SpyInstance<void, Parameters<typeof core.warning>>;
-  let spyDebug: jest.SpyInstance<void, Parameters<typeof core.debug>>;
-  let spySaveState: jest.SpyInstance<void, Parameters<typeof core.saveState>>;
-
-  beforeEach(() => {
-    workspace = mkdtempSync(join(tmpdir(), 'setup-java-cache-'));
-    switch (os.platform()) {
-      case 'darwin':
-        process.env['RUNNER_OS'] = 'macOS';
-        break;
-      case 'win32':
-        process.env['RUNNER_OS'] = 'Windows';
-        break;
-      case 'linux':
-        process.env['RUNNER_OS'] = 'Linux';
-        break;
-      default:
-        throw new Error(`unknown platform: ${os.platform()}`);
-    }
-    process.chdir(workspace);
-    // This hack is necessary because @actions/glob ignores files not in the GITHUB_WORKSPACE
-    // https://git.io/Jcxig
-    process.env['GITHUB_WORKSPACE'] = projectRoot(workspace);
-  });
-
-  beforeEach(() => {
-    spyInfo = jest.spyOn(core, 'info');
-    spyInfo.mockImplementation(() => null);
-
-    spyWarning = jest.spyOn(core, 'warning');
-    spyWarning.mockImplementation(() => null);
-
-    spyDebug = jest.spyOn(core, 'debug');
-    spyDebug.mockImplementation(() => null);
-
-    spySaveState = jest.spyOn(core, 'saveState');
-    spySaveState.mockImplementation(() => null);
-  });
-
-  afterEach(() => {
-    process.chdir(ORIGINAL_CWD);
-    process.env['GITHUB_WORKSPACE'] = ORIGINAL_GITHUB_WORKSPACE;
-    process.env['RUNNER_OS'] = ORIGINAL_RUNNER_OS;
-    resetState();
-  });
-
-  describe('restore', () => {
-    let spyCacheRestore: jest.SpyInstance<
-      ReturnType<typeof cache.restoreCache>,
-      Parameters<typeof cache.restoreCache>
-    >;
-
-    beforeEach(() => {
-      spyCacheRestore = jest
-        .spyOn(cache, 'restoreCache')
-        .mockImplementation((paths: string[], primaryKey: string) => Promise.resolve(undefined));
-      spyWarning.mockImplementation(() => null);
-    });
-
-    it('throws error if unsupported package manager specified', () => {
-      return expect(restore('ant')).rejects.toThrowError('unknown package manager specified: ant');
-    });
-
-    describe('for maven', () => {
-      it('throws error if no pom.xml found', async () => {
-        await expect(restore('maven')).rejects.toThrowError(
-          `No file in ${projectRoot(
-            workspace
-          )} matched to [**/pom.xml], make sure you have checked out the target repository`
-        );
-      });
-      it('downloads cache', async () => {
-        createFile(join(workspace, 'pom.xml'));
-
-        await restore('maven');
-        expect(spyCacheRestore).toBeCalled();
-        expect(spyWarning).not.toBeCalled();
-        expect(spyInfo).toBeCalledWith('maven cache is not found');
-      });
-    });
-    describe('for gradle', () => {
-      it('throws error if no build.gradle found', async () => {
-        await expect(restore('gradle')).rejects.toThrowError(
-          `No file in ${projectRoot(
-            workspace
-          )} matched to [**/*.gradle*,**/gradle-wrapper.properties], 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');
-        expect(spyCacheRestore).toBeCalled();
-        expect(spyWarning).not.toBeCalled();
-        expect(spyInfo).toBeCalledWith('gradle cache is not found');
-      });
-      it('downloads cache based on build.gradle.kts', async () => {
-        createFile(join(workspace, 'build.gradle.kts'));
-
-        await restore('gradle');
-        expect(spyCacheRestore).toBeCalled();
-        expect(spyWarning).not.toBeCalled();
-        expect(spyInfo).toBeCalledWith('gradle cache is not found');
-      });
-    });
-  });
-  describe('save', () => {
-    let spyCacheSave: jest.SpyInstance<
-      ReturnType<typeof cache.saveCache>,
-      Parameters<typeof cache.saveCache>
-    >;
-
-    beforeEach(() => {
-      spyCacheSave = jest
-        .spyOn(cache, 'saveCache')
-        .mockImplementation((paths: string[], key: string) => Promise.resolve(0));
-      spyWarning.mockImplementation(() => null);
-    });
-
-    it('throws error if unsupported package manager specified', () => {
-      return expect(save('ant')).rejects.toThrowError('unknown package manager specified: ant');
-    });
-
-    describe('for maven', () => {
-      it('uploads cache even if no pom.xml found', async () => {
-        createStateForMissingBuildFile();
-        await save('maven');
-        expect(spyCacheSave).toBeCalled();
-        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.toBeCalled();
-        expect(spyWarning).toBeCalledWith('Error retrieving key from state.');
-      });
-      it('uploads cache', async () => {
-        createFile(join(workspace, 'pom.xml'));
-        createStateForSuccessfulRestore();
-
-        await save('maven');
-        expect(spyCacheSave).toBeCalled();
-        expect(spyWarning).not.toBeCalled();
-        expect(spyInfo).toBeCalledWith(expect.stringMatching(/^Cache saved with the key:.*/));
-      });
-    });
-    describe('for gradle', () => {
-      it('uploads cache even if no build.gradle found', async () => {
-        createStateForMissingBuildFile();
-
-        await save('gradle');
-        expect(spyCacheSave).toBeCalled();
-        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.toBeCalled();
-        expect(spyWarning).toBeCalledWith('Error retrieving key from state.');
-      });
-      it('uploads cache based on build.gradle', async () => {
-        createFile(join(workspace, 'build.gradle'));
-        createStateForSuccessfulRestore();
-
-        await save('gradle');
-        expect(spyCacheSave).toBeCalled();
-        expect(spyWarning).not.toBeCalled();
-        expect(spyInfo).toBeCalledWith(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).toBeCalled();
-        expect(spyWarning).not.toBeCalled();
-        expect(spyInfo).toBeCalledWith(expect.stringMatching(/^Cache saved with the key:.*/));
-      });
-    });
-  });
-});
-
-function resetState() {
-  jest.spyOn(core, 'getState').mockReset();
-}
-
-/**
- * Create states to emulate a restore process without build file.
- */
-function createStateForMissingBuildFile() {
-  jest.spyOn(core, 'getState').mockImplementation(name => {
-    switch (name) {
-      case 'cache-primary-key':
-        return 'setup-java-cache-';
-      default:
-        return '';
-    }
-  });
-}
-
-/**
- * Create states to emulate a successful restore process.
- */
-function createStateForSuccessfulRestore() {
-  jest.spyOn(core, 'getState').mockImplementation(name => {
-    switch (name) {
-      case 'cache-primary-key':
-        return 'setup-java-cache-primary-key';
-      case 'cache-matched-key':
-        return 'setup-java-cache-matched-key';
-      default:
-        return '';
-    }
-  });
-}
-
-function createFile(path: string) {
-  core.info(`created a file at ${path}`);
-  fs.writeFileSync(path, '');
-}
-
-function projectRoot(workspace: string): string {
-  if (os.platform() === 'darwin') {
-    return `/private${workspace}`;
-  } else {
-    return workspace;
-  }
-}

__tests__/cache/gradle/.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/gradle/build.gradle

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

__tests__/cache/maven/.gitignore

@@ -1,11 +0,0 @@
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-# https://github.com/takari/maven-wrapper#usage-without-binary-jar
-.mvn/wrapper/maven-wrapper.jar

__tests__/cache/maven/pom.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>io.github.actions</groupId>
-    <artifactId>setup-java-maven-example</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <dependencies>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>5.7.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>

__tests__/cleanup-java.test.ts

@@ -1,75 +0,0 @@
-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';
-
-describe('cleanup', () => {
-  let spyWarning: jest.SpyInstance<void, Parameters<typeof core.warning>>;
-  let spyInfo: jest.SpyInstance<void, Parameters<typeof core.info>>;
-  let spyCacheSave: jest.SpyInstance<
-    ReturnType<typeof cache.saveCache>,
-    Parameters<typeof cache.saveCache>
-  >;
-  let spyJobStatusSuccess: jest.SpyInstance;
-
-  beforeEach(() => {
-    spyWarning = jest.spyOn(core, 'warning');
-    spyWarning.mockImplementation(() => null);
-    spyInfo = jest.spyOn(core, 'info');
-    spyInfo.mockImplementation(() => null);
-    spyCacheSave = jest.spyOn(cache, 'saveCache');
-    spyJobStatusSuccess = jest.spyOn(util, 'isJobStatusSuccess');
-    spyJobStatusSuccess.mockReturnValue(true);
-    createStateForSuccessfulRestore();
-  });
-  afterEach(() => {
-    resetState();
-  });
-
-  it('does not fail nor warn even when the save provess throws a ReserveCacheError', async () => {
-    spyCacheSave.mockImplementation((paths: string[], key: string) =>
-      Promise.reject(
-        new cache.ReserveCacheError(
-          'Unable to reserve cache with key, another job may be creating this cache.'
-        )
-      )
-    );
-    jest.spyOn(core, 'getInput').mockImplementation((name: string) => {
-      return name === 'cache' ? 'gradle' : '';
-    });
-    await cleanup();
-    expect(spyCacheSave).toBeCalled();
-    expect(spyWarning).not.toBeCalled();
-  });
-
-  it('does not fail even though the save process throws error', async () => {
-    spyCacheSave.mockImplementation((paths: string[], key: string) =>
-      Promise.reject(new Error('Unexpected error'))
-    );
-    jest.spyOn(core, 'getInput').mockImplementation((name: string) => {
-      return name === 'cache' ? 'gradle' : '';
-    });
-    await cleanup();
-    expect(spyCacheSave).toBeCalled();
-  });
-});
-
-function resetState() {
-  jest.spyOn(core, 'getState').mockReset();
-}
-
-/**
- * Create states to emulate a successful restore process.
- */
-function createStateForSuccessfulRestore() {
-  jest.spyOn(core, 'getState').mockImplementation(name => {
-    switch (name) {
-      case 'cache-primary-key':
-        return 'setup-java-cache-primary-key';
-      case 'cache-matched-key':
-        return 'setup-java-cache-matched-key';
-      default:
-        return '';
-    }
-  });
-}

__tests__/data/liberica.json

@@ -1,434 +0,0 @@
-[
-  {
-    "buildVersion": 36,
-    "updateVersion": 0,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/14+36/bellsoft-jdk14+36-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "14+36",
-    "featureVersion": 14
-  },
-  {
-    "buildVersion": 9,
-    "updateVersion": 11,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/11.0.11+9/bellsoft-jdk11.0.11+9-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "11.0.11+9",
-    "featureVersion": 11
-  },
-  {
-    "buildVersion": 8,
-    "updateVersion": 1,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/14.0.1+8/bellsoft-jdk14.0.1+8-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "14.0.1+8",
-    "featureVersion": 14
-  },
-  {
-    "buildVersion": 10,
-    "updateVersion": 262,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/8u262+10/bellsoft-jdk8u262+10-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "8u262+10",
-    "featureVersion": 8
-  },
-  {
-    "buildVersion": 1,
-    "updateVersion": 275,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/8u275+1/bellsoft-jdk8u275+1-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "8u275+1",
-    "featureVersion": 8
-  },
-  {
-    "buildVersion": 1,
-    "updateVersion": 9,
-    "patchVersion": 1,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/11.0.9.1+1/bellsoft-jdk11.0.9.1+1-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "11.0.9.1+1",
-    "featureVersion": 11
-  },
-  {
-    "buildVersion": 8,
-    "updateVersion": 202,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/8u202/bellsoft-jdk8u202-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "8u202+8",
-    "featureVersion": 8
-  },
-  {
-    "buildVersion": 33,
-    "updateVersion": 0,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/12/bellsoft-jdk12-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "12+33",
-    "featureVersion": 12
-  },
-  {
-    "buildVersion": 8,
-    "updateVersion": 282,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/8u282+8/bellsoft-jdk8u282+8-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "8u282+8",
-    "featureVersion": 8
-  },
-  {
-    "buildVersion": 11,
-    "updateVersion": 9,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/11.0.9+11/bellsoft-jdk11.0.9+11-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "11.0.9+11",
-    "featureVersion": 11
-  },
-  {
-    "buildVersion": 33,
-    "updateVersion": 0,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/13/bellsoft-jdk13-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "13+33",
-    "featureVersion": 13
-  },
-  {
-    "buildVersion": 12,
-    "updateVersion": 9,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/11.0.9+12/bellsoft-jdk11.0.9+12-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "11.0.9+12",
-    "featureVersion": 11
-  },
-  {
-    "buildVersion": 7,
-    "updateVersion": 242,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/8u242+7/bellsoft-jdk8u242+7-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "8u242+7",
-    "featureVersion": 8
-  },
-  {
-    "buildVersion": 9,
-    "updateVersion": 2,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/13.0.2+9/bellsoft-jdk13.0.2+9-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "13.0.2+9",
-    "featureVersion": 13
-  },
-  {
-    "buildVersion": 9,
-    "updateVersion": 1,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/13.0.1/bellsoft-jdk13.0.1-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "13.0.1+9",
-    "featureVersion": 13
-  },
-  {
-    "buildVersion": 1,
-    "updateVersion": 265,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/8u265+1/bellsoft-jdk8u265+1-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "8u265+1",
-    "featureVersion": 8
-  },
-  {
-    "buildVersion": 9,
-    "updateVersion": 1,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/15.0.1+9/bellsoft-jdk15.0.1+9-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "15.0.1+9",
-    "featureVersion": 15
-  },
-  {
-    "buildVersion": 10,
-    "updateVersion": 272,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/8u272+10/bellsoft-jdk8u272+10-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "8u272+10",
-    "featureVersion": 8
-  },
-  {
-    "buildVersion": 7,
-    "updateVersion": 2,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/16.0.2+7/bellsoft-jdk16.0.2+7-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "16.0.2+7",
-    "featureVersion": 16
-  },
-  {
-    "buildVersion": 10,
-    "updateVersion": 6,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/11.0.6+10/bellsoft-jdk11.0.6+10-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "11.0.6+10",
-    "featureVersion": 11
-  },
-  {
-    "buildVersion": 9,
-    "updateVersion": 252,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/8u252+9/bellsoft-jdk8u252+9-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "8u252+9",
-    "featureVersion": 8
-  },
-  {
-    "buildVersion": 12,
-    "updateVersion": 212,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/8u212/bellsoft-jdk8u212-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "8u212+12",
-    "featureVersion": 8
-  },
-  {
-    "buildVersion": 10,
-    "updateVersion": 2,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/15.0.2+10/bellsoft-jdk15.0.2+10-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "15.0.2+10",
-    "featureVersion": 15
-  },
-  {
-    "buildVersion": 9,
-    "updateVersion": 10,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/11.0.10+9/bellsoft-jdk11.0.10+9-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "11.0.10+9",
-    "featureVersion": 11
-  },
-  {
-    "buildVersion": 0,
-    "updateVersion": 1,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/11.0.1/bellsoft-jdk11.0.1-macos-amd64.tar.gz",
-    "interimVersion": 0,
-    "version": "11.0.1+0",
-    "featureVersion": 11
-  },
-  {
-    "buildVersion": 7,
-    "updateVersion": 12,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/11.0.12+7/bellsoft-jdk11.0.12+7-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "11.0.12+7",
-    "featureVersion": 11
-  },
-  {
-    "buildVersion": 36,
-    "updateVersion": 0,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/16+36/bellsoft-jdk16+36-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "16+36",
-    "featureVersion": 16
-  },
-  {
-    "buildVersion": 12,
-    "updateVersion": 3,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/11.0.3/bellsoft-jdk11.0.3-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "11.0.3+12",
-    "featureVersion": 11
-  },
-  {
-    "buildVersion": 10,
-    "updateVersion": 8,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/11.0.8+10/bellsoft-jdk11.0.8+10-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "11.0.8+10",
-    "featureVersion": 11
-  },
-  {
-    "buildVersion": 7,
-    "updateVersion": 2,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/11.0.2/bellsoft-jdk11.0.2-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "11.0.2+7",
-    "featureVersion": 11
-  },
-  {
-    "buildVersion": 10,
-    "updateVersion": 5,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/11.0.5/bellsoft-jdk11.0.5-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "11.0.5+10",
-    "featureVersion": 11
-  },
-  {
-    "buildVersion": 10,
-    "updateVersion": 4,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/11.0.4/bellsoft-jdk11.0.4-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "11.0.4+10",
-    "featureVersion": 11
-  },
-  {
-    "buildVersion": 10,
-    "updateVersion": 2,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/12.0.2/bellsoft-jdk12.0.2-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "12.0.2+10",
-    "featureVersion": 12
-  },
-  {
-    "buildVersion": 12,
-    "updateVersion": 1,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/12.0.1/bellsoft-jdk12.0.1-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "12.0.1+12",
-    "featureVersion": 12
-  },
-  {
-    "buildVersion": 10,
-    "updateVersion": 1,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/13.0.1+10/bellsoft-jdk13.0.1+10-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "13.0.1+10",
-    "featureVersion": 13
-  },
-  {
-    "buildVersion": 11,
-    "updateVersion": 5,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/11.0.5+11/bellsoft-jdk11.0.5+11-macos-amd64.tar.gz",
-    "interimVersion": 0,
-    "version": "11.0.5+11",
-    "featureVersion": 11
-  },
-  {
-    "buildVersion": 11,
-    "updateVersion": 5,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/11.0.5+11/bellsoft-jdk11.0.5+11-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "11.0.5+11",
-    "featureVersion": 11
-  },
-  {
-    "buildVersion": 10,
-    "updateVersion": 292,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/8u292+10/bellsoft-jdk8u292+10-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "8u292+10",
-    "featureVersion": 8
-  },
-  {
-    "buildVersion": 11,
-    "updateVersion": 222,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/8u222/bellsoft-jdk8u222-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "8u222+11",
-    "featureVersion": 8
-  },
-  {
-    "buildVersion": 36,
-    "updateVersion": 0,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/15+36/bellsoft-jdk15+36-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "15+36",
-    "featureVersion": 15
-  },
-  {
-    "buildVersion": 10,
-    "updateVersion": 7,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/11.0.7+10/bellsoft-jdk11.0.7+10-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "11.0.7+10",
-    "featureVersion": 11
-  },
-  {
-    "buildVersion": 10,
-    "updateVersion": 232,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/8u232+10/bellsoft-jdk8u232+10-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "8u232+10",
-    "featureVersion": 8
-  },
-  {
-    "buildVersion": 8,
-    "updateVersion": 2,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/15.0.2+8/bellsoft-jdk15.0.2+8-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "15.0.2+8",
-    "featureVersion": 15
-  },
-  {
-    "buildVersion": 8,
-    "updateVersion": 302,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/8u302+8/bellsoft-jdk8u302+8-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "8u302+8",
-    "featureVersion": 8
-  },
-  {
-    "buildVersion": 12,
-    "updateVersion": 192,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/8u192.all/bellsoft-jdk1.8.0-macos-amd64.tar.gz",
-    "interimVersion": 0,
-    "version": "8u192+12",
-    "featureVersion": 8
-  },
-  {
-    "buildVersion": 13,
-    "updateVersion": 2,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/14.0.2+13/bellsoft-jdk14.0.2+13-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "14.0.2+13",
-    "featureVersion": 14
-  },
-  {
-    "buildVersion": 9,
-    "updateVersion": 1,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/16.0.1+9/bellsoft-jdk16.0.1+9-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "16.0.1+9",
-    "featureVersion": 16
-  },
-  {
-    "buildVersion": 9,
-    "updateVersion": 232,
-    "patchVersion": 0,
-    "downloadUrl": "https://github.com/bell-sw/Liberica/releases/download/8u232/bellsoft-jdk8u232-macos-amd64.zip",
-    "interimVersion": 0,
-    "version": "8u232+9",
-    "featureVersion": 8
-  }
-]

__tests__/distributors/adopt-installer.test.ts

@@ -1,6 +1,8 @@
 import { HttpClient } from '@actions/http-client';
 
-import { AdoptDistribution, AdoptImplementation } from '../../src/distributions/adopt/installer';
+import * as semver from 'semver';
+
+import { AdoptDistribution } from '../../src/distributions/adopt/installer';
 import { JavaInstallerOptions } from '../../src/distributions/base-models';
 
 let manifestData = require('../data/adopt.json') as [];
@@ -26,54 +28,26 @@ describe('getAvailableVersions', () => {
   it.each([
     [
       { 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'
+      'os=mac&architecture=x64&image_type=jdk&release_type=ga&page_size=20&page=0'
     ],
     [
       { 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'
+      'os=mac&architecture=x86&image_type=jdk&release_type=ga&page_size=20&page=0'
     ],
     [
       { 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'
+      'os=mac&architecture=x64&image_type=jre&release_type=ga&page_size=20&page=0'
     ],
     [
       { 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 },
-      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 },
-      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 },
-      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 },
-      AdoptImplementation.OpenJ9,
-      'os=mac&architecture=x64&image_type=jdk&release_type=ea&jvm_impl=openj9&page_size=20&page=0'
+      'os=mac&architecture=x64&image_type=jdk&release_type=ea&page_size=20&page=0'
     ]
   ])(
     'build correct url for %s',
-    async (
-      installerOptions: JavaInstallerOptions,
-      impl: AdoptImplementation,
-      expectedParameters
-    ) => {
-      const distribution = new AdoptDistribution(installerOptions, impl);
+    async (installerOptions: JavaInstallerOptions, expectedParameters) => {
+      const distribution = new AdoptDistribution(installerOptions);
       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}`;
+      const expectedUrl = `${baseUrl}?project=jdk&vendor=adoptopenjdk&heap_size=normal&jvm_impl=hotspot&sort_method=DEFAULT&sort_order=DESC&${expectedParameters}`;
       distribution['getPlatformOption'] = () => 'mac';
 
       await distribution['getAvailableVersions']();
@@ -102,32 +76,16 @@ describe('getAvailableVersions', () => {
         result: []
       });
 
-    const distribution = new AdoptDistribution(
-      { version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-      AdoptImplementation.Hotspot
-    );
+    const distribution = new AdoptDistribution({
+      version: '11',
+      architecture: 'x64',
+      packageType: 'jdk',
+      checkLatest: false
+    });
     const availableVersions = await distribution['getAvailableVersions']();
     expect(availableVersions).not.toBeNull();
     expect(availableVersions.length).toBe(manifestData.length * 2);
   });
-
-  it.each([
-    [AdoptImplementation.Hotspot, 'jdk', 'Java_Adopt_jdk'],
-    [AdoptImplementation.Hotspot, 'jre', 'Java_Adopt_jre'],
-    [AdoptImplementation.OpenJ9, 'jdk', 'Java_Adopt-OpenJ9_jdk'],
-    [AdoptImplementation.OpenJ9, 'jre', 'Java_Adopt-OpenJ9_jre']
-  ])(
-    'find right toolchain folder',
-    (impl: AdoptImplementation, packageType: string, expected: string) => {
-      const distribution = new AdoptDistribution(
-        { version: '11', architecture: 'x64', packageType: packageType, checkLatest: false },
-        impl
-      );
-
-      // @ts-ignore - because it is protected
-      expect(distribution.toolcacheFolderName).toBe(expected);
-    }
-  );
 });
 
 describe('findPackageForDownload', () => {
@@ -144,20 +102,24 @@ describe('findPackageForDownload', () => {
     ['15.0.1+9', '15.0.1+9'],
     ['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 },
-      AdoptImplementation.Hotspot
-    );
+    const distribution = new AdoptDistribution({
+      version: '11',
+      architecture: 'x64',
+      packageType: 'jdk',
+      checkLatest: false
+    });
     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 },
-      AdoptImplementation.Hotspot
-    );
+    const distribution = new AdoptDistribution({
+      version: '11',
+      architecture: 'x64',
+      packageType: 'jdk',
+      checkLatest: false
+    });
     distribution['getAvailableVersions'] = async () => manifestData;
     await expect(distribution['findPackageForDownload']('9.0.8')).rejects.toThrowError(
       /Could not find satisfied version for SemVer */
@@ -165,10 +127,12 @@ describe('findPackageForDownload', () => {
   });
 
   it('version is not found', async () => {
-    const distribution = new AdoptDistribution(
-      { version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-      AdoptImplementation.Hotspot
-    );
+    const distribution = new AdoptDistribution({
+      version: '11',
+      architecture: 'x64',
+      packageType: 'jdk',
+      checkLatest: false
+    });
     distribution['getAvailableVersions'] = async () => manifestData;
     await expect(distribution['findPackageForDownload']('7.x')).rejects.toThrowError(
       /Could not find satisfied version for SemVer */
@@ -176,10 +140,12 @@ describe('findPackageForDownload', () => {
   });
 
   it('version list is empty', async () => {
-    const distribution = new AdoptDistribution(
-      { version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-      AdoptImplementation.Hotspot
-    );
+    const distribution = new AdoptDistribution({
+      version: '11',
+      architecture: 'x64',
+      packageType: 'jdk',
+      checkLatest: false
+    });
     distribution['getAvailableVersions'] = async () => [];
     await expect(distribution['findPackageForDownload']('11')).rejects.toThrowError(
       /Could not find satisfied version for SemVer */

__tests__/distributors/liberica-installer.test.ts

@@ -1,196 +0,0 @@
-import { LibericaDistributions } from '../../src/distributions/liberica/installer';
-import { ArchitectureOptions, LibericaVersion } from '../../src/distributions/liberica/models';
-import { HttpClient } from '@actions/http-client';
-
-const manifestData = require('../data/liberica.json') as LibericaVersion[];
-
-describe('getAvailableVersions', () => {
-  let spyHttpClient: jest.SpyInstance;
-
-  beforeEach(() => {
-    spyHttpClient = jest.spyOn(HttpClient.prototype, 'getJson');
-    spyHttpClient.mockReturnValue({
-      statusCode: 200,
-      headers: {},
-      result: manifestData
-    });
-  });
-
-  afterEach(() => {
-    jest.resetAllMocks();
-    jest.clearAllMocks();
-    jest.restoreAllMocks();
-  });
-
-  it.each([
-    [
-      { 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 },
-      'bundle-type=jdk&bitness=32&arch=x86&build-type=ea'
-    ],
-    [
-      { 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 },
-      'bundle-type=jre&bitness=64&arch=x86&build-type=all'
-    ],
-    [
-      { 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 },
-      'bundle-type=jre-full&bitness=64&arch=arm&build-type=all'
-    ]
-  ])('build correct url for %s -> %s', async (input, urlParams) => {
-    const additionalParams =
-      '&installation-type=archive&fields=downloadUrl%2Cversion%2CfeatureVersion%2CinterimVersion%2C' +
-      'updateVersion%2CbuildVersion';
-    const distribution = new LibericaDistributions(input);
-    distribution['getPlatformOption'] = () => 'macos';
-    const buildUrl = `https://api.bell-sw.com/v1/liberica/releases?os=macos&${urlParams}${additionalParams}`;
-
-    await distribution['getAvailableVersions']();
-
-    expect(spyHttpClient.mock.calls).toHaveLength(1);
-    expect(spyHttpClient.mock.calls[0][0]).toBe(buildUrl);
-  });
-
-  it('load available versions', async () => {
-    const distribution = new LibericaDistributions({
-      version: '11',
-      architecture: 'x64',
-      packageType: 'jdk',
-      checkLatest: false
-    });
-    const availableVersions = await distribution['getAvailableVersions']();
-    expect(availableVersions).toEqual(manifestData);
-  });
-});
-
-describe('getArchitectureOptions', () => {
-  it.each([
-    ['x86', { bitness: '32', arch: 'x86' }],
-    ['x64', { bitness: '64', arch: 'x86' }],
-    ['armv7', { bitness: '32', arch: 'arm' }],
-    ['aarch64', { bitness: '64', arch: 'arm' }],
-    ['ppc64le', { bitness: '64', arch: 'ppc' }]
-  ] as [string, ArchitectureOptions][])('parse architecture %s -> %s', (input, expected) => {
-    const distributions = new LibericaDistributions({
-      architecture: input,
-      checkLatest: false,
-      packageType: '',
-      version: ''
-    });
-
-    expect(distributions['getArchitectureOptions']()).toEqual(expected);
-  });
-
-  it.each(['armv6', 's390x'])('not support architecture %s', input => {
-    const distributions = new LibericaDistributions({
-      architecture: input,
-      checkLatest: false,
-      packageType: '',
-      version: ''
-    });
-
-    expect(() => distributions['getArchitectureOptions']()).toThrow(
-      /Architecture '\w+' is not supported\. Supported architectures: .*/
-    );
-  });
-});
-
-describe('findPackageForDownload', () => {
-  let distribution: LibericaDistributions;
-
-  beforeEach(() => {
-    distribution = new LibericaDistributions({
-      version: '',
-      architecture: 'x64',
-      packageType: 'jdk',
-      checkLatest: false
-    });
-    distribution['getAvailableVersions'] = async () => manifestData;
-  });
-
-  it.each([
-    ['8', '8.0.302+8'],
-    ['11.x', '11.0.12+7'],
-    ['8.0', '8.0.302+8'],
-    ['11.0.x', '11.0.12+7'],
-    ['15', '15.0.2+10'],
-    ['15.0', '15.0.2+10'],
-    ['15.0.0', '15.0.0+36'],
-    ['8.0.232', '8.0.232+10'],
-    ['8.0.232+9', '8.0.232+9'],
-    ['15.0.2+8', '15.0.2+8'],
-    ['15.0.2+10', '15.0.2+10']
-  ])('version is %s -> %s', async (input, expected) => {
-    const result = await distribution['findPackageForDownload'](input);
-    expect(result.version).toBe(expected);
-  });
-
-  it('should throw an error', async () => {
-    await expect(distribution['findPackageForDownload']('17')).rejects.toThrow(
-      /Could not find satisfied version for semver */
-    );
-  });
-});
-
-describe('getPlatformOption', () => {
-  const distributions = new LibericaDistributions({
-    architecture: 'x64',
-    version: '11',
-    packageType: 'jdk',
-    checkLatest: false
-  });
-
-  it.each([
-    ['linux', 'linux'],
-    ['darwin', 'macos'],
-    ['win32', 'windows'],
-    ['cygwin', 'windows'],
-    ['sunos', 'solaris']
-  ])('os version %s -> %s', (input, expected) => {
-    const actual = distributions['getPlatformOption'](input as NodeJS.Platform);
-
-    expect(actual).toEqual(expected);
-  });
-
-  it.each(['aix', 'android', 'freebsd', 'openbsd', 'netbsd'])(
-    'not support os version %s',
-    input => {
-      expect(() => distributions['getPlatformOption'](input as NodeJS.Platform)).toThrow(
-        /Platform '\w+' is not supported\. Supported platforms: .+/
-      );
-    }
-  );
-});
-
-describe('convertVersionToSemver', () => {
-  const distributions = new LibericaDistributions({
-    architecture: 'x64',
-    version: '11',
-    packageType: 'jdk',
-    checkLatest: false
-  });
-
-  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, interimVersion: 0, updateVersion: 0, buildVersion: 13 }, '11.0.0+13']
-  ])('%s -> %s', (input, expected) => {
-    const actual = distributions['convertVersionToSemver']({
-      downloadUrl: '',
-      version: '',
-      ...input
-    });
-
-    expect(actual).toEqual(expected);
-  });
-});

__tests__/distributors/microsoft-installer.test.ts

@@ -1,88 +0,0 @@
-import { MicrosoftDistributions } from '../../src/distributions/microsoft/installer';
-
-describe('findPackageForDownload', () => {
-  let distribution: MicrosoftDistributions;
-
-  beforeEach(() => {
-    distribution = new MicrosoftDistributions({
-      version: '',
-      architecture: 'x64',
-      packageType: 'jdk',
-      checkLatest: false
-    });
-  });
-
-  it.each([
-    [
-      '17.x',
-      '17.0.1',
-      'https://aka.ms/download-jdk/microsoft-jdk-17.0.1.12.1-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
-    ],
-    [
-      '16.0.x',
-      '16.0.2',
-      'https://aka.ms/download-jdk/microsoft-jdk-16.0.2.7.1-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
-    ],
-    [
-      '11.0.13',
-      '11.0.13',
-      'https://aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
-    ]
-  ])('version is %s -> %s', async (input, expectedVersion, expectedUrl) => {
-    const result = await distribution['findPackageForDownload'](input);
-    expect(result.version).toBe(expectedVersion);
-    let os: string;
-    let archive: string;
-    switch (process.platform) {
-      case 'darwin':
-        os = 'macos';
-        archive = 'tar.gz';
-        break;
-      case 'win32':
-        os = 'windows';
-        archive = 'zip';
-        break;
-      default:
-        os = process.platform.toString();
-        archive = 'tar.gz';
-        break;
-    }
-    const url = expectedUrl.replace('{{OS_TYPE}}', os).replace('{{ARCHIVE_TYPE}}', archive);
-    expect(result.url).toBe(url);
-  });
-
-  it('should throw an error', async () => {
-    await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
-      /Could not find satisfied version for SemVer */
-    );
-  });
-});
-
-describe('getPlatformOption', () => {
-  const distributions = new MicrosoftDistributions({
-    architecture: 'x64',
-    version: '11',
-    packageType: 'jdk',
-    checkLatest: false
-  });
-
-  it.each([
-    ['linux', 'tar.gz', 'linux'],
-    ['darwin', 'tar.gz', 'macos'],
-    ['win32', 'zip', 'windows']
-  ])('os version %s -> %s', (input, expectedArchive, expectedOs) => {
-    const actual = distributions['getPlatformOption'](input as NodeJS.Platform);
-
-    expect(actual.archive).toEqual(expectedArchive);
-    expect(actual.os).toEqual(expectedOs);
-  });
-
-  it.each(['aix', 'android', 'freebsd', 'openbsd', 'netbsd', 'solaris', 'cygwin'])(
-    'not support os version %s',
-    input => {
-      expect(() => distributions['getPlatformOption'](input as NodeJS.Platform)).toThrow(
-        /Platform '\w+' is not supported\. Supported platforms: .+/
-      );
-    }
-  );
-});

__tests__/distributors/temurin-installer.test.ts

@@ -1,164 +0,0 @@
-import { HttpClient } from '@actions/http-client';
-
-import {
-  TemurinDistribution,
-  TemurinImplementation
-} from '../../src/distributions/temurin/installer';
-import { JavaInstallerOptions } from '../../src/distributions/base-models';
-
-let manifestData = require('../data/temurin.json') as [];
-
-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 },
-      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 },
-      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 },
-      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 },
-      TemurinImplementation.Hotspot,
-      'os=mac&architecture=x64&image_type=jdk&release_type=ea&jvm_impl=hotspot&page_size=20&page=0'
-    ]
-  ])(
-    'build correct url for %s',
-    async (
-      installerOptions: JavaInstallerOptions,
-      impl: TemurinImplementation,
-      expectedParameters
-    ) => {
-      const distribution = new TemurinDistribution(installerOptions, impl);
-      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';
-
-      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
-      })
-      .mockReturnValueOnce({
-        statusCode: 200,
-        headers: {},
-        result: manifestData
-      })
-      .mockReturnValueOnce({
-        statusCode: 200,
-        headers: {},
-        result: []
-      });
-
-    const distribution = new TemurinDistribution(
-      { version: '8', architecture: 'x64', packageType: 'jdk', checkLatest: false },
-      TemurinImplementation.Hotspot
-    );
-    const availableVersions = await distribution['getAvailableVersions']();
-    expect(availableVersions).not.toBeNull();
-    expect(availableVersions.length).toBe(manifestData.length * 2);
-  });
-
-  it.each([
-    [TemurinImplementation.Hotspot, 'jdk', 'Java_Temurin-Hotspot_jdk'],
-    [TemurinImplementation.Hotspot, 'jre', 'Java_Temurin-Hotspot_jre']
-  ])(
-    'find right toolchain folder',
-    (impl: TemurinImplementation, packageType: string, expected: string) => {
-      const distribution = new TemurinDistribution(
-        { version: '8', architecture: 'x64', packageType: packageType, checkLatest: false },
-        impl
-      );
-
-      // @ts-ignore - because it is protected
-      expect(distribution.toolcacheFolderName).toBe(expected);
-    }
-  );
-});
-
-describe('findPackageForDownload', () => {
-  it.each([
-    ['8', '8.0.302+8'],
-    ['16', '16.0.2+7'],
-    ['16.0', '16.0.2+7'],
-    ['16.0.2', '16.0.2+7'],
-    ['8.x', '8.0.302+8'],
-    ['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 },
-      TemurinImplementation.Hotspot
-    );
-    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 },
-      TemurinImplementation.Hotspot
-    );
-    distribution['getAvailableVersions'] = async () => manifestData;
-    await expect(distribution['findPackageForDownload']('9.0.8')).rejects.toThrowError(
-      /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 },
-      TemurinImplementation.Hotspot
-    );
-    distribution['getAvailableVersions'] = async () => manifestData;
-    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 },
-      TemurinImplementation.Hotspot
-    );
-    distribution['getAvailableVersions'] = async () => [];
-    await expect(distribution['findPackageForDownload']('8')).rejects.toThrowError(
-      /Could not find satisfied version for SemVer */
-    );
-  });
-});

__tests__/distributors/zulu-installer.test.ts

@@ -139,7 +139,6 @@ describe('findPackageForDownload', () => {
       packageType: 'jdk',
       checkLatest: false
     });
-    distribution['getAvailableVersions'] = async () => manifestData;
     await expect(
       distribution['findPackageForDownload'](distribution['version'])
     ).rejects.toThrowError(/Could not find satisfied version for semver */);

__tests__/util.test.ts

@@ -1,9 +1,4 @@
-import * as cache from '@actions/cache';
-import * as core from '@actions/core';
-import { isVersionSatisfies, isCacheFeatureAvailable } from '../src/util';
-
-jest.mock('@actions/cache');
-jest.mock('@actions/core');
+import { isVersionSatisfies } from '../src/util';
 
 describe('isVersionSatisfies', () => {
   it.each([
@@ -25,38 +20,3 @@ describe('isVersionSatisfies', () => {
     expect(actual).toBe(expected);
   });
 });
-
-describe('isCacheFeatureAvailable', () => {
-  it('isCacheFeatureAvailable disabled on GHES', () => {
-    jest.spyOn(cache, 'isFeatureAvailable').mockImplementation(() => false);
-    try {
-      process.env['GITHUB_SERVER_URL'] = 'http://example.com';
-      isCacheFeatureAvailable();
-    } catch (error) {
-      expect(error).toHaveProperty(
-        'message',
-        'Caching is only supported on GHES version >= 3.5. If you are on a version >= 3.5, please check with your GHES admin if the Actions cache service is enabled or not.'
-      );
-    } finally {
-      delete process.env['GITHUB_SERVER_URL'];
-    }
-  });
-
-  it('isCacheFeatureAvailable disabled on dotcom', () => {
-    jest.spyOn(cache, 'isFeatureAvailable').mockImplementation(() => false);
-    const infoMock = jest.spyOn(core, 'warning');
-    const message = '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);
-      expect(infoMock).toHaveBeenCalledWith(message);
-    } finally {
-      delete process.env['GITHUB_SERVER_URL'];
-    }
-  });
-
-  it('isCacheFeatureAvailable is enabled', () => {
-    jest.spyOn(cache, 'isFeatureAvailable').mockImplementation(() => true);
-    expect(isCacheFeatureAvailable()).toBe(true);
-  });
-});

__tests__/verify-no-unstaged-changes.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [[ "$(git status --porcelain)" != "" ]]; then
+    echo ----------------------------------------
+    echo git status
+    echo ----------------------------------------
+    git status
+    echo ----------------------------------------
+    echo git diff
+    echo ----------------------------------------
+    git diff
+    echo ----------------------------------------
+    echo Troubleshooting
+    echo ----------------------------------------
+    echo "::error::Unstaged changes detected. Locally try running: git clean -ffdx && npm ci && npm run pre-checkin"
+    exit 1
+fi

action.yml

@@ -53,12 +53,6 @@ inputs:
     description: 'Environment variable name for the GPG private key passphrase. Default is
        $GPG_PASSPHRASE.'
     required: false
-  cache:
-    description: 'Name of the build platform to cache dependencies. It can be "maven" or "gradle".'
-    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 }}
 outputs:
   distribution:
     description: 'Distribution of Java that has been installed'
@@ -67,6 +61,6 @@ outputs:
   path:
     description: 'Path to where the java environment has been installed (same as $JAVA_HOME)'
 runs:
-  using: 'node16'
+  using: 'node12'
   main: 'dist/setup/index.js'
   post: 'dist/cleanup/index.js'

docs/advanced-usage.md

@@ -1,6 +1,5 @@
 # Usage
 - [Selecting a Java distribution](#Selecting-a-Java-distribution)
-  - [Eclipse Temurin](#Eclipse-Temurin)
   - [Adopt](#Adopt)
   - [Zulu](#Zulu)
 - [Installing custom Java package type](#Installing-custom-Java-package-type)
@@ -17,26 +16,13 @@ See [action.yml](../action.yml) for more details on task inputs.
 ## Selecting a Java distribution
 Inputs `java-version` and `distribution` are mandatory and needs to be provided. See [Supported distributions](../README.md#Supported-distributions) for a list of available options.
 
-### Eclipse Temurin
-```yaml
-steps:
-- uses: actions/checkout@v2
-- uses: actions/setup-java@v2
-  with:
-    distribution: 'temurin'
-    java-version: '11'
-- run: java -cp java HelloWorldApp
-```
-
 ### Adopt
-**NOTE:** Adopt OpenJDK 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/).
-
 ```yaml
 steps:
 - uses: actions/checkout@v2
 - uses: actions/setup-java@v2
   with:
-    distribution: 'adopt-hotspot'
+    distribution: 'adopt'
     java-version: '11'
 - run: java -cp java HelloWorldApp
 ```
@@ -53,29 +39,6 @@ steps:
 - run: java -cp java HelloWorldApp
 ```
 
-### Liberica
-```yaml
-steps:
-- uses: actions/checkout@v2
-- uses: actions/setup-java@v2
-  with:
-    distribution: 'liberica'
-    java-version: '11'
-    java-package: jdk # optional (jdk, jre, jdk+fx or jre+fx) - defaults to jdk
-- run: java -cp java HelloWorldApp
-```
-
-### Microsoft
-```yaml
-steps:
-- uses: actions/checkout@v2
-- uses: actions/setup-java@v2
-  with:
-    distribution: 'microsoft'
-    java-version: '11'
-- run: java -cp java HelloWorldApp
-```
-
 ## Installing custom Java package type
 ```yaml
 steps:
@@ -112,7 +75,7 @@ steps:
     wget -O $RUNNER_TEMP/java_package.tar.gz $download_url
 - uses: actions/setup-java@v2
   with:
-    distribution: 'jdkfile'
+    distribution: 'jdkFile'
     jdkFile: ${{ runner.temp }}/java_package.tar.gz
     java-version: '11.0.0'
     architecture: x64
@@ -128,8 +91,8 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        distribution: [ 'zulu', 'temurin' ]
-        java: [ '8', '11' ]
+        distribution: [ 'zulu', 'adopt' ]
+        java: [ '8', '11', '13', '15' ]
     name: Java ${{ matrix.Java }} (${{ matrix.distribution }}) sample
     steps:
       - uses: actions/checkout@v2
@@ -156,7 +119,7 @@ jobs:
       - name: Setup java
         uses: actions/setup-java@v2
         with:
-          distribution: 'temurin'
+          distribution: 'adopt'
           java-version: ${{ matrix.java }}
       - run: java -cp java HelloWorldApp
 ```
@@ -166,6 +129,7 @@ jobs:
 ```yaml
 jobs:
   build:
+
     runs-on: ubuntu-latest
 
     steps:
@@ -187,7 +151,7 @@ jobs:
     - name: Set up Apache Maven Central
       uses: actions/setup-java@v2
       with: # running setup-java again overwrites the settings.xml
-        distribution: 'temurin'
+        distribution: 'adopt'
         java-version: '11'
         server-id: maven # Value of the distributionManagement/repository/id field of the pom.xml
         server-username: MAVEN_USERNAME # env variable for username in deploy
@@ -243,7 +207,7 @@ The two `settings.xml` files created from the above example look like the follow
 </settings>
 ```
 
-***NOTE***: The `settings.xml` file is created in the Actions `$HOME/.m2` directory. If you have an existing `settings.xml` file at that location, it will be overwritten. See [below](#apache-maven-with-a-settings-path) for using the `settings-path` to change your `settings.xml` file location.
+***NOTE***: The `settings.xml` file is created in the Actions $HOME/.m2 directory. If you have an existing `settings.xml` file at that location, it will be overwritten. See below for using the `settings-path` to change your `settings.xml` file location.
 
 If you don't want to overwrite the `settings.xml` file, you can set `overwrite-settings: false`
 
@@ -270,34 +234,6 @@ If `gpg-private-key` input is provided, the private key will be written to a fil
 
 See the help docs on [Publishing a Package](https://help.github.com/en/github/managing-packages-with-github-packages/configuring-apache-maven-for-use-with-github-packages#publishing-a-package) for more information on the `pom.xml` file.
 
-## Apache Maven with a settings path
-
-When using an Actions self-hosted runner with multiple shared runners the default `$HOME` directory can be shared by a number runners at the same time which could overwrite existing settings file. Setting the `settings-path` variable allows you to choose a unique location for your settings file.
-
-```yaml
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11 for Shared Runner
-      uses: actions/setup-java@v2
-      with:
-        distribution: '<distribution>'
-        java-version: '11'
-        server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
-        settings-path: ${{ github.workspace }} # location for the settings.xml file
-
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
-
-    - name: Publish to GitHub Packages Apache Maven
-      run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-```
-
 ## Publishing using Gradle
 ```yaml
 jobs:
@@ -328,9 +264,38 @@ jobs:
 
 See the help docs on [Publishing a Package with Gradle](https://help.github.com/en/github/managing-packages-with-github-packages/configuring-gradle-for-use-with-github-packages#example-using-gradle-groovy-for-a-single-package-in-a-repository) for more information on the `build.gradle` configuration file.
 
+## Apache Maven with a settings path
+
+When using an Actions self-hosted runner with multiple shared runners the default `$HOME` directory can be shared by a number runners at the same time which could overwrite existing settings file. Setting the `settings-path` variable allows you to choose a unique location for your settings file.
+
+```yaml
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11 for Shared Runner
+      uses: actions/setup-java@v2
+      with:
+        distribution: '<distribution>'
+        java-version: '11'
+        server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+        settings-path: ${{ github.workspace }} # location for the settings.xml file
+
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+
+    - name: Publish to GitHub Packages Apache Maven
+      run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+```
+
 ## Hosted Tool Cache
-GitHub Hosted Runners have a tool cache that comes with some Java versions pre-installed. This tool cache helps speed up runs and tool setup by not requiring any new downloads. There is an environment variable called `RUNNER_TOOL_CACHE` on each runner that describes the location of this tools cache and this is where you can find the pre-installed versions of Java. `setup-java` works by taking a specific version of Java in this tool cache and adding it to PATH if the version, architecture and distribution match.
+GitHub Hosted Runners have a tool cache that comes with some Java versions pre-installed. This tool cache helps speed up runs and tool setup by not requiring any new downloads. There is an environment variable called `RUNNER_TOOL_CACHE` on each runner that describes the location of this tools cache and this is where you can find the pre-installed versions of Java. `setup-java` works by taking a specific version of Java in this tool cache and adding it to PATH if the version, architecture and distribution match. 
 
 Currently, LTS versions of Adopt OpenJDK (`adopt`) are cached on the GitHub Hosted Runners.
 
-The tools cache gets updated on a weekly basis. For information regarding locally cached versions of Java on GitHub hosted runners, check out [GitHub Actions Virtual Environments](https://github.com/actions/virtual-environments).
+The tools cache gets updated on a weekly basis. For information regarding locally cached versions of Java on GitHub hosted runners, check out [GitHub Actions Virtual Environments](https://github.com/actions/virtual-environments).  

docs/switching-to-v2.md

@@ -16,7 +16,7 @@ steps:
 **General recommendation** — configure CI with the same distribution that is used on your local dev machine.
 
 ## Installing custom Java distribution from local file
-Since the `distribution` input is required in V2, you should specify it using `jdkfile` to continue installing Java from a local file on the runner
+Since the `distribution` input is required in V2, you should specify it using `jdkFile` to continue installing Java from a local file on the runner
 ```yaml
 steps:
 - run: |
@@ -24,7 +24,7 @@ steps:
     wget -O $RUNNER_TEMP/java_package.tar.gz $download_url
 - uses: actions/setup-java@v2
   with:
-    distribution: 'jdkfile'
+    distribution: 'jdkFile'
     jdkFile: ${{ runner.temp }}/java_package.tar.gz
     java-version: '11.0.0'
     architecture: x64

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-java",
-  "version": "3.1.0",
+  "version": "2.0.0",
   "private": true,
   "description": "setup java action",
   "main": "dist/setup/index.js",
@@ -24,25 +24,29 @@
   "author": "GitHub",
   "license": "MIT",
   "dependencies": {
-    "@actions/cache": "^2.0.0",
     "@actions/core": "^1.2.6",
     "@actions/exec": "^1.0.4",
-    "@actions/glob": "^0.2.0",
-    "@actions/http-client": "^1.0.11",
+    "@actions/http-client": "^1.0.9",
     "@actions/io": "^1.0.2",
     "@actions/tool-cache": "^1.6.1",
     "semver": "^7.3.4",
     "xmlbuilder2": "^2.4.0"
   },
   "devDependencies": {
-    "@types/jest": "^27.0.2",
-    "@types/node": "^16.11.25",
+    "@types/jest": "^26.0.20",
+    "@types/node": "^12.19.13",
     "@types/semver": "^7.3.4",
     "@zeit/ncc": "^0.20.5",
-    "jest": "^27.2.5",
-    "jest-circus": "^27.2.5",
+    "jest": "^26.6.3",
+    "jest-circus": "^26.6.3",
     "prettier": "^1.19.1",
-    "ts-jest": "^27.0.5",
+    "ts-jest": "^26.5.3",
     "typescript": "^4.2.3"
+  },
+  "husky": {
+    "skipCI": true,
+    "hooks": {
+      "pre-commit": "npm run build && npm run format"
+    }
   }
 }

src/cache.ts

@@ -1,134 +0,0 @@
-/**
- * @fileoverview this file provides methods handling dependency cache
- */
-
-import { join } from 'path';
-import os from 'os';
-import * as cache from '@actions/cache';
-import * as core from '@actions/core';
-import * as glob from '@actions/glob';
-
-const STATE_CACHE_PRIMARY_KEY = 'cache-primary-key';
-const CACHE_MATCHED_KEY = 'cache-matched-key';
-const CACHE_KEY_PREFIX = 'setup-java';
-
-interface PackageManager {
-  id: 'maven' | 'gradle';
-  /**
-   * Paths of the file that specify the files to cache.
-   */
-  path: string[];
-  pattern: string[];
-}
-const supportedPackageManager: PackageManager[] = [
-  {
-    id: 'maven',
-    path: [join(os.homedir(), '.m2', 'repository')],
-    // https://github.com/actions/cache/blob/0638051e9af2c23d10bb70fa9beffcad6cff9ce3/examples.md#java---maven
-    pattern: ['**/pom.xml']
-  },
-  {
-    id: 'gradle',
-    path: [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']
-  }
-];
-
-function findPackageManager(id: string): PackageManager {
-  const packageManager = supportedPackageManager.find(packageManager => packageManager.id === id);
-  if (packageManager === undefined) {
-    throw new Error(`unknown package manager specified: ${id}`);
-  }
-  return 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(packageManager: PackageManager) {
-  const hash = await glob.hashFiles(packageManager.pattern.join('\n'));
-  return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${hash}`;
-}
-
-/**
- * Restore the dependency cache
- * @param id ID of the package manager, should be "maven" or "gradle"
- */
-export async function restore(id: string) {
-  const packageManager = findPackageManager(id);
-  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`
-    );
-  }
-
-  const matchedKey = await cache.restoreCache(packageManager.path, primaryKey, [
-    `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${id}`
-  ]);
-  if (matchedKey) {
-    core.saveState(CACHE_MATCHED_KEY, matchedKey);
-    core.info(`Cache restored from key: ${matchedKey}`);
-  } else {
-    core.info(`${packageManager.id} cache is not found`);
-  }
-}
-
-/**
- * Save the dependency cache
- * @param id ID of the package manager, should be "maven" or "gradle"
- */
-export async function save(id: string) {
-  const packageManager = findPackageManager(id);
-  const matchedKey = core.getState(CACHE_MATCHED_KEY);
-
-  // Inputs are re-evaluted before the post action, so we want the original key used for restore
-  const primaryKey = core.getState(STATE_CACHE_PRIMARY_KEY);
-
-  if (!primaryKey) {
-    core.warning('Error retrieving key from state.');
-    return;
-  } else if (matchedKey === primaryKey) {
-    // no change in target directories
-    core.info(`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) {
-    if (error.name === cache.ReserveCacheError.name) {
-      core.info(error.message);
-    } else {
-      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.'
-        );
-      }
-      throw error;
-    }
-  }
-}
-
-/**
- * @param packageManager the specified package manager by user
- * @param error the error thrown by the saveCache
- * @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(packageManager: PackageManager, error: Error) {
-  if (packageManager.id !== 'gradle' || process.env['RUNNER_OS'] !== 'Windows') {
-    return false;
-  }
-  const message = error.message || '';
-  return message.startsWith('Tar failed with error: ');
-}

src/cleanup-java.ts

@@ -1,56 +1,17 @@
 import * as core from '@actions/core';
 import * as gpg from './gpg';
 import * as constants from './constants';
-import { isJobStatusSuccess } from './util';
-import { save } from './cache';
 
-async function removePrivateKeyFromKeychain() {
+async function run() {
   if (core.getInput(constants.INPUT_GPG_PRIVATE_KEY, { required: false })) {
     core.info('Removing private key from keychain');
     try {
       const keyFingerprint = core.getState(constants.STATE_GPG_PRIVATE_KEY_FINGERPRINT);
       await gpg.deleteKey(keyFingerprint);
     } catch (error) {
-      core.setFailed(`Failed to remove private key due to: ${error.message}`);
+      core.setFailed('Failed to remove private key');
     }
   }
 }
 
-/**
- * Check given input and run a save process for the specified package manager
- * @returns Promise that will be resolved when the save process finishes
- */
-async function saveCache() {
-  const jobStatus = isJobStatusSuccess();
-  const cache = core.getInput(constants.INPUT_CACHE);
-  return jobStatus && cache ? save(cache) : Promise.resolve();
-}
-
-/**
- * The save process is best-effort, and it should not make the workflow fail
- * even though this process throws an error.
- * @param promise the promise to ignore error from
- * @returns Promise that will ignore error reported by the given promise
- */
-async function ignoreError(promise: Promise<void>) {
-  return new Promise(resolve => {
-    promise
-      .catch(error => {
-        core.warning(error);
-        resolve(void 0);
-      })
-      .then(resolve);
-  });
-}
-
-export async function run() {
-  await removePrivateKeyFromKeychain();
-  await ignoreError(saveCache());
-}
-
-if (require.main === module) {
-  run();
-} else {
-  // https://nodejs.org/api/modules.html#modules_accessing_the_main_module
-  core.info('the script is loaded as a module, so skipping the execution');
-}
+run();

src/constants.ts

@@ -16,7 +16,4 @@ export const INPUT_GPG_PASSPHRASE = 'gpg-passphrase';
 export const INPUT_DEFAULT_GPG_PRIVATE_KEY = undefined;
 export const INPUT_DEFAULT_GPG_PASSPHRASE = 'GPG_PASSPHRASE';
 
-export const INPUT_CACHE = 'cache';
-export const INPUT_JOB_STATUS = 'job-status';
-
 export const STATE_GPG_PRIVATE_KEY_FINGERPRINT = 'gpg-private-key-fingerprint';

src/distributions/adopt/installer.ts

@@ -7,20 +7,13 @@ import semver from 'semver';
 
 import { JavaBase } from '../base-installer';
 import { IAdoptAvailableVersions } from './models';
-import { JavaDownloadRelease, JavaInstallerOptions, JavaInstallerResults } from '../base-models';
+import { JavaInstallerOptions, JavaDownloadRelease, JavaInstallerResults } from '../base-models';
+import { MACOS_JAVA_CONTENT_POSTFIX } from '../../constants';
 import { extractJdkFile, getDownloadArchiveExtension, isVersionSatisfies } from '../../util';
 
-export enum AdoptImplementation {
-  Hotspot = 'Hotspot',
-  OpenJ9 = 'OpenJ9'
-}
-
 export class AdoptDistribution extends JavaBase {
-  constructor(
-    installerOptions: JavaInstallerOptions,
-    private readonly jvmImpl: AdoptImplementation
-  ) {
-    super(`Adopt-${jvmImpl}`, installerOptions);
+  constructor(installerOptions: JavaInstallerOptions) {
+    super('Adopt', installerOptions);
   }
 
   protected async findPackageForDownload(version: string): Promise<JavaDownloadRelease> {
@@ -77,15 +70,6 @@ export class AdoptDistribution extends JavaBase {
     return { version: javaRelease.version, path: javaPath };
   }
 
-  protected get toolcacheFolderName(): string {
-    if (this.jvmImpl === AdoptImplementation.Hotspot) {
-      // exclude Hotspot postfix from distribution name because Hosted runners have pre-cached Adopt OpenJDK under "Java_Adopt_jdk"
-      // for more information see: https://github.com/actions/setup-java/pull/155#discussion_r610451063
-      return `Java_Adopt_${this.packageType}`;
-    }
-    return super.toolcacheFolderName;
-  }
-
   private async getAvailableVersions(): Promise<IAdoptAvailableVersions[]> {
     const platform = this.getPlatformOption();
     const arch = this.architecture;
@@ -99,13 +83,13 @@ export class AdoptDistribution extends JavaBase {
       `project=jdk`,
       'vendor=adoptopenjdk',
       `heap_size=normal`,
+      `jvm_impl=hotspot`,
       'sort_method=DEFAULT',
       'sort_order=DESC',
       `os=${platform}`,
       `architecture=${arch}`,
       `image_type=${imageType}`,
-      `release_type=${releaseType}`,
-      `jvm_impl=${this.jvmImpl.toLowerCase()}`
+      `release_type=${releaseType}`
     ].join('&');
 
     // need to iterate through all pages to retrieve the list of all versions

src/distributions/distribution-factory.ts

@@ -1,21 +1,13 @@
+import { AdoptDistribution } from './adopt/installer';
 import { JavaBase } from './base-installer';
 import { JavaInstallerOptions } from './base-models';
 import { LocalDistribution } from './local/installer';
 import { ZuluDistribution } from './zulu/installer';
-import { AdoptDistribution, AdoptImplementation } from './adopt/installer';
-import { TemurinDistribution, TemurinImplementation } from './temurin/installer';
-import { LibericaDistributions } from './liberica/installer';
-import { MicrosoftDistributions } from './microsoft/installer';
 
 enum JavaDistribution {
   Adopt = 'adopt',
-  AdoptHotspot = 'adopt-hotspot',
-  AdoptOpenJ9 = 'adopt-openj9',
-  Temurin = 'temurin',
   Zulu = 'zulu',
-  Liberica = 'liberica',
-  JdkFile = 'jdkfile',
-  Microsoft = 'microsoft'
+  JdkFile = 'jdkfile'
 }
 
 export function getJavaDistribution(
@@ -27,18 +19,9 @@ export function getJavaDistribution(
     case JavaDistribution.JdkFile:
       return new LocalDistribution(installerOptions, jdkFile);
     case JavaDistribution.Adopt:
-    case JavaDistribution.AdoptHotspot:
-      return new AdoptDistribution(installerOptions, AdoptImplementation.Hotspot);
-    case JavaDistribution.AdoptOpenJ9:
-      return new AdoptDistribution(installerOptions, AdoptImplementation.OpenJ9);
-    case JavaDistribution.Temurin:
-      return new TemurinDistribution(installerOptions, TemurinImplementation.Hotspot);
+      return new AdoptDistribution(installerOptions);
     case JavaDistribution.Zulu:
       return new ZuluDistribution(installerOptions);
-    case JavaDistribution.Liberica:
-      return new LibericaDistributions(installerOptions);
-    case JavaDistribution.Microsoft:
-      return new MicrosoftDistributions(installerOptions);
     default:
       return null;
   }

src/distributions/liberica/installer.ts

@@ -1,157 +0,0 @@
-import { JavaBase } from '../base-installer';
-import { JavaDownloadRelease, JavaInstallerOptions, JavaInstallerResults } from '../base-models';
-import semver from 'semver';
-import { extractJdkFile, getDownloadArchiveExtension, isVersionSatisfies } from '../../util';
-import * as core from '@actions/core';
-import { ArchitectureOptions, LibericaVersion, OsVersions } from './models';
-import * as tc from '@actions/tool-cache';
-import fs from 'fs';
-import path from 'path';
-
-const supportedPlatform = `'linux', 'linux-musl', 'macos', 'solaris', 'windows'`;
-
-const supportedArchitecture = `'x86', 'x64', 'armv7', 'aarch64', 'ppc64le'`;
-
-export class LibericaDistributions extends JavaBase {
-  constructor(installerOptions: JavaInstallerOptions) {
-    super('Liberica', installerOptions);
-  }
-
-  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 extension = getDownloadArchiveExtension();
-    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
-
-    const archiveName = fs.readdirSync(extractedJavaPath)[0];
-    const archivePath = path.join(extractedJavaPath, archiveName);
-
-    const javaPath = await tc.cacheDir(
-      archivePath,
-      this.toolcacheFolderName,
-      this.getToolcacheVersionName(javaRelease.version),
-      this.architecture
-    );
-
-    return { version: javaRelease.version, path: javaPath };
-  }
-
-  protected async findPackageForDownload(range: string): Promise<JavaDownloadRelease> {
-    const availableVersionsRaw = await this.getAvailableVersions();
-
-    const availableVersions = availableVersionsRaw.map(item => ({
-      url: item.downloadUrl,
-      version: this.convertVersionToSemver(item)
-    }));
-
-    const satisfiedVersion = availableVersions
-      .filter(item => isVersionSatisfies(range, item.version))
-      .sort((a, b) => -semver.compareBuild(a.version, b.version))[0];
-
-    if (!satisfiedVersion) {
-      const availableOptions = availableVersions.map(item => item.version).join(', ');
-      const availableOptionsMessage = availableOptions
-        ? `\nAvailable versions: ${availableOptions}`
-        : '';
-      throw new Error(
-        `Could not find satisfied version for semver ${range}. ${availableOptionsMessage}`
-      );
-    }
-
-    return satisfiedVersion;
-  }
-
-  private async getAvailableVersions(): Promise<LibericaVersion[]> {
-    console.time('liberica-retrieve-available-versions');
-    const url = this.prepareAvailableVersionsUrl();
-
-    if (core.isDebug()) {
-      core.debug(`Gathering available versions from '${url}'`);
-    }
-
-    const availableVersions = (await this.http.getJson<LibericaVersion[]>(url)).result ?? [];
-
-    if (core.isDebug()) {
-      core.startGroup('Print information about available versions');
-      console.timeEnd('liberica-retrieve-available-versions');
-      console.log(`Available versions: [${availableVersions.length}]`);
-      console.log(availableVersions.map(item => item.version));
-      core.endGroup();
-    }
-
-    return availableVersions;
-  }
-
-  private prepareAvailableVersionsUrl() {
-    const urlOptions = {
-      os: this.getPlatformOption(),
-      'bundle-type': this.getBundleType(),
-      ...this.getArchitectureOptions(),
-      'build-type': this.stable ? 'all' : 'ea',
-      'installation-type': 'archive',
-      fields: 'downloadUrl,version,featureVersion,interimVersion,updateVersion,buildVersion'
-    };
-
-    const searchParams = new URLSearchParams(urlOptions).toString();
-
-    return `https://api.bell-sw.com/v1/liberica/releases?${searchParams}`;
-  }
-
-  private getBundleType(): string {
-    const [bundleType, feature] = this.packageType.split('+');
-    if (feature?.includes('fx')) {
-      return bundleType + '-full';
-    }
-    return bundleType;
-  }
-
-  private getArchitectureOptions(): ArchitectureOptions {
-    switch (this.architecture) {
-      case 'x86':
-        return { bitness: '32', arch: 'x86' };
-      case 'x64':
-        return { bitness: '64', arch: 'x86' };
-      case 'armv7':
-        return { bitness: '32', arch: 'arm' };
-      case 'aarch64':
-        return { bitness: '64', arch: 'arm' };
-      case 'ppc64le':
-        return { bitness: '64', arch: 'ppc' };
-      default:
-        throw new Error(
-          `Architecture '${this.architecture}' is not supported. Supported architectures: ${supportedArchitecture}`
-        );
-    }
-  }
-
-  private getPlatformOption(platform: NodeJS.Platform = process.platform): OsVersions {
-    switch (platform) {
-      case 'darwin':
-        return 'macos';
-      case 'win32':
-      case 'cygwin':
-        return 'windows';
-      case 'linux':
-        return 'linux';
-      case 'sunos':
-        return 'solaris';
-      default:
-        throw new Error(
-          `Platform '${platform}' is not supported. Supported platforms: ${supportedPlatform}`
-        );
-    }
-  }
-
-  private convertVersionToSemver(version: LibericaVersion): string {
-    let { buildVersion, featureVersion, interimVersion, updateVersion } = version;
-    const mainVersion = [featureVersion, interimVersion, updateVersion].join('.');
-    if (buildVersion != 0) {
-      return `${mainVersion}+${buildVersion}`;
-    }
-    return mainVersion;
-  }
-}

src/distributions/liberica/models.ts

@@ -1,20 +0,0 @@
-// Models from https://api.bell-sw.com/api.html
-
-export type Bitness = '32' | '64';
-export type ArchType = 'arm' | 'ppc' | 'sparc' | 'x86';
-
-export type OsVersions = 'linux' | 'linux-musl' | 'macos' | 'solaris' | 'windows';
-
-export interface ArchitectureOptions {
-  bitness: Bitness;
-  arch: ArchType;
-}
-
-export interface LibericaVersion {
-  downloadUrl: string;
-  version: string;
-  featureVersion: number;
-  interimVersion: number;
-  updateVersion: number;
-  buildVersion: number;
-}

src/distributions/microsoft/installer.ts

@@ -1,124 +0,0 @@
-import { JavaBase } from '../base-installer';
-import { JavaDownloadRelease, JavaInstallerOptions, JavaInstallerResults } from '../base-models';
-import semver from 'semver';
-import { extractJdkFile, getDownloadArchiveExtension, isVersionSatisfies } from '../../util';
-import * as core from '@actions/core';
-import { MicrosoftVersion, PlatformOptions } from './models';
-import * as tc from '@actions/tool-cache';
-import fs from 'fs';
-import path from 'path';
-
-export class MicrosoftDistributions extends JavaBase {
-  constructor(installerOptions: JavaInstallerOptions) {
-    super('Microsoft', installerOptions);
-  }
-
-  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 extension = getDownloadArchiveExtension();
-    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
-
-    const archiveName = fs.readdirSync(extractedJavaPath)[0];
-    const archivePath = path.join(extractedJavaPath, archiveName);
-
-    const javaPath = await tc.cacheDir(
-      archivePath,
-      this.toolcacheFolderName,
-      this.getToolcacheVersionName(javaRelease.version),
-      this.architecture
-    );
-
-    return { version: javaRelease.version, path: javaPath };
-  }
-
-  protected async findPackageForDownload(range: string): Promise<JavaDownloadRelease> {
-    if (this.architecture !== 'x64' && this.architecture !== 'aarch64') {
-      throw new Error(`Unsupported architecture: ${this.architecture}`);
-    }
-
-    if (!this.stable) {
-      throw new Error('Early access versions are not supported');
-    }
-
-    if (this.packageType !== 'jdk') {
-      throw new Error('Microsoft Build of OpenJDK provides only the `jdk` package type');
-    }
-
-    const availableVersionsRaw = await this.getAvailableVersions();
-
-    const opts = this.getPlatformOption();
-    const availableVersions = availableVersionsRaw.map(item => ({
-      url: `https://aka.ms/download-jdk/microsoft-jdk-${item.version.join('.')}-${opts.os}-${
-        this.architecture
-      }.${opts.archive}`,
-      version: this.convertVersionToSemver(item)
-    }));
-
-    const satisfiedVersion = availableVersions
-      .filter(item => isVersionSatisfies(range, item.version))
-      .sort((a, b) => -semver.compareBuild(a.version, b.version))[0];
-
-    if (!satisfiedVersion) {
-      const availableOptions = availableVersions.map(item => item.version).join(', ');
-      const availableOptionsMessage = availableOptions
-        ? `\nAvailable versions: ${availableOptions}`
-        : '';
-      throw new Error(
-        `Could not find satisfied version for SemVer ${range}. ${availableOptionsMessage}`
-      );
-    }
-
-    return satisfiedVersion;
-  }
-
-  private async getAvailableVersions(): Promise<MicrosoftVersion[]> {
-    // TODO get these dynamically!
-    // We will need Microsoft to add an endpoint where we can query for versions.
-    const jdkVersions = [
-      {
-        version: [17, 0, 1, 12, 1]
-      },
-      {
-        version: [16, 0, 2, 7, 1]
-      }
-    ];
-
-    // M1 is only supported for Java 16 & 17
-    if (process.platform !== 'darwin' || this.architecture !== 'aarch64') {
-      jdkVersions.push({
-        version: [11, 0, 13, 8, 1]
-      });
-    }
-
-    return jdkVersions;
-  }
-
-  private getPlatformOption(
-    platform: NodeJS.Platform = process.platform /* for testing */
-  ): PlatformOptions {
-    switch (platform) {
-      case 'darwin':
-        return { archive: 'tar.gz', os: 'macos' };
-      case 'win32':
-        return { archive: 'zip', os: 'windows' };
-      case 'linux':
-        return { archive: 'tar.gz', os: 'linux' };
-      default:
-        throw new Error(
-          `Platform '${platform}' is not supported. Supported platforms: 'darwin', 'linux', 'win32'`
-        );
-    }
-  }
-
-  private convertVersionToSemver(version: MicrosoftVersion): string {
-    const major = version.version[0];
-    const minor = version.version[1];
-    const patch = version.version[2];
-    return `${major}.${minor}.${patch}`;
-  }
-}

src/distributions/microsoft/models.ts

@@ -1,12 +0,0 @@
-type OsVersions = 'linux' | 'macos' | 'windows';
-type ArchiveType = 'tar.gz' | 'zip';
-
-export interface PlatformOptions {
-  archive: ArchiveType;
-  os: OsVersions;
-}
-
-export interface MicrosoftVersion {
-  downloadUrl?: string;
-  version: Array<number>;
-}

src/distributions/temurin/installer.ts

@@ -1,155 +0,0 @@
-import * as core from '@actions/core';
-import * as tc from '@actions/tool-cache';
-
-import fs from 'fs';
-import path from 'path';
-import semver from 'semver';
-
-import { JavaBase } from '../base-installer';
-import { ITemurinAvailableVersions } from './models';
-import { JavaDownloadRelease, JavaInstallerOptions, JavaInstallerResults } from '../base-models';
-import { extractJdkFile, getDownloadArchiveExtension, isVersionSatisfies } from '../../util';
-
-export enum TemurinImplementation {
-  Hotspot = 'Hotspot'
-}
-
-export class TemurinDistribution extends JavaBase {
-  constructor(
-    installerOptions: JavaInstallerOptions,
-    private readonly jvmImpl: TemurinImplementation
-  ) {
-    super(`Temurin-${jvmImpl}`, installerOptions);
-  }
-
-  protected async findPackageForDownload(version: string): Promise<JavaDownloadRelease> {
-    const availableVersionsRaw = await this.getAvailableVersions();
-    const availableVersionsWithBinaries = availableVersionsRaw
-      .filter(item => item.binaries.length > 0)
-      .map(item => {
-        // normalize 17.0.0-beta+33.0.202107301459 to 17.0.0+33.0.202107301459 for earlier access versions
-        const formattedVersion = this.stable
-          ? item.version_data.semver
-          : item.version_data.semver.replace('-beta+', '+');
-        return {
-          version: formattedVersion,
-          url: item.binaries[0].package.link
-        } as JavaDownloadRelease;
-      });
-
-    const satisfiedVersions = availableVersionsWithBinaries
-      .filter(item => isVersionSatisfies(version, item.version))
-      .sort((a, b) => {
-        return -semver.compareBuild(a.version, b.version);
-      });
-
-    const resolvedFullVersion = satisfiedVersions.length > 0 ? satisfiedVersions[0] : null;
-    if (!resolvedFullVersion) {
-      const availableOptions = availableVersionsWithBinaries.map(item => item.version).join(', ');
-      const availableOptionsMessage = availableOptions
-        ? `\nAvailable versions: ${availableOptions}`
-        : '';
-      throw new Error(
-        `Could not find satisfied version for SemVer '${version}'. ${availableOptionsMessage}`
-      );
-    }
-
-    return resolvedFullVersion;
-  }
-
-  protected async downloadTool(javaRelease: JavaDownloadRelease): Promise<JavaInstallerResults> {
-    let javaPath: string;
-    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...`);
-    let extension = getDownloadArchiveExtension();
-
-    extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
-
-    const archiveName = fs.readdirSync(extractedJavaPath)[0];
-    const archivePath = path.join(extractedJavaPath, archiveName);
-    const version = this.getToolcacheVersionName(javaRelease.version);
-
-    javaPath = await tc.cacheDir(archivePath, this.toolcacheFolderName, version, this.architecture);
-
-    return { version: javaRelease.version, path: javaPath };
-  }
-
-  protected get toolcacheFolderName(): string {
-    return super.toolcacheFolderName;
-  }
-
-  private async getAvailableVersions(): Promise<ITemurinAvailableVersions[]> {
-    const platform = this.getPlatformOption();
-    const arch = this.architecture;
-    const imageType = this.packageType;
-    const versionRange = encodeURI('[1.0,100.0]'); // retrieve all available versions
-    const releaseType = this.stable ? 'ga' : 'ea';
-
-    console.time('temurin-retrieve-available-versions');
-
-    const baseRequestArguments = [
-      `project=jdk`,
-      'vendor=adoptium',
-      `heap_size=normal`,
-      'sort_method=DEFAULT',
-      'sort_order=DESC',
-      `os=${platform}`,
-      `architecture=${arch}`,
-      `image_type=${imageType}`,
-      `release_type=${releaseType}`,
-      `jvm_impl=${this.jvmImpl.toLowerCase()}`
-    ].join('&');
-
-    // need to iterate through all pages to retrieve the list of all versions
-    // Adoptium API doesn't provide way to retrieve the count of pages to iterate so infinity loop
-    let page_index = 0;
-    const availableVersions: ITemurinAvailableVersions[] = [];
-    while (true) {
-      const requestArguments = `${baseRequestArguments}&page_size=20&page=${page_index}`;
-      const availableVersionsUrl = `https://api.adoptium.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(`Gathering available versions from '${availableVersionsUrl}'`);
-      }
-
-      const paginationPage = (
-        await this.http.getJson<ITemurinAvailableVersions[]>(availableVersionsUrl)
-      ).result;
-      if (paginationPage === null || paginationPage.length === 0) {
-        // break infinity loop because we have reached end of pagination
-        break;
-      }
-
-      availableVersions.push(...paginationPage);
-      page_index++;
-    }
-
-    if (core.isDebug()) {
-      core.startGroup('Print information about available versions');
-      console.timeEnd('temurin-retrieve-available-versions');
-      console.log(`Available versions: [${availableVersions.length}]`);
-      console.log(availableVersions.map(item => item.version_data.semver).join(', '));
-      core.endGroup();
-    }
-
-    return availableVersions;
-  }
-
-  private getPlatformOption(): string {
-    // Adoptium has own platform names so need to map them
-    switch (process.platform) {
-      case 'darwin':
-        return 'mac';
-      case 'win32':
-        return 'windows';
-      default:
-        return process.platform;
-    }
-  }
-}

src/distributions/temurin/models.ts

@@ -1,38 +0,0 @@
-// Models from https://api.adoptium.net/q/swagger-ui/#/Assets/searchReleasesByVersion
-
-export interface ITemurinAvailableVersions {
-  binaries: [
-    {
-      architecture: string;
-      heap_size: string;
-      image_type: string;
-      jvm_impl: string;
-      os: string;
-      package: {
-        checksum: string;
-        checksum_link: string;
-        download_count: number;
-        link: string;
-        metadata_link: string;
-        name: string;
-        size: string;
-      };
-      project: string;
-      scm_ref: string;
-      updated_at: string;
-    }
-  ];
-  id: string;
-  release_link: string;
-  release_name: string;
-  release_type: string;
-  vendor: string;
-  version_data: {
-    build: number;
-    major: number;
-    minor: number;
-    openjdk_version: string;
-    security: string;
-    semver: string;
-  };
-}

src/gpg.ts

@@ -39,7 +39,8 @@ export async function importKey(privateKey: string) {
 }
 
 export async function deleteKey(keyFingerprint: string) {
-  await exec.exec('gpg', ['--batch', '--yes', '--delete-secret-and-public-key', keyFingerprint], {
+  await exec.exec('gpg', ['--batch', '--yes', '--delete-secret-keys', keyFingerprint], {
     silent: true
   });
+  await exec.exec('gpg', ['--batch', '--yes', '--delete-keys', keyFingerprint], { silent: true });
 }

src/setup-java.ts

@@ -1,8 +1,7 @@
 import * as core from '@actions/core';
 import * as auth from './auth';
-import { getBooleanInput, isCacheFeatureAvailable } from './util';
+import { getBooleanInput } from './util';
 import * as constants from './constants';
-import { restore } from './cache';
 import * as path from 'path';
 import { getJavaDistribution } from './distributions/distribution-factory';
 import { JavaInstallerOptions } from './distributions/base-models';
@@ -14,7 +13,6 @@ async function run() {
     const architecture = core.getInput(constants.INPUT_ARCHITECTURE);
     const packageType = core.getInput(constants.INPUT_JAVA_PACKAGE);
     const jdkFile = core.getInput(constants.INPUT_JDK_FILE);
-    const cache = core.getInput(constants.INPUT_CACHE);
     const checkLatest = getBooleanInput(constants.INPUT_CHECK_LATEST, false);
 
     const installerOptions: JavaInstallerOptions = {
@@ -42,9 +40,6 @@ async function run() {
     core.info(`##[add-matcher]${path.join(matchersPath, 'java.json')}`);
 
     await auth.configureAuthentication();
-    if (cache && isCacheFeatureAvailable()) {
-      await restore(cache);
-    }
   } catch (error) {
     core.setFailed(error.message);
   }

src/util.ts

@@ -2,12 +2,9 @@ import os from 'os';
 import path from 'path';
 import * as fs from 'fs';
 import * as semver from 'semver';
-import * as cache from '@actions/cache';
 import * as core from '@actions/core';
 
 import * as tc from '@actions/tool-cache';
-import { INPUT_JOB_STATUS } from './constants';
-
 export function getTempDir() {
   let tempDirectory = process.env['RUNNER_TEMP'] || os.tmpdir();
 
@@ -72,30 +69,3 @@ export function getToolcachePath(toolName: string, version: string, architecture
 
   return null;
 }
-
-export function isJobStatusSuccess() {
-  const jobStatus = core.getInput(INPUT_JOB_STATUS);
-
-  return jobStatus === 'success';
-}
-
-export function isGhes(): boolean {
-  const ghUrl = new URL(process.env['GITHUB_SERVER_URL'] || 'https://github.com');
-  return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM';
-}
-
-export function isCacheFeatureAvailable(): boolean {
-  if (!cache.isFeatureAvailable()) {
-    if (isGhes()) {
-      throw new Error(
-        'Caching is only supported on GHES version >= 3.5. If you are on a version >= 3.5, please check with your GHES admin if the Actions cache service is enabled or not.'
-      );
-    } else {
-      core.warning('The runner was not able to contact the cache service. Caching will be skipped');
-    }
-
-    return false;
-  }
-
-  return true;
-}