Bump eslint from 8.57.0 to 9.38.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.57.0 to 9.38.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](https://github.com/eslint/eslint/compare/v8.57.0...v9.38.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-version: 9.38.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/e2e-cache.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-15-intel, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
         uses: actions/checkout@v5
@@ -46,7 +46,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-15-intel, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
     needs: gradle-save
     steps:
       - name: Checkout
@@ -70,7 +70,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-15-intel, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
         uses: actions/checkout@v5
@@ -93,7 +93,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-15-intel, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
     needs: maven-save
     steps:
       - name: Checkout
@@ -121,7 +121,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-15-intel, windows-latest, ubuntu-22.04]
+        os: [macos-13, windows-latest, ubuntu-22.04]
     steps:
       - name: Checkout
         uses: actions/checkout@v5
@@ -133,7 +133,7 @@ jobs:
           java-version: '11'
           cache: sbt
       - name: Setup SBT
-        if: matrix.os == 'macos-15-intel'
+        if: matrix.os == 'macos-13'
         run: |
           echo ""Installing SBT...""
           brew install sbt
@@ -141,7 +141,7 @@ jobs:
         run: sbt update
 
       - name: Check files to cache on macos-latest
-        if: matrix.os == 'macos-15-intel'
+        if: matrix.os == 'macos-13'
         run: |
           if [ ! -d ~/Library/Caches/Coursier ]; then
             echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly"
@@ -170,7 +170,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-15-intel, windows-latest, ubuntu-22.04]
+        os: [macos-13, windows-latest, ubuntu-22.04]
     needs: sbt-save
     steps:
       - name: Checkout
@@ -184,7 +184,7 @@ jobs:
           cache: sbt
 
       - name: Confirm that ~/Library/Caches/Coursier directory has been made
-        if: matrix.os == 'macos-15-intel'
+        if: matrix.os == 'macos-13'
         run: |
           if [ ! -d ~/Library/Caches/Coursier ]; then
             echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly"

.github/workflows/e2e-versions.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-15-intel, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
         distribution: [
             'temurin',
             'adopt',
@@ -39,19 +39,10 @@ jobs:
           - distribution: microsoft
             version: 8
           - distribution: dragonwell
-            os: macos-15-intel
+            os: macos-13
         include:
-          - distribution: microsoft
-            os: windows-latest
-            version: 25
-          - distribution: microsoft
-            os: ubuntu-latest
-            version: 25
-          - distribution: microsoft
-            os: macos-latest
-            version: 25
           - distribution: oracle
-            os: macos-15-intel
+            os: macos-13
             version: 17
           - distribution: oracle
             os: windows-latest
@@ -229,7 +220,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-15-intel, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
         version: ['17-ea', '15.0.0-ea.14']
     steps:
       - name: Checkout
@@ -295,7 +286,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-15-intel, windows-latest, ubuntu-latest]
+        os: [macos-13, windows-latest, ubuntu-latest]
         distribution:
           ['temurin', 'zulu', 'liberica', 'semeru', 'sapmachine', 'jetbrains']
         java-package: ['jre']

__tests__/data/microsoft.json

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

__tests__/distributors/microsoft-installer.test.ts

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

dist/setup/index.js

@@ -129856,7 +129856,6 @@ class JavaBase {
         this.checkLatest = installerOptions.checkLatest;
     }
     setupJava() {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             let foundJava = this.findInToolcache();
             if (foundJava && !this.checkLatest) {
@@ -129864,105 +129863,39 @@ class JavaBase {
             }
             else {
                 core.info('Trying to resolve the latest version from remote');
-                const MAX_RETRIES = 4;
+                try {
-                const RETRY_DELAY_MS = 2000;
+                    const javaRelease = yield this.findPackageForDownload(this.version);
-                const retryableCodes = [
+                    core.info(`Resolved latest version as ${javaRelease.version}`);
-                    'ETIMEDOUT',
+                    if ((foundJava === null || foundJava === void 0 ? void 0 : foundJava.version) === javaRelease.version) {
-                    'ECONNRESET',
+                        core.info(`Resolved Java ${foundJava.version} from tool-cache`);
-                    'ENOTFOUND',
-                    'ECONNREFUSED'
-                ];
-                let retries = MAX_RETRIES;
-                while (retries > 0) {
-                    try {
-                        // Clear console timers before each attempt to prevent conflicts
-                        if (retries < MAX_RETRIES && core.isDebug()) {
-                            const consoleAny = console;
-                            (_b = (_a = consoleAny._times) === null || _a === void 0 ? void 0 : _a.clear) === null || _b === void 0 ? void 0 : _b.call(_a);
-                        }
-                        const javaRelease = yield this.findPackageForDownload(this.version);
-                        core.info(`Resolved latest version as ${javaRelease.version}`);
-                        if ((foundJava === null || foundJava === void 0 ? void 0 : foundJava.version) === javaRelease.version) {
-                            core.info(`Resolved Java ${foundJava.version} from tool-cache`);
-                        }
-                        else {
-                            core.info('Trying to download...');
-                            foundJava = yield this.downloadTool(javaRelease);
-                            core.info(`Java ${foundJava.version} was downloaded`);
-                        }
-                        break;
                     }
-                    catch (error) {
+                    else {
-                        retries--;
+                        core.info('Trying to download...');
-                        // Check if error is retryable (including aggregate errors)
+                        foundJava = yield this.downloadTool(javaRelease);
-                        const isRetryable = (error instanceof tc.HTTPError &&
+                        core.info(`Java ${foundJava.version} was downloaded`);
-                            error.httpStatusCode &&
-                            [429, 502, 503, 504].includes(error.httpStatusCode)) ||
-                            retryableCodes.includes(error === null || error === void 0 ? void 0 : error.code) ||
-                            ((error === null || error === void 0 ? void 0 : error.errors) &&
-                                Array.isArray(error.errors) &&
-                                error.errors.some((err) => retryableCodes.includes(err === null || err === void 0 ? void 0 : err.code)));
-                        if (retries > 0 && isRetryable) {
-                            core.debug(`Attempt failed due to network or timeout issues, initiating retry... (${retries} attempts left)`);
-                            yield new Promise(r => setTimeout(r, RETRY_DELAY_MS));
-                            continue;
-                        }
-                        if (error instanceof tc.HTTPError) {
-                            if (error.httpStatusCode === 403) {
-                                core.error('HTTP 403: Permission denied or access restricted.');
-                            }
-                            else if (error.httpStatusCode === 429) {
-                                core.warning('HTTP 429: Rate limit exceeded. Please retry later.');
-                            }
-                            else {
-                                core.error(`HTTP ${error.httpStatusCode}: ${error.message}`);
-                            }
-                        }
-                        else if (error && error.errors && Array.isArray(error.errors)) {
-                            core.error(`Java setup failed due to network or configuration error(s)`);
-                            if (error instanceof Error && error.stack) {
-                                core.debug(error.stack);
-                            }
-                            for (const err of error.errors) {
-                                const endpoint = (err === null || err === void 0 ? void 0 : err.address) || (err === null || err === void 0 ? void 0 : err.hostname) || '';
-                                const port = (err === null || err === void 0 ? void 0 : err.port) ? `:${err.port}` : '';
-                                const message = (err === null || err === void 0 ? void 0 : err.message) || 'Aggregate error';
-                                const endpointInfo = !message.includes(endpoint)
-                                    ? ` ${endpoint}${port}`
-                                    : '';
-                                const localInfo = err.localAddress && err.localPort
-                                    ? ` - Local (${err.localAddress}:${err.localPort})`
-                                    : '';
-                                const logMessage = `${message}${endpointInfo}${localInfo}`;
-                                core.error(logMessage);
-                                core.debug(`${err.stack || err.message}`);
-                                Object.entries(err).forEach(([key, value]) => {
-                                    core.debug(`"${key}": ${JSON.stringify(value)}`);
-                                });
-                            }
-                        }
-                        else {
-                            const message = error instanceof Error ? error.message : JSON.stringify(error);
-                            core.error(`Java setup process failed due to: ${message}`);
-                            if (typeof (error === null || error === void 0 ? void 0 : error.code) === 'string') {
-                                core.debug(error.stack);
-                            }
-                            const errorDetails = Object.assign({ name: error.name, message: error.message }, Object.getOwnPropertyNames(error)
-                                .filter(prop => !['name', 'message', 'stack'].includes(prop))
-                                .reduce((acc, prop) => {
-                                acc[prop] = error[prop];
-                                return acc;
-                            }, {}));
-                            Object.entries(errorDetails).forEach(([key, value]) => {
-                                core.debug(`"${key}": ${JSON.stringify(value)}`);
-                            });
-                        }
-                        throw error;
                     }
                 }
-            }
+                catch (error) {
-            if (!foundJava) {
+                    if (error instanceof tc.HTTPError) {
-                throw new Error('Failed to resolve Java version');
+                        if (error.httpStatusCode === 403) {
+                            core.error('HTTP 403: Permission denied or access restricted.');
+                        }
+                        else if (error.httpStatusCode === 429) {
+                            core.warning('HTTP 429: Rate limit exceeded. Please retry later.');
+                        }
+                        else {
+                            core.error(`HTTP ${error.httpStatusCode}: ${error.message}`);
+                        }
+                    }
+                    else {
+                        const message = error instanceof Error ? error.message : JSON.stringify(error);
+                        core.error(`Java setup failed due to network issue or timeout: ${message}`);
+                    }
+                    if (error instanceof Error && error.stack) {
+                        core.debug(error.stack);
+                    }
+                    throw error;
+                }
             }
             // JDK folder may contain postfix "Contents/Home" on macOS
             const macOSPostfixPath = path_1.default.join(foundJava.path, constants_1.MACOS_JAVA_CONTENT_POSTFIX);
@@ -131587,9 +131520,9 @@ class SapMachineDistribution extends base_installer_1.JavaBase {
         return __awaiter(this, void 0, void 0, function* () {
             const platform = this.getPlatformOption();
             const arch = this.distributionArchitecture();
-            let fetchedReleasesJson = yield this.fetchReleasesFromUrl('https://sapmachine.io/assets/data/sapmachine-releases-all.json');
+            let fetchedReleasesJson = yield this.fetchReleasesFromUrl('https://sap.github.io/SapMachine/assets/data/sapmachine-releases-all.json');
             if (!fetchedReleasesJson) {
-                fetchedReleasesJson = yield this.fetchReleasesFromUrl('https://sap.github.io/SapMachine/assets/data/sapmachine-releases-all.json');
+                fetchedReleasesJson = yield this.fetchReleasesFromUrl('https://api.github.com/repos/SAP/SapMachine/contents/assets/data/sapmachine-releases-all.json?ref=gh-pages', (0, util_1.getGitHubHttpHeaders)());
             }
             if (!fetchedReleasesJson) {
                 throw new Error(`Couldn't fetch SapMachine versions information from both primary and backup urls`);

package-lock.json

@@ -26,7 +26,7 @@
         "@typescript-eslint/eslint-plugin": "^8.35.1",
         "@typescript-eslint/parser": "^8.35.1",
         "@vercel/ncc": "^0.38.1",
-        "eslint": "^9.39.1",
+        "eslint": "^9.38.0",
         "eslint-config-prettier": "^8.6.0",
         "eslint-plugin-jest": "^29.0.1",
         "eslint-plugin-node": "^11.1.0",
@@ -859,9 +859,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.12.2",
+      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
-      "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -884,22 +884,22 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.4.2",
+      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.1.tgz",
-      "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==",
+      "integrity": "sha512-csZAzkNhsgwb0I/UAV6/RGFTbiakPCf0ZrGmrIxQpYvGZ00PhTkSnyKNolphgIvmnJeGw6rcGVEXfTzUnFuEvw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.17.0"
+        "@eslint/core": "^0.16.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.17.0",
+      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.16.0.tgz",
-      "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==",
+      "integrity": "sha512-nmC8/totwobIiFcGkDza3GIKfAw1+hLiYVrh3I1nIomQ8PEr5cxg34jnkmGawul/ep52wGRAcyeDCNtWKSOj4Q==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -934,9 +934,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.39.1",
+      "version": "9.38.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.1.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.38.0.tgz",
-      "integrity": "sha512-S26Stp4zCy88tH94QbBv3XCuzRQiZ9yXofEILmglYTh/Ug/a9/umqvgFtYBAo3Lp0nsI/5/qH1CCrbdK3AP1Tw==",
+      "integrity": "sha512-UZ1VpFvXf9J06YG9xQBdnzU+kthors6KjhMAl6f4gH4usHyh31rUf2DLGInT8RFYIReYXNSydgPY0V2LuWgl7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -957,13 +957,13 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.4.1",
+      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.0.tgz",
-      "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==",
+      "integrity": "sha512-sB5uyeq+dwCWyPi31B2gQlVlo+j5brPlWx4yZBrEaRo/nhdDE8Xke1gsGgtiBdaBTxuTkceLVuVt/pclrasb0A==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.17.0",
+        "@eslint/core": "^0.16.0",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -2831,20 +2831,20 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.39.1",
+      "version": "9.38.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.1.tgz",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.38.0.tgz",
-      "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==",
+      "integrity": "sha512-t5aPOpmtJcZcz5UJyY2GbvpDlsK5E8JqRqoKtfiKE3cNh437KIqfJr3A3AKf5k64NPx6d0G3dno6XDY05PqPtw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.21.1",
-        "@eslint/config-helpers": "^0.4.2",
+        "@eslint/config-helpers": "^0.4.1",
-        "@eslint/core": "^0.17.0",
+        "@eslint/core": "^0.16.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.39.1",
+        "@eslint/js": "9.38.0",
-        "@eslint/plugin-kit": "^0.4.1",
+        "@eslint/plugin-kit": "^0.4.0",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.2",
@@ -4402,9 +4402,9 @@
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "4.1.1",
+      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

package.json

@@ -46,7 +46,7 @@
     "@typescript-eslint/eslint-plugin": "^8.35.1",
     "@typescript-eslint/parser": "^8.35.1",
     "@vercel/ncc": "^0.38.1",
-    "eslint": "^9.39.1",
+    "eslint": "^9.38.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-jest": "^29.0.1",
     "eslint-plugin-node": "^11.1.0",

src/distributions/base-installer.ts

@@ -51,115 +51,39 @@ export abstract class JavaBase {
       core.info(`Resolved Java ${foundJava.version} from tool-cache`);
     } else {
       core.info('Trying to resolve the latest version from remote');
-      const MAX_RETRIES = 4;
+      try {
-      const RETRY_DELAY_MS = 2000;
+        const javaRelease = await this.findPackageForDownload(this.version);
-      const retryableCodes = [
+        core.info(`Resolved latest version as ${javaRelease.version}`);
-        'ETIMEDOUT',
+        if (foundJava?.version === javaRelease.version) {
-        'ECONNRESET',
+          core.info(`Resolved Java ${foundJava.version} from tool-cache`);
-        'ENOTFOUND',
+        } else {
-        'ECONNREFUSED'
+          core.info('Trying to download...');
-      ];
+          foundJava = await this.downloadTool(javaRelease);
-      let retries = MAX_RETRIES;
+          core.info(`Java ${foundJava.version} was downloaded`);
-      while (retries > 0) {
-        try {
-          // Clear console timers before each attempt to prevent conflicts
-          if (retries < MAX_RETRIES && core.isDebug()) {
-            const consoleAny = console as any;
-            consoleAny._times?.clear?.();
-          }
-          const javaRelease = await this.findPackageForDownload(this.version);
-          core.info(`Resolved latest version as ${javaRelease.version}`);
-          if (foundJava?.version === javaRelease.version) {
-            core.info(`Resolved Java ${foundJava.version} from tool-cache`);
-          } else {
-            core.info('Trying to download...');
-            foundJava = await this.downloadTool(javaRelease);
-            core.info(`Java ${foundJava.version} was downloaded`);
-          }
-          break;
-        } catch (error: any) {
-          retries--;
-          // Check if error is retryable (including aggregate errors)
-          const isRetryable =
-            (error instanceof tc.HTTPError &&
-              error.httpStatusCode &&
-              [429, 502, 503, 504].includes(error.httpStatusCode)) ||
-            retryableCodes.includes(error?.code) ||
-            (error?.errors &&
-              Array.isArray(error.errors) &&
-              error.errors.some((err: any) =>
-                retryableCodes.includes(err?.code)
-              ));
-          if (retries > 0 && isRetryable) {
-            core.debug(
-              `Attempt failed due to network or timeout issues, initiating retry... (${retries} attempts left)`
-            );
-            await new Promise(r => setTimeout(r, RETRY_DELAY_MS));
-            continue;
-          }
-          if (error instanceof tc.HTTPError) {
-            if (error.httpStatusCode === 403) {
-              core.error('HTTP 403: Permission denied or access restricted.');
-            } else if (error.httpStatusCode === 429) {
-              core.warning(
-                'HTTP 429: Rate limit exceeded. Please retry later.'
-              );
-            } else {
-              core.error(`HTTP ${error.httpStatusCode}: ${error.message}`);
-            }
-          } else if (error && error.errors && Array.isArray(error.errors)) {
-            core.error(
-              `Java setup failed due to network or configuration error(s)`
-            );
-            if (error instanceof Error && error.stack) {
-              core.debug(error.stack);
-            }
-            for (const err of error.errors) {
-              const endpoint = err?.address || err?.hostname || '';
-              const port = err?.port ? `:${err.port}` : '';
-              const message = err?.message || 'Aggregate error';
-              const endpointInfo = !message.includes(endpoint)
-                ? ` ${endpoint}${port}`
-                : '';
-              const localInfo =
-                err.localAddress && err.localPort
-                  ? ` - Local (${err.localAddress}:${err.localPort})`
-                  : '';
-              const logMessage = `${message}${endpointInfo}${localInfo}`;
-              core.error(logMessage);
-              core.debug(`${err.stack || err.message}`);
-              Object.entries(err).forEach(([key, value]) => {
-                core.debug(`"${key}": ${JSON.stringify(value)}`);
-              });
-            }
-          } else {
-            const message =
-              error instanceof Error ? error.message : JSON.stringify(error);
-            core.error(`Java setup process failed due to: ${message}`);
-            if (typeof error?.code === 'string') {
-              core.debug(error.stack);
-            }
-            const errorDetails = {
-              name: error.name,
-              message: error.message,
-              ...Object.getOwnPropertyNames(error)
-                .filter(prop => !['name', 'message', 'stack'].includes(prop))
-                .reduce<{[key: string]: any}>((acc, prop) => {
-                  acc[prop] = error[prop];
-                  return acc;
-                }, {})
-            };
-            Object.entries(errorDetails).forEach(([key, value]) => {
-              core.debug(`"${key}": ${JSON.stringify(value)}`);
-            });
-          }
-          throw error;
         }
+      } catch (error: any) {
+        if (error instanceof tc.HTTPError) {
+          if (error.httpStatusCode === 403) {
+            core.error('HTTP 403: Permission denied or access restricted.');
+          } else if (error.httpStatusCode === 429) {
+            core.warning('HTTP 429: Rate limit exceeded. Please retry later.');
+          } else {
+            core.error(`HTTP ${error.httpStatusCode}: ${error.message}`);
+          }
+        } else {
+          const message =
+            error instanceof Error ? error.message : JSON.stringify(error);
+          core.error(
+            `Java setup failed due to network issue or timeout: ${message}`
+          );
+        }
+        if (error instanceof Error && error.stack) {
+          core.debug(error.stack);
+        }
+        throw error;
       }
     }
-    if (!foundJava) {
+
-      throw new Error('Failed to resolve Java version');
-    }
     // JDK folder may contain postfix "Contents/Home" on macOS
     const macOSPostfixPath = path.join(
       foundJava.path,

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

@@ -1,133 +1,90 @@
 [
   {
-    "version": "25.0.0",
+  "version": "21.0.2",
-    "stable": true,
+  "stable": true,
-    "release_url": "https://aka.ms/download-jdk",
+  "release_url": "https://aka.ms/download-jdk",
-    "files": [
+  "files": [
-      {
+    {
-        "filename": "microsoft-jdk-25.0.0-macos-x64.tar.gz",
+      "filename": "microsoft-jdk-21.0.2-macos-x64.tar.gz",
-        "arch": "x64",
+      "arch": "x64",
-        "platform": "darwin",
+      "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-macos-x64.tar.gz"
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-x64.tar.gz"
-      },
+    },
-      {
+    {
-        "filename": "microsoft-jdk-25.0.0-linux-x64.tar.gz",
+      "filename": "microsoft-jdk-21.0.2-linux-x64.tar.gz",
-        "arch": "x64",
+      "arch": "x64",
-        "platform": "linux",
+      "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-linux-x64.tar.gz"
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-x64.tar.gz"
-      },
+    },
-      {
+    {
-        "filename": "microsoft-jdk-25.0.0-windows-x64.zip",
+      "filename": "microsoft-jdk-21.0.2-windows-x64.zip",
-        "arch": "x64",
+      "arch": "x64",
-        "platform": "win32",
+      "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-windows-x64.zip"
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-x64.zip"
-      },
+    },
-      {
+    {
-        "filename": "microsoft-jdk-25.0.0-macos-aarch64.tar.gz",
+      "filename": "microsoft-jdk-21.0.2-macos-aarch64.tar.gz",
-        "arch": "aarch64",
+      "arch": "aarch64",
-        "platform": "darwin",
+      "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-macos-aarch64.tar.gz"
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-aarch64.tar.gz"
-      },
+    },
-      {
+    {
-        "filename": "microsoft-jdk-25.0.0-linux-aarch64.tar.gz",
+      "filename": "microsoft-jdk-21.0.2-linux-aarch64.tar.gz",
-        "arch": "aarch64",
+      "arch": "aarch64",
-        "platform": "linux",
+      "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-linux-aarch64.tar.gz"
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-aarch64.tar.gz"
-      },
+    },
-      {
+    {
-        "filename": "microsoft-jdk-25.0.0-windows-aarch64.zip",
+      "filename": "microsoft-jdk-21.0.2-windows-aarch64.zip",
-        "arch": "aarch64",
+      "arch": "aarch64",
-        "platform": "win32",
+      "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-windows-aarch64.zip"
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-aarch64.zip"
-      }
+    }
-    ]
+  ]
-  },
+},
   {
-    "version": "21.0.2",
+  "version": "21.0.1",
-    "stable": true,
+  "stable": true,
-    "release_url": "https://aka.ms/download-jdk",
+  "release_url": "https://aka.ms/download-jdk",
-    "files": [
+  "files": [
-      {
+    {
-        "filename": "microsoft-jdk-21.0.2-macos-x64.tar.gz",
+      "filename": "microsoft-jdk-21.0.1-macos-x64.tar.gz",
-        "arch": "x64",
+      "arch": "x64",
-        "platform": "darwin",
+      "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-x64.tar.gz"
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-macos-x64.tar.gz"
-      },
+    },
-      {
+    {
-        "filename": "microsoft-jdk-21.0.2-linux-x64.tar.gz",
+      "filename": "microsoft-jdk-21.0.1-linux-x64.tar.gz",
-        "arch": "x64",
+      "arch": "x64",
-        "platform": "linux",
+      "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-x64.tar.gz"
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-linux-x64.tar.gz"
-      },
+    },
-      {
+    {
-        "filename": "microsoft-jdk-21.0.2-windows-x64.zip",
+      "filename": "microsoft-jdk-21.0.1-windows-x64.zip",
-        "arch": "x64",
+      "arch": "x64",
-        "platform": "win32",
+      "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-x64.zip"
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-x64.zip"
-      },
+    },
-      {
+    {
-        "filename": "microsoft-jdk-21.0.2-macos-aarch64.tar.gz",
+      "filename": "microsoft-jdk-21.0.1-macos-aarch64.tar.gz",
-        "arch": "aarch64",
+      "arch": "aarch64",
-        "platform": "darwin",
+      "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-aarch64.tar.gz"
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-macos-aarch64.tar.gz"
-      },
+    },
-      {
+    {
-        "filename": "microsoft-jdk-21.0.2-linux-aarch64.tar.gz",
+      "filename": "microsoft-jdk-21.0.1-linux-aarch64.tar.gz",
-        "arch": "aarch64",
+      "arch": "aarch64",
-        "platform": "linux",
+      "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-aarch64.tar.gz"
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-linux-aarch64.tar.gz"
-      },
+    },
-      {
+    {
-        "filename": "microsoft-jdk-21.0.2-windows-aarch64.zip",
+      "filename": "microsoft-jdk-21.0.1-windows-aarch64.zip",
-        "arch": "aarch64",
+      "arch": "aarch64",
-        "platform": "win32",
+      "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-aarch64.zip"
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-aarch64.zip"
-      }
+    }
-    ]
+  ]
-  },
+},
-  {
-    "version": "21.0.1",
-    "stable": true,
-    "release_url": "https://aka.ms/download-jdk",
-    "files": [
-      {
-        "filename": "microsoft-jdk-21.0.1-macos-x64.tar.gz",
-        "arch": "x64",
-        "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-macos-x64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.1-linux-x64.tar.gz",
-        "arch": "x64",
-        "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-linux-x64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.1-windows-x64.zip",
-        "arch": "x64",
-        "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-x64.zip"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.1-macos-aarch64.tar.gz",
-        "arch": "aarch64",
-        "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-macos-aarch64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.1-linux-aarch64.tar.gz",
-        "arch": "aarch64",
-        "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-linux-aarch64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.1-windows-aarch64.zip",
-        "arch": "aarch64",
-        "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-aarch64.zip"
-      }
-    ]
-  },
   {
     "version": "21.0.0",
     "stable": true,
@@ -219,42 +176,42 @@
     "stable": true,
     "release_url": "https://aka.ms/download-jdk",
     "files": [
-      {
+    {
-        "filename": "microsoft-jdk-17.0.9-macos-x64.tar.gz",
+      "filename": "microsoft-jdk-17.0.9-macos-x64.tar.gz",
-        "arch": "x64",
+      "arch": "x64",
-        "platform": "darwin",
+      "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-x64.tar.gz"
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-x64.tar.gz"
-      },
+    },
-      {
+    {
-        "filename": "microsoft-jdk-17.0.9-linux-x64.tar.gz",
+      "filename": "microsoft-jdk-17.0.9-linux-x64.tar.gz",
-        "arch": "x64",
+      "arch": "x64",
-        "platform": "linux",
+      "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-x64.tar.gz"
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-x64.tar.gz"
-      },
+    },
-      {
+    {
-        "filename": "microsoft-jdk-17.0.9-windows-x64.zip",
+      "filename": "microsoft-jdk-17.0.9-windows-x64.zip",
-        "arch": "x64",
+      "arch": "x64",
-        "platform": "win32",
+      "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-x64.zip"
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-x64.zip"
-      },
+    },
-      {
+    {
-        "filename": "microsoft-jdk-17.0.9-macos-aarch64.tar.gz",
+      "filename": "microsoft-jdk-17.0.9-macos-aarch64.tar.gz",
-        "arch": "aarch64",
+      "arch": "aarch64",
-        "platform": "darwin",
+      "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-aarch64.tar.gz"
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-aarch64.tar.gz"
-      },
+    },
-      {
+    {
-        "filename": "microsoft-jdk-17.0.9-linux-aarch64.tar.gz",
+      "filename": "microsoft-jdk-17.0.9-linux-aarch64.tar.gz",
-        "arch": "aarch64",
+      "arch": "aarch64",
-        "platform": "linux",
+      "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-aarch64.tar.gz"
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-aarch64.tar.gz"
-      },
+    },
-      {
+    {
-        "filename": "microsoft-jdk-17.0.9-windows-aarch64.zip",
+      "filename": "microsoft-jdk-17.0.9-windows-aarch64.zip",
-        "arch": "aarch64",
+      "arch": "aarch64",
-        "platform": "win32",
+      "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-aarch64.zip"
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-aarch64.zip"
-      }
+    }
     ]
   },
   {
@@ -878,4 +835,4 @@
       }
     ]
   }
-]
+]

src/distributions/sapmachine/installer.ts

@@ -8,6 +8,7 @@ import {
   convertVersionToSemver,
   extractJdkFile,
   getDownloadArchiveExtension,
+  getGitHubHttpHeaders,
   isVersionSatisfies,
   renameWinArchive
 } from '../../util';
@@ -63,12 +64,13 @@ export class SapMachineDistribution extends JavaBase {
     const arch = this.distributionArchitecture();
 
     let fetchedReleasesJson = await this.fetchReleasesFromUrl(
-      'https://sapmachine.io/assets/data/sapmachine-releases-all.json'
+      'https://sap.github.io/SapMachine/assets/data/sapmachine-releases-all.json'
     );
 
     if (!fetchedReleasesJson) {
       fetchedReleasesJson = await this.fetchReleasesFromUrl(
-        'https://sap.github.io/SapMachine/assets/data/sapmachine-releases-all.json'
+        'https://api.github.com/repos/SAP/SapMachine/contents/assets/data/sapmachine-releases-all.json?ref=gh-pages',
+        getGitHubHttpHeaders()
       );
     }