README.md

@@ -161,22 +161,6 @@ steps:
   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__/data/microsoft.json

@@ -1,41 +1,4 @@
 [
-    {
-      "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/adopt-installer.test.ts

@@ -7,7 +7,6 @@ import {JavaInstallerOptions} from '../../src/distributions/base-models';
 
 import os from 'os';
 
-import temurinManifestData from '../data/temurin.json';
 import manifestData from '../data/adopt.json';
 import {
   TemurinDistribution,
@@ -19,17 +18,7 @@ describe('getAvailableVersions', () => {
 
   beforeEach(() => {
     spyHttpClient = jest.spyOn(HttpClient.prototype, 'getJson');
-    spyHttpClient
-      .mockImplementation((requestUrl, additionalHeaders) => {
-        if (requestUrl.startsWith('https://api.adoptium.net/')) {
-          return {
-            statusCode: 200,
-            headers: {},
-            result: []
-          } as any;
-        }
-      })
-      .mockReturnValue({
+    spyHttpClient.mockReturnValue({
       statusCode: 200,
       headers: {},
       result: []
@@ -146,15 +135,6 @@ describe('getAvailableVersions', () => {
   it('load available versions', async () => {
     spyHttpClient = jest.spyOn(HttpClient.prototype, 'getJson');
     spyHttpClient
-      .mockImplementation((requestUrl, additionalHeaders) => {
-        if (requestUrl.startsWith('https://api.adoptium.net/')) {
-          return {
-            statusCode: 200,
-            headers: {},
-            result: []
-          } as any;
-        }
-      })
       .mockReturnValueOnce({
         statusCode: 200,
         headers: {},
@@ -256,17 +236,6 @@ 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 temurinDistribution = new TemurinDistribution(
-      {
-        version: '11',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
-      TemurinImplementation.Hotspot
-    );
-    temurinDistribution['getAvailableVersions'] = async () => [] as any;
-
     const distribution = new AdoptDistribution(
       {
         version: '11',
@@ -274,23 +243,26 @@ describe('findPackageForDownload', () => {
         packageType: 'jdk',
         checkLatest: false
       },
-      AdoptImplementation.Hotspot,
-      temurinDistribution
+      AdoptImplementation.Hotspot
     );
     distribution['getAvailableVersions'] = async () => manifestData as any;
-
     const resolvedVersion = await distribution['findPackageForDownload'](input);
     expect(resolvedVersion.version).toBe(expected);
   });
 
   describe('delegates to Temurin', () => {
     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']
+      ['9', '9.0.7+10'],
+      ['15', '15.0.2+7'],
+      ['15.0', '15.0.2+7'],
+      ['15.0.2', '15.0.2+7'],
+      ['15.0.1', '15.0.1+9.1'],
+      ['11.x', '11.0.10+9'],
+      ['x', '15.0.2+7'],
+      ['12', '12.0.2+10.3'], // make sure that '12.0.2+10.1', '12.0.2+10.3', '12.0.2+10.2' are sorted correctly
+      ['12.0.2+10.1', '12.0.2+10.1'],
+      ['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 temurinDistribution = new TemurinDistribution(
         {
@@ -301,8 +273,6 @@ describe('findPackageForDownload', () => {
         },
         TemurinImplementation.Hotspot
       );
-      temurinDistribution['getAvailableVersions'] = async () =>
-        temurinManifestData as any;
 
       const distribution = new AdoptDistribution(
         {
@@ -315,13 +285,11 @@ describe('findPackageForDownload', () => {
         temurinDistribution
       );
 
-      distribution['findPackageForDownload'] = async () => {
-        throw new Error(`Could not find satisfied version`);
-      };
-
-      const resolvedVersion = await temurinDistribution[
-        'findPackageForDownload'
-      ](input);
+      temurinDistribution['getAvailableVersions'] = async () =>
+        manifestData as any;
+      const resolvedVersion = await distribution['findPackageForDownload'](
+        input
+      );
       expect(resolvedVersion.version).toBe(expected);
     });
   });
@@ -366,16 +334,6 @@ describe('findPackageForDownload', () => {
   });
 
   it('version is found but binaries list is empty', async () => {
-    const temurinDistribution = new TemurinDistribution(
-      {
-        version: '11',
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      },
-      TemurinImplementation.Hotspot
-    );
-    temurinDistribution['getAvailableVersions'] = async () => [] as any;
     const distribution = new AdoptDistribution(
       {
         version: '11',
@@ -383,24 +341,13 @@ describe('findPackageForDownload', () => {
         packageType: 'jdk',
         checkLatest: false
       },
-      AdoptImplementation.Hotspot,
-      temurinDistribution
+      AdoptImplementation.Hotspot
     );
     distribution['getAvailableVersions'] = async () => manifestData as any;
     await expect(
       distribution['findPackageForDownload']('9.0.8')
     ).rejects.toThrow(/Could not find satisfied version for SemVer */);
   });
-  const temurinDistribution = new TemurinDistribution(
-    {
-      version: '11',
-      architecture: 'x64',
-      packageType: 'jdk',
-      checkLatest: false
-    },
-    TemurinImplementation.Hotspot
-  );
-  temurinDistribution['getAvailableVersions'] = async () => [] as any;
 
   it('version is not found', async () => {
     const distribution = new AdoptDistribution(
@@ -410,8 +357,7 @@ describe('findPackageForDownload', () => {
         packageType: 'jdk',
         checkLatest: false
       },
-      AdoptImplementation.Hotspot,
-      temurinDistribution
+      AdoptImplementation.Hotspot
     );
     distribution['getAvailableVersions'] = async () => manifestData as any;
     await expect(distribution['findPackageForDownload']('7.x')).rejects.toThrow(
@@ -420,23 +366,6 @@ describe('findPackageForDownload', () => {
   });
 
   it('version list is empty', async () => {
-    let spyHttpClient = jest.spyOn(HttpClient.prototype, 'getJson');
-
-    spyHttpClient.mockImplementation((requestUrl, additionalHeaders) => {
-      if (requestUrl.startsWith('https://api.adoptium.net/')) {
-        return {
-          statusCode: 200,
-          headers: {},
-          result: []
-        } as any;
-      }
-      return {
-        statusCode: 200,
-        headers: {},
-        result: manifestData as any
-      } as any;
-    });
-
     const distribution = new AdoptDistribution(
       {
         version: '11',

__tests__/distributors/microsoft-installer.test.ts

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

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.5.1",
-    "jest-circus": "^27.5.1",
+    "jest": "^27.2.5",
+    "jest-circus": "^27.2.5",
     "prettier": "^2.8.4",
     "ts-jest": "^27.0.5",
     "typescript": "^4.2.3"

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

@@ -1,41 +1,4 @@
 [
-  {
-    "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,