Merge a8e0c559af into 78078da0cd

* deps: Update actions/cache dep, rebuild solution, update docs

* docs: fix typo

* deps: update jest dependencies and licenses

* deps: fix vulnerable dependencies, rebuild solution

* licenses: update

README.md

@@ -41,6 +41,8 @@ This action allows you to work with Java and Scala projects.
 
   - `cache`: Quick [setup caching](#caching-packages-dependencies) for the dependencies managed through one of the predefined package managers. It can be one of "maven", "gradle" or "sbt".
 
+  - `cache-dependency-path`: The path to a dependency file: pom.xml, build.gradle, build.sbt, etc. This option can be used with the `cache` option. If this option is omitted, the action searches for the dependency file in the entire repository. This option supports wildcards and a list of file names for caching multiple dependencies.
+
   #### Maven options
   The action has a bunch of inputs to generate maven's [settings.xml](https://maven.apache.org/settings.html) on the fly and pass the values to Apache Maven GPG Plugin as well as Apache Maven Toolchains. See [advanced usage](docs/advanced-usage.md) for more.
 
@@ -115,10 +117,13 @@ Currently, the following distributions are supported:
 
 ### Caching packages dependencies
 The action has a built-in functionality for caching and restoring dependencies. It uses [toolkit/cache](https://github.com/actions/toolkit/tree/main/packages/cache) under hood for caching dependencies but requires less configuration settings. Supported package managers are gradle, maven and sbt. The format of the used cache key is `setup-java-${{ platform }}-${{ packageManager }}-${{ fileHash }}`, where the hash is based on the following files:
+
 - gradle: `**/*.gradle*`, `**/gradle-wrapper.properties`, `buildSrc/**/Versions.kt`, `buildSrc/**/Dependencies.kt`, `gradle/*.versions.toml`, and `**/versions.properties`
 - maven: `**/pom.xml`
 - sbt: all sbt build definition files `**/*.sbt`, `**/project/build.properties`, `**/project/**.scala`, `**/project/**.sbt`
 
+When the option `cache-dependency-path` is specified, the hash is based on the matching file. This option supports wildcards and a list of file names, and is especially useful for monorepos.
+
 The workflow output `cache-hit` is set to indicate if an exact match was found for the key [as actions/cache does](https://github.com/actions/cache/tree/main#outputs).
 
 The cache input is optional, and caching is turned off by default.
@@ -132,6 +137,9 @@ steps:
     distribution: 'temurin'
     java-version: '17'
     cache: 'gradle'
+    cache-dependency-path: | # optional
+      sub-project/*.gradle*
+      sub-project/**/gradle-wrapper.properties
 - run: ./gradlew build --no-daemon
 ```
 
@@ -144,6 +152,7 @@ steps:
     distribution: 'temurin'
     java-version: '17'
     cache: 'maven'
+    cache-dependency-path: 'sub-project/pom.xml' # optional
 - name: Build with Maven
   run: mvn -B package --file pom.xml
 ```
@@ -157,10 +166,29 @@ steps:
     distribution: 'temurin'
     java-version: '17'
     cache: 'sbt'
+    cache-dependency-path: | # optional
+      sub-project/build.sbt
+      sub-project/project/build.properties
 - name: Build with SBT
   run: sbt package
 ```
 
+#### Cache segment restore timeout
+Usually, cache gets downloaded in multiple segments of fixed sizes. Sometimes, a segment download gets stuck, which causes the workflow job to be stuck. The cache segment download timeout [was introduced](https://github.com/actions/toolkit/tree/main/packages/cache#cache-segment-restore-timeout) to solve this issue as it allows the segment download to get aborted and hence allows the job to proceed with a cache miss. The default value of the cache segment download timeout is set to 10 minutes and can be customized by specifying an environment variable named `SEGMENT_DOWNLOAD_TIMEOUT_MINS` with a timeout value in minutes.
+
+```yaml
+env:
+  SEGMENT_DOWNLOAD_TIMEOUT_MINS: '5'
+steps:
+- uses: actions/checkout@v3
+- uses: actions/setup-java@v3
+  with:
+    distribution: 'temurin'
+    java-version: '17'
+    cache: 'gradle'
+- run: ./gradlew build --no-daemon
+```
+
 ### Check latest
 
 In the basic examples above, the `check-latest` flag defaults to `false`. When set to `false`, the action tries to first resolve a version of Java from the local tool cache on the runner. If unable to find a specific version in the cache, the action will download a version of Java. Use the default or set `check-latest` to `false` if you prefer a faster more consistent setup experience that prioritizes trying to use the cached versions at the expense of newer versions sometimes being available for download.

__tests__/cache.test.ts

@@ -6,6 +6,7 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as core from '@actions/core';
 import * as cache from '@actions/cache';
+import * as glob from '@actions/glob';
 
 describe('dependency cache', () => {
   const ORIGINAL_RUNNER_OS = process.env['RUNNER_OS'];
@@ -64,6 +65,10 @@ describe('dependency cache', () => {
       ReturnType<typeof cache.restoreCache>,
       Parameters<typeof cache.restoreCache>
     >;
+    let spyGlobHashFiles: jest.SpyInstance<
+      ReturnType<typeof glob.hashFiles>,
+      Parameters<typeof glob.hashFiles>
+    >;
 
     beforeEach(() => {
       spyCacheRestore = jest
@@ -71,6 +76,7 @@ describe('dependency cache', () => {
         .mockImplementation((paths: string[], primaryKey: string) =>
           Promise.resolve(undefined)
         );
+      spyGlobHashFiles = jest.spyOn(glob, 'hashFiles');
       spyWarning.mockImplementation(() => null);
     });
 
@@ -93,6 +99,7 @@ describe('dependency cache', () => {
 
         await restore('maven');
         expect(spyCacheRestore).toHaveBeenCalled();
+        expect(spyGlobHashFiles).toHaveBeenCalledWith('**/pom.xml');
         expect(spyWarning).not.toHaveBeenCalled();
         expect(spyInfo).toHaveBeenCalledWith('maven cache is not found');
       });
@@ -110,6 +117,9 @@ describe('dependency cache', () => {
 
         await restore('gradle');
         expect(spyCacheRestore).toHaveBeenCalled();
+        expect(spyGlobHashFiles).toHaveBeenCalledWith(
+          '**/*.gradle*\n**/gradle-wrapper.properties\nbuildSrc/**/Versions.kt\nbuildSrc/**/Dependencies.kt\ngradle/*.versions.toml\n**/versions.properties'
+        );
         expect(spyWarning).not.toHaveBeenCalled();
         expect(spyInfo).toHaveBeenCalledWith('gradle cache is not found');
       });
@@ -118,6 +128,9 @@ describe('dependency cache', () => {
 
         await restore('gradle');
         expect(spyCacheRestore).toHaveBeenCalled();
+        expect(spyGlobHashFiles).toHaveBeenCalledWith(
+          '**/*.gradle*\n**/gradle-wrapper.properties\nbuildSrc/**/Versions.kt\nbuildSrc/**/Dependencies.kt\ngradle/*.versions.toml\n**/versions.properties'
+        );
         expect(spyWarning).not.toHaveBeenCalled();
         expect(spyInfo).toHaveBeenCalledWith('gradle cache is not found');
       });
@@ -127,18 +140,24 @@ describe('dependency cache', () => {
 
         await restore('gradle');
         expect(spyCacheRestore).toHaveBeenCalled();
+        expect(spyGlobHashFiles).toHaveBeenCalledWith(
+          '**/*.gradle*\n**/gradle-wrapper.properties\nbuildSrc/**/Versions.kt\nbuildSrc/**/Dependencies.kt\ngradle/*.versions.toml\n**/versions.properties'
+        );
         expect(spyWarning).not.toHaveBeenCalled();
         expect(spyInfo).toHaveBeenCalledWith('gradle cache is not found');
       });
-    });
-    it('downloads cache based on buildSrc/Versions.kt', async () => {
-      createDirectory(join(workspace, 'buildSrc'));
-      createFile(join(workspace, 'buildSrc', 'Versions.kt'));
+      it('downloads cache based on buildSrc/Versions.kt', async () => {
+        createDirectory(join(workspace, 'buildSrc'));
+        createFile(join(workspace, 'buildSrc', 'Versions.kt'));
 
-      await restore('gradle');
-      expect(spyCacheRestore).toHaveBeenCalled();
-      expect(spyWarning).not.toHaveBeenCalled();
-      expect(spyInfo).toHaveBeenCalledWith('gradle cache is not found');
+        await restore('gradle');
+        expect(spyCacheRestore).toHaveBeenCalled();
+        expect(spyGlobHashFiles).toHaveBeenCalledWith(
+          '**/*.gradle*\n**/gradle-wrapper.properties\nbuildSrc/**/Versions.kt\nbuildSrc/**/Dependencies.kt\ngradle/*.versions.toml\n**/versions.properties'
+        );
+        expect(spyWarning).not.toHaveBeenCalled();
+        expect(spyInfo).toHaveBeenCalledWith('gradle cache is not found');
+      });
     });
     describe('for sbt', () => {
       it('throws error if no build.sbt found', async () => {
@@ -153,6 +172,9 @@ describe('dependency cache', () => {
 
         await restore('sbt');
         expect(spyCacheRestore).toHaveBeenCalled();
+        expect(spyGlobHashFiles).toHaveBeenCalledWith(
+          '**/*.sbt\n**/project/build.properties\n**/project/**.scala\n**/project/**.sbt'
+        );
         expect(spyWarning).not.toHaveBeenCalled();
         expect(spyInfo).toHaveBeenCalledWith('sbt cache is not found');
       });
@@ -184,9 +206,53 @@ describe('dependency cache', () => {
 
       await restore('gradle');
       expect(spyCacheRestore).toHaveBeenCalled();
+      expect(spyGlobHashFiles).toHaveBeenCalledWith(
+        '**/*.gradle*\n**/gradle-wrapper.properties\nbuildSrc/**/Versions.kt\nbuildSrc/**/Dependencies.kt\ngradle/*.versions.toml\n**/versions.properties'
+      );
       expect(spyWarning).not.toHaveBeenCalled();
       expect(spyInfo).toHaveBeenCalledWith('gradle cache is not found');
     });
+    describe('cache-dependency-path', () => {
+      it('throws error if no matching dependency file found', async () => {
+        createFile(join(workspace, 'build.gradle.kts'));
+        await expect(
+          restore('gradle', 'sub-project/**/build.gradle.kts')
+        ).rejects.toThrow(
+          `No file in ${projectRoot(
+            workspace
+          )} matched to [sub-project/**/build.gradle.kts], make sure you have checked out the target repository`
+        );
+      });
+      it('downloads cache based on the specified pattern', async () => {
+        createFile(join(workspace, 'build.gradle.kts'));
+        createDirectory(join(workspace, 'sub-project1'));
+        createFile(join(workspace, 'sub-project1', 'build.gradle.kts'));
+        createDirectory(join(workspace, 'sub-project2'));
+        createFile(join(workspace, 'sub-project2', 'build.gradle.kts'));
+
+        await restore('gradle', 'build.gradle.kts');
+        expect(spyCacheRestore).toHaveBeenCalled();
+        expect(spyGlobHashFiles).toHaveBeenCalledWith('build.gradle.kts');
+        expect(spyWarning).not.toHaveBeenCalled();
+        expect(spyInfo).toHaveBeenCalledWith('gradle cache is not found');
+
+        await restore('gradle', 'sub-project1/**/*.gradle*\n');
+        expect(spyCacheRestore).toHaveBeenCalled();
+        expect(spyGlobHashFiles).toHaveBeenCalledWith(
+          'sub-project1/**/*.gradle*'
+        );
+        expect(spyWarning).not.toHaveBeenCalled();
+        expect(spyInfo).toHaveBeenCalledWith('gradle cache is not found');
+
+        await restore('gradle', '*.gradle*\nsub-project2/**/*.gradle*\n');
+        expect(spyCacheRestore).toHaveBeenCalled();
+        expect(spyGlobHashFiles).toHaveBeenCalledWith(
+          '*.gradle*\nsub-project2/**/*.gradle*'
+        );
+        expect(spyWarning).not.toHaveBeenCalled();
+        expect(spyInfo).toHaveBeenCalledWith('gradle cache is not found');
+      });
+    });
   });
   describe('save', () => {
     let spyCacheSave: jest.SpyInstance<

__tests__/data/microsoft.json

@@ -1,4 +1,41 @@
 [
+    {
+      "version": "21.0.0",
+      "stable": true,
+      "release_url": "https://aka.ms/download-jdk",
+      "files": [
+        {
+          "filename": "microsoft-jdk-21.0.0-macos-x64.tar.gz",
+          "arch": "x64",
+          "platform": "darwin",
+          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.0-macos-x64.tar.gz"
+        },
+        {
+          "filename": "microsoft-jdk-21.0.0-linux-x64.tar.gz",
+          "arch": "x64",
+          "platform": "linux",
+          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.0-linux-x64.tar.gz"
+        },
+        {
+          "filename": "microsoft-jdk-21.0.0-windows-x64.zip",
+          "arch": "x64",
+          "platform": "win32",
+          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.0-windows-x64.zip"
+        },
+        {
+          "filename": "microsoft-jdk-21.0.0-macos-aarch64.tar.gz",
+          "arch": "aarch64",
+          "platform": "darwin",
+          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.0-macos-aarch64.tar.gz"
+        },
+        {
+          "filename": "microsoft-jdk-21.0.0-linux-aarch64.tar.gz",
+          "arch": "aarch64",
+          "platform": "linux",
+          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.0-linux-aarch64.tar.gz"
+        }
+      ]
+    },
     {
         "version": "17.0.7",
         "stable": true,

__tests__/distributors/microsoft-installer.test.ts

@@ -29,6 +29,11 @@ describe('findPackageForDownload', () => {
   });
 
   it.each([
+    [
+      '21.x',
+      '21.0.0',
+      'https://aka.ms/download-jdk/microsoft-jdk-21.0.0-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
+    ],
     [
       '17.0.1',
       '17.0.1+12.1',

package.json

@@ -47,8 +47,8 @@
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-jest": "^27.2.1",
     "eslint-plugin-node": "^11.1.0",
-    "jest": "^27.2.5",
-    "jest-circus": "^27.2.5",
+    "jest": "^27.5.1",
+    "jest-circus": "^27.5.1",
     "prettier": "^2.8.4",
     "ts-jest": "^27.0.5",
     "typescript": "^4.2.3"

src/cache.ts

@@ -83,31 +83,34 @@ function findPackageManager(id: string): PackageManager {
 /**
  * A function that generates a cache key to use.
  * Format of the generated key will be "${{ platform }}-${{ id }}-${{ fileHash }}"".
- * If there is no file matched to {@link PackageManager.path}, the generated key ends with a dash (-).
  * @see {@link https://docs.github.com/en/actions/guides/caching-dependencies-to-speed-up-workflows#matching-a-cache-key|spec of cache key}
  */
-async function computeCacheKey(packageManager: PackageManager) {
-  const hash = await glob.hashFiles(packageManager.pattern.join('\n'));
-  return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${hash}`;
+async function computeCacheKey(
+  packageManager: PackageManager,
+  cacheDependencyPath?: string
+) {
+  const pattern = cacheDependencyPath
+    ? cacheDependencyPath.trim().split('\n')
+    : packageManager.pattern;
+  const fileHash = await glob.hashFiles(pattern.join('\n'));
+  if (!fileHash) {
+    throw new Error(
+      `No file in ${process.cwd()} matched to [${pattern}], make sure you have checked out the target repository`
+    );
+  }
+  return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${fileHash}`;
 }
 
 /**
  * Restore the dependency cache
  * @param id ID of the package manager, should be "maven" or "gradle"
+ * @param cacheDependencyPath The path to a dependency file
  */
-export async function restore(id: string) {
+export async function restore(id: string, cacheDependencyPath?: string) {
   const packageManager = findPackageManager(id);
-  const primaryKey = await computeCacheKey(packageManager);
-
+  const primaryKey = await computeCacheKey(packageManager, cacheDependencyPath);
   core.debug(`primary key is ${primaryKey}`);
   core.saveState(STATE_CACHE_PRIMARY_KEY, primaryKey);
-  if (primaryKey.endsWith('-')) {
-    throw new Error(
-      `No file in ${process.cwd()} matched to [${
-        packageManager.pattern
-      }], make sure you have checked out the target repository`
-    );
-  }
 
   // No "restoreKeys" is set, to start with a clear cache after dependency update (see https://github.com/actions/setup-java/issues/269)
   const matchedKey = await cache.restoreCache(packageManager.path, primaryKey);

src/constants.ts

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

src/distributions/microsoft/microsoft-openjdk-versions.json

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

src/setup-java.ts

@@ -24,6 +24,9 @@ async function run() {
     const packageType = core.getInput(constants.INPUT_JAVA_PACKAGE);
     const jdkFile = core.getInput(constants.INPUT_JDK_FILE);
     const cache = core.getInput(constants.INPUT_CACHE);
+    const cacheDependencyPath = core.getInput(
+      constants.INPUT_CACHE_DEPENDENCY_PATH
+    );
     const checkLatest = getBooleanInput(constants.INPUT_CHECK_LATEST, false);
     let toolchainIds = core.getMultilineInput(constants.INPUT_MVN_TOOLCHAIN_ID);
 
@@ -73,7 +76,7 @@ async function run() {
 
     await auth.configureAuthentication();
     if (cache && isCacheFeatureAvailable()) {
-      await restore(cache);
+      await restore(cache, cacheDependencyPath);
     }
   } catch (error) {
     core.setFailed(error.message);