Bump actions/checkout from 4 to 5

Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
2025-11-19 04:36:25 +08:00 · 2025-08-18 05:49:39 +00:00
36 changed files with 423 additions and 695 deletions
--- a/.github/workflows/basic-validation.yml
+++ b/.github/workflows/basic-validation.yml
@@ -16,4 +16,4 @@ jobs:
    name: Basic validation
    uses: actions/reusable-workflows/.github/workflows/basic-validation.yml@main
    with:
-      node-version: '24.x'
+      node-version: '20.x'
--- a/.github/workflows/check-dist.yml
+++ b/.github/workflows/check-dist.yml
@@ -16,4 +16,4 @@ jobs:
    name: Check dist/
    uses: actions/reusable-workflows/.github/workflows/check-dist.yml@main
    with:
-      node-version: '24.x'
+      node-version: '20.x'
--- a/.github/workflows/e2e-cache-dependency-path.yml
+++ b/.github/workflows/e2e-cache-dependency-path.yml
@@ -30,7 +30,7 @@ jobs:
        id: setup-java
        with:
          distribution: 'adopt'
-          java-version: '17'
+          java-version: '11'
          cache: gradle
          cache-dependency-path: __tests__/cache/gradle1/*.gradle*
      - name: Create files to cache
--- a/.github/workflows/e2e-cache.yml
+++ b/.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
@@ -30,7 +30,7 @@ jobs:
        id: setup-java
        with:
          distribution: 'adopt'
-          java-version: '17'
+          java-version: '11'
          cache: gradle
      - name: Create files to cache
        # Need to avoid using Gradle daemon to stabilize the save process on Windows
@@ -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"
--- a/.github/workflows/e2e-versions.yml
+++ b/.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']
--- a/.licenses/npm/@types/node.dep.yml
+++ b/.licenses/npm/@types/node.dep.yml
@@ -1,6 +1,6 @@
 ---
 name: "@types/node"
-version: 24.1.0
+version: 20.11.24
 type: npm
 summary: TypeScript definitions for node
 homepage: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node
--- a/.licenses/npm/undici-types.dep.yml
+++ b/.licenses/npm/undici-types.dep.yml
@@ -1,17 +1,15 @@
 ---
 name: undici-types
-version: 7.8.0
+version: 5.26.5
 type: npm
 summary: A stand-alone types package for Undici
 homepage: https://undici.nodejs.org
 license: mit
 licenses:
- sources: LICENSE
+- sources: Auto-generated MIT license text
  text: |
    MIT License

-    Copyright (c) Matteo Collina and Undici contributors
-
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
    in the Software without restriction, including without limitation the rights
--- a/README.md
+++ b/README.md
@@ -18,20 +18,11 @@ The `setup-java` action provides the following functionality for GitHub Actions

 This action allows you to work with Java and Scala projects.

-## Breaking changes in V5
-
- Upgraded action from node20 to node24
-  > Make sure your runner is on version v2.327.1 or later to ensure compatibility with this release [Release Notes](https://github.com/actions/runner/releases/tag/v2.327.1)
-
-For more details,  see the full release notes on the [releases page](https://github.com/actions/setup-java/releases/tag/v5.0.0)
-
 ## V2 vs V1

 - V2 supports custom distributions and provides support for Azul Zulu OpenJDK, Eclipse Temurin and AdoptOpenJDK  out of the box. V1 supports only Azul Zulu OpenJDK.
 - V2 requires you to specify distribution along with the version. V1 defaults to Azul Zulu OpenJDK, only version input is required. Follow [the migration guide](docs/switching-to-v2.md) to switch from V1 to V2.

-For information about the latest releases, recent updates, and newly supported distributions, please refer to the `setup-java` [Releases](https://github.com/actions/setup-java/releases).
-
 ## Usage

  - `java-version`: The Java version that is going to be set up. Takes a whole or [semver](#supported-version-syntax) Java version. If not specified, the action will expect `java-version-file` input to be specified.
@@ -78,8 +69,8 @@ For information about the latest releases, recent updates, and newly supported d
 #### Eclipse Temurin
 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'temurin' # See 'Supported distributions' for available options
    java-version: '21'
@@ -89,8 +80,8 @@ steps:
 #### Azul Zulu OpenJDK
 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'zulu' # See 'Supported distributions' for available options
    java-version: '21'
@@ -145,8 +136,8 @@ The cache input is optional, and caching is turned off by default.
 #### Caching gradle dependencies
 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'temurin'
    java-version: '21'
@@ -160,8 +151,8 @@ steps:
 #### Caching maven dependencies
 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'temurin'
    java-version: '21'
@@ -174,8 +165,8 @@ steps:
 #### Caching sbt dependencies
 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'temurin'
    java-version: '21'
@@ -194,8 +185,8 @@ Usually, cache gets downloaded in multiple segments of fixed sizes. Sometimes, a
 env:
  SEGMENT_DOWNLOAD_TIMEOUT_MINS: '5'
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'temurin'
    java-version: '21'
@@ -214,8 +205,8 @@ For Java distributions that are not cached on Hosted images, `check-latest` alwa

 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'temurin'
    java-version: '21'
@@ -233,9 +224,9 @@ jobs:
        java: [ '8', '11', '17', '21' ]
    name: Java ${{ matrix.Java }} sample
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
      - name: Setup java
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v4
        with:
          distribution: '<distribution>'
          java-version: ${{ matrix.java }}
@@ -244,11 +235,11 @@ jobs:

 ### Install multiple JDKs

-All configured Java versions are added to the PATH. The last one added to the PATH (i.e., the last JDK set up by this action) will be used as the default and available globally. Other Java versions can be accessed through environment variables such as 'JAVA_HOME_{{ MAJOR_VERSION }}_{{ ARCHITECTURE }}'. To use a specific Java version, set the JAVA_HOME environment variable accordingly and prepend its bin directory to the PATH to ensure it takes priority during execution.
+All versions are added to the PATH. The last version will be used and available globally. Other Java versions can be accessed through env variables with such specification as 'JAVA_HOME_{{ MAJOR_VERSION }}_{{ ARCHITECTURE }}'.

 ```yaml
    steps:
-      - uses: actions/setup-java@v5
+      - uses: actions/setup-java@v4
        with:
          distribution: '<distribution>'
          java-version: |
--- a/tests/data/microsoft.json
+++ b/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,
--- a/tests/distributors/adopt-installer.test.ts
+++ b/tests/distributors/adopt-installer.test.ts
@@ -191,9 +191,7 @@ describe('getAvailableVersions', () => {
  ])(
    'defaults to os.arch(): %s mapped to distro arch: %s',
    async (osArch: string, distroArch: string) => {
-      jest
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);

      const installerOptions: JavaInstallerOptions = {
        version: '17',
--- a/tests/distributors/base-installer.test.ts
+++ b/tests/distributors/base-installer.test.ts
@@ -287,7 +287,7 @@ describe('setupJava', () => {
    spyCoreSetOutput = jest.spyOn(core, 'setOutput');
    spyCoreSetOutput.mockImplementation(() => undefined);

-    jest.spyOn(os, 'arch').mockReturnValue('x86' as ReturnType<typeof os.arch>);
+    jest.spyOn(os, 'arch').mockReturnValue('x86');
  });

  afterEach(() => {
--- a/tests/distributors/corretto-installer.test.ts
+++ b/tests/distributors/corretto-installer.test.ts
@@ -150,8 +150,9 @@ describe('getAvailableVersions', () => {
      });
      mockPlatform(distribution, platform);

-      const availableVersion =
-        await distribution['findPackageForDownload'](version);
+      const availableVersion = await distribution['findPackageForDownload'](
+        version
+      );
      expect(availableVersion).not.toBeNull();
      expect(availableVersion.url).toBe(expectedLink);
    });
@@ -202,27 +203,29 @@ describe('getAvailableVersions', () => {
    });

    it.each([
-      ['amd64', 'x64'],
-      ['arm64', 'aarch64']
+      ['arm64', 'aarch64'],
+      ['amd64', 'x64']
    ])(
      'defaults to os.arch(): %s mapped to distro arch: %s',
      async (osArch: string, distroArch: string) => {
-        jest
-          .spyOn(os, 'arch')
-          .mockReturnValue(osArch as ReturnType<typeof os.arch>);
+        jest.spyOn(os, 'arch').mockReturnValue(osArch);

-        const distribution = new CorrettoDistribution({
-          version: '17',
+        const version = '17';
+        const installerOptions: JavaInstallerOptions = {
+          version,
          architecture: '', // to get default value
          packageType: 'jdk',
          checkLatest: false
-        });
+        };
+
+        const distribution = new CorrettoDistribution(installerOptions);
        mockPlatform(distribution, 'macos');

        const expectedLink = `https://corretto.aws/downloads/resources/17.0.2.8.1/amazon-corretto-17.0.2.8.1-macosx-${distroArch}.tar.gz`;

-        const availableVersion =
-          await distribution['findPackageForDownload']('17');
+        const availableVersion = await distribution['findPackageForDownload'](
+          version
+        );
        expect(availableVersion).not.toBeNull();
        expect(availableVersion.url).toBe(expectedLink);
      }
--- a/tests/distributors/dragonwell-installer.test.ts
+++ b/tests/distributors/dragonwell-installer.test.ts
@@ -206,8 +206,9 @@ describe('getAvailableVersions', () => {
        });
        mockPlatform(distribution, platform);

-        const availableVersion =
-          await distribution['findPackageForDownload'](jdkVersion);
+        const availableVersion = await distribution['findPackageForDownload'](
+          jdkVersion
+        );
        expect(availableVersion).not.toBeNull();
        expect(availableVersion.url).toBe(expectedLink);
      }
--- a/tests/distributors/graalvm-installer.test.ts
+++ b/tests/distributors/graalvm-installer.test.ts
@@ -98,35 +98,31 @@ describe('findPackageForDownload', () => {
  });

  it.each([
-    ['amd64', ['x64', 'amd64']],
-    ['arm64', ['aarch64', 'arm64']]
+    ['amd64', 'x64'],
+    ['arm64', 'aarch64']
  ])(
    'defaults to os.arch(): %s mapped to distro arch: %s',
-    async (osArch: string, distroArchs: string[]) => {
-      jest
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
+    async (osArch: string, distroArch: string) => {
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);
+      jest.spyOn(os, 'platform').mockReturnValue('linux');

-      const distribution = new GraalVMDistribution({
-        version: '21',
+      const version = '21';
+      const distro = new GraalVMDistribution({
+        version,
        architecture: '', // to get default value
        packageType: 'jdk',
        checkLatest: false
      });

      const osType = distribution.getPlatform();
-      if (osType === 'windows' && distroArchs.includes('aarch64')) {
+      if (osType === 'windows' && distroArch == 'aarch64') {
        return; // skip, aarch64 is not available for Windows
      }
      const archiveType = getDownloadArchiveExtension();
-      const result = await distribution['findPackageForDownload']('21');
+      const result = await distro['findPackageForDownload'](version);
+      const expectedUrl = `https://download.oracle.com/graalvm/21/latest/graalvm-jdk-21_${osType}-${distroArch}_bin.${archiveType}`;

-      const expectedUrls = distroArchs.map(
-        distroArch =>
-          `https://download.oracle.com/graalvm/21/latest/graalvm-jdk-21_${osType}-${distroArch}_bin.${archiveType}`
-      );
-
-      expect(expectedUrls).toContain(result.url);
+      expect(result.url).toBe(expectedUrl);
    }
  );

--- a/tests/distributors/jetbrains-installer.test.ts
+++ b/tests/distributors/jetbrains-installer.test.ts
@@ -76,8 +76,9 @@ describe('findPackageForDownload', () => {
        checkLatest: false
      });
      distribution['getAvailableVersions'] = async () => manifestData as any;
-      const resolvedVersion =
-        await distribution['findPackageForDownload'](input);
+      const resolvedVersion = await distribution['findPackageForDownload'](
+        input
+      );
      const url = resolvedVersion.url;
      const options = {method: 'HEAD'};

--- a/tests/distributors/liberica-installer.test.ts
+++ b/tests/distributors/liberica-installer.test.ts
@@ -105,11 +105,9 @@ describe('getAvailableVersions', () => {
  ])(
    'defaults to os.arch(): %s mapped to distro arch: %s',
    async (osArch: string, distroArch: DistroArch) => {
-      jest
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);

-      const distributions = new LibericaDistributions({
+      const distribution = new LibericaDistributions({
        version: '17',
        architecture: '', // to get default value
        packageType: 'jdk',
@@ -119,11 +117,11 @@ describe('getAvailableVersions', () => {
      const additionalParams =
        '&installation-type=archive&fields=downloadUrl%2Cversion%2CfeatureVersion%2CinterimVersion%2C' +
        'updateVersion%2CbuildVersion';
-      distributions['getPlatformOption'] = () => 'macos';
+      distribution['getPlatformOption'] = () => 'macos';

      const buildUrl = `https://api.bell-sw.com/v1/liberica/releases?os=macos&bundle-type=jdk&bitness=${distroArch.bitness}&arch=${distroArch.arch}&build-type=all${additionalParams}`;

-      await distributions['getAvailableVersions']();
+      await distribution['getAvailableVersions']();

      expect(spyHttpClient.mock.calls).toHaveLength(1);
      expect(spyHttpClient.mock.calls[0][0]).toBe(buildUrl);
--- a/tests/distributors/liberica-linux-installer.test.ts
+++ b/tests/distributors/liberica-linux-installer.test.ts
@@ -105,9 +105,7 @@ describe('getAvailableVersions', () => {
  ])(
    'defaults to os.arch(): %s mapped to distro arch: %s',
    async (osArch: string, distroArch: DistroArch) => {
-      jest
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);

      const distribution = new LibericaDistributions({
        version: '17',
--- a/tests/distributors/liberica-windows-installer.test.ts
+++ b/tests/distributors/liberica-windows-installer.test.ts
@@ -105,9 +105,7 @@ describe('getAvailableVersions', () => {
  ])(
    'defaults to os.arch(): %s mapped to distro arch: %s',
    async (osArch: string, distroArch: DistroArch) => {
-      jest
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);

      const distribution = new LibericaDistributions({
        version: '17',
--- a/tests/distributors/microsoft-installer.test.ts
+++ b/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',
@@ -100,9 +95,7 @@ describe('findPackageForDownload', () => {
  ])(
    'defaults to os.arch(): %s mapped to distro arch: %s',
    async (osArch: string, distroArch: string) => {
-      jest
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);
      jest.spyOn(os, 'platform').mockReturnValue('darwin');

      const version = '17';
@@ -126,9 +119,7 @@ describe('findPackageForDownload', () => {
  ])(
    'defaults to os.arch(): %s mapped to distro arch: %s',
    async (osArch: string, distroArch: string) => {
-      jest
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);
      jest.spyOn(os, 'platform').mockReturnValue('linux');

      const version = '17';
@@ -152,9 +143,7 @@ describe('findPackageForDownload', () => {
  ])(
    'defaults to os.arch(): %s mapped to distro arch: %s',
    async (osArch: string, distroArch: string) => {
-      jest
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);
      jest.spyOn(os, 'platform').mockReturnValue('win32');

      const version = '17';
--- a/tests/distributors/oracle-installer.test.ts
+++ b/tests/distributors/oracle-installer.test.ts
@@ -95,9 +95,7 @@ describe('findPackageForDownload', () => {
  ])(
    'defaults to os.arch(): %s mapped to distro arch: %s',
    async (osArch: string, distroArch: string) => {
-      jest
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);
      jest.spyOn(os, 'platform').mockReturnValue('linux');

      const version = '18';
--- a/tests/distributors/sapmachine-installer.test.ts
+++ b/tests/distributors/sapmachine-installer.test.ts
@@ -61,8 +61,9 @@ describe('getAvailableVersions', () => {

      mockPlatform(distribution, 'linux');

-      const availableVersion =
-        await distribution['findPackageForDownload'](version);
+      const availableVersion = await distribution['findPackageForDownload'](
+        version
+      );
      expect(availableVersion).not.toBeNull();
      expect(availableVersion.url).toBe(
        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.10/sapmachine-jdk-17.0.10_linux-x64_bin.tar.gz'
@@ -229,8 +230,9 @@ describe('getAvailableVersions', () => {
        });
        mockPlatform(distribution, platform);

-        const availableVersion =
-          await distribution['findPackageForDownload'](normalizedVersion);
+        const availableVersion = await distribution['findPackageForDownload'](
+          normalizedVersion
+        );
        expect(availableVersion).not.toBeNull();
        expect(availableVersion.url).toBe(expectedLink);
      }
--- a/tests/distributors/temurin-installer.test.ts
+++ b/tests/distributors/temurin-installer.test.ts
@@ -147,9 +147,7 @@ describe('getAvailableVersions', () => {
  ])(
    'defaults to os.arch(): %s mapped to distro arch: %s',
    async (osArch: string, distroArch: string) => {
-      jest
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
+      jest.spyOn(os, 'arch').mockReturnValue(distroArch);

      const installerOptions: JavaInstallerOptions = {
        version: '17',
--- a/tests/distributors/zulu-installer.test.ts
+++ b/tests/distributors/zulu-installer.test.ts
@@ -1,4 +1,5 @@
 import {HttpClient} from '@actions/http-client';
+import * as semver from 'semver';
 import {ZuluDistribution} from '../../src/distributions/zulu/installer';
 import {IZuluVersions} from '../../src/distributions/zulu/models';
 import * as utils from '../../src/util';
@@ -125,9 +126,7 @@ describe('getAvailableVersions', () => {
  ])(
    'defaults to os.arch(): %s mapped to distro arch: %s',
    async (osArch: string, distroArch: DistroArch) => {
-      jest
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);

      const distribution = new ZuluDistribution({
        version: '17',
--- a/tests/distributors/zulu-linux-installer.test.ts
+++ b/tests/distributors/zulu-linux-installer.test.ts
@@ -126,9 +126,7 @@ describe('getAvailableVersions', () => {
  ])(
    'defaults to os.arch(): %s mapped to distro arch: %s',
    async (osArch: string, distroArch: DistroArch) => {
-      jest
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);

      const distribution = new ZuluDistribution({
        version: '17',
@@ -137,9 +135,7 @@ describe('getAvailableVersions', () => {
        checkLatest: false
      });
      distribution['getPlatformOption'] = () => 'linux';
-      // Override extension for linux default arch case to match util behavior
-      spyUtilGetDownloadArchiveExtension.mockReturnValue('tar.gz');
-      const buildUrl = `https://api.azul.com/zulu/download/community/v1.0/bundles/?os=linux&ext=tar.gz&bundle_type=jdk&javafx=false&arch=${distroArch.arch}&hw_bitness=${distroArch.bitness}&release_status=ga`;
+      const buildUrl = `https://api.azul.com/zulu/download/community/v1.0/bundles/?os=linux&ext=zip&bundle_type=jdk&javafx=false&arch=${distroArch.arch}&hw_bitness=${distroArch.bitness}&release_status=ga`;

      await distribution['getAvailableVersions']();

--- a/tests/distributors/zulu-windows-installer.test.ts
+++ b/tests/distributors/zulu-windows-installer.test.ts
@@ -126,9 +126,7 @@ describe('getAvailableVersions', () => {
  ])(
    'defaults to os.arch(): %s mapped to distro arch: %s',
    async (osArch: string, distroArch: DistroArch) => {
-      jest
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);

      const distribution = new ZuluDistribution({
        version: '17',
--- a/action.yml
+++ b/action.yml
@@ -81,6 +81,6 @@ outputs:
  cache-hit:
    description: 'A boolean value to indicate an exact match was found for the primary key'
 runs:
-  using: 'node24'
+  using: 'node20'
  main: 'dist/setup/index.js'
  post: 'dist/cleanup/index.js'
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
@@ -94704,7 +94704,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
    const versionFileName = getFileName(versionFile);
    if (versionFileName == '.tool-versions') {
        javaVersionRegExp =
-            /^java\s+(?:\S*-)?(?<version>\d+(?:\.\d+)*([+_.-](?:openj9[-._]?\d[\w.-]*|java\d+|jre[-_\w]*|OpenJDK\d+[\w_.-]*|[a-z0-9]+))*)/im;
+            /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
    }
    else {
        javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
--- a/dist/setup/index.js
+++ b/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,22 +129863,7 @@ class JavaBase {
            }
            else {
                core.info('Trying to resolve the latest version from remote');
-                const MAX_RETRIES = 4;
-                const RETRY_DELAY_MS = 2000;
-                const retryableCodes = [
-                    'ETIMEDOUT',
-                    'ECONNRESET',
-                    '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) {
@@ -129890,23 +129874,8 @@ class JavaBase {
                        foundJava = yield this.downloadTool(javaRelease);
                        core.info(`Java ${foundJava.version} was downloaded`);
                    }
-                        break;
                }
                catch (error) {
-                        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 === 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.');
@@ -129918,52 +129887,16 @@ class JavaBase {
                            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)`);
+                    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);
                    }
-                            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;
                }
            }
-            }
-            if (!foundJava) {
-                throw new Error('Failed to resolve Java version');
-            }
            // JDK folder may contain postfix "Contents/Home" on macOS
            const macOSPostfixPath = path_1.default.join(foundJava.path, constants_1.MACOS_JAVA_CONTENT_POSTFIX);
            if (process.platform === 'darwin' && fs.existsSync(macOSPostfixPath)) {
@@ -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`);
@@ -132806,7 +132739,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
    const versionFileName = getFileName(versionFile);
    if (versionFileName == '.tool-versions') {
        javaVersionRegExp =
-            /^java\s+(?:\S*-)?(?<version>\d+(?:\.\d+)*([+_.-](?:openj9[-._]?\d[\w.-]*|java\d+|jre[-_\w]*|OpenJDK\d+[\w_.-]*|[a-z0-9]+))*)/im;
+            /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
    }
    else {
        javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
--- a/docs/advanced-usage.md
+++ b/docs/advanced-usage.md
@@ -31,8 +31,8 @@ Inputs `java-version` and `distribution` are mandatory and needs to be provided.

 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'temurin'
    java-version: '21'
@@ -44,8 +44,8 @@ steps:

 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'adopt-hotspot'
    java-version: '11'
@@ -56,8 +56,8 @@ steps:

 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'zulu'
    java-version: '21'
@@ -69,8 +69,8 @@ steps:

 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'liberica'
    java-version: '21'
@@ -82,8 +82,8 @@ steps:

 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'microsoft'
    java-version: '21'
@@ -97,7 +97,7 @@ steps:
 To get a higher rate limit, you can [generate a personal access token on github.com](https://github.com/settings/tokens/new) and pass it as the `token` input for the action:

 ```yaml
-uses: actions/setup-java@v5
+uses: actions/setup-java@v4
 with:
  token: ${{ secrets.GH_DOTCOM_TOKEN }}
  distribution: 'microsoft'
@@ -111,8 +111,8 @@ If the runner is not able to access github.com, any Java versions requested duri

 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'corretto'
    java-version: '21'
@@ -124,8 +124,8 @@ steps:

 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'oracle'
    java-version: '21'
@@ -137,8 +137,8 @@ steps:

 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'dragonwell'
    java-version: '8'
@@ -149,8 +149,8 @@ steps:
 **NOTE:** An OpenJDK release maintained and supported by SAP
 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'sapmachine'
    java-version: '21'
@@ -162,8 +162,8 @@ steps:

 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'graalvm'
    java-version: '21'
@@ -181,8 +181,8 @@ For example, `11.0.24` is not available but `11.0.16` is.

 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'jetbrains'
    java-version: '11'
@@ -194,8 +194,8 @@ GitHub token to the action to increase the rate limit. Set the `GITHUB_TOKEN` en

 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'jetbrains'
    java-version: '17'
@@ -219,8 +219,8 @@ The available package types are:
 ## Installing custom Java package type
 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: '<distribution>'
    java-version: '11'
@@ -232,8 +232,8 @@ steps:

 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: '<distribution>'
    java-version: '11'
@@ -249,7 +249,7 @@ steps:
 - run: |
    download_url="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz"
    wget -O $RUNNER_TEMP/java_package.tar.gz $download_url
- uses: actions/setup-java@v5
+- uses: actions/setup-java@v4
  with:
    distribution: 'jdkfile'
    jdkFile: ${{ runner.temp }}/java_package.tar.gz
@@ -275,7 +275,7 @@ If your use-case requires a custom distribution (in the example, alpine-linux is
          latest_semver_version=$(curl -sL $latest_jdk_json_url | jq -r 'version.semver')
          echo "java_version=$latest_semver_version" >> "$GITHUB_OUTPUT"

-      - uses: actions/setup-java@v5
+      - uses: actions/setup-java@v4
        with:
          distribution: 'jdkfile'
          jdkFile: ${{ runner.temp }}/java_package.tar.gz
@@ -296,9 +296,9 @@ jobs:
        java: [ '8', '11' ]
    name: Java ${{ matrix.Java }} (${{ matrix.distribution }}) sample
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
      - name: Setup java
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v4
        with:
          distribution: ${{ matrix.distribution }}
          java-version: ${{ matrix.java }}
@@ -316,9 +316,9 @@ jobs:
        os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
    name: Java ${{ matrix.Java }} (${{ matrix.os }}) sample
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
      - name: Setup java
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v4
        with:
          distribution: 'temurin'
          java-version: ${{ matrix.java }}
@@ -333,9 +333,9 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v4
    - name: Set up JDK 11
-      uses: actions/setup-java@v5
+      uses: actions/setup-java@v4
      with:
        distribution: '<distribution>'
        java-version: '11'
@@ -349,7 +349,7 @@ jobs:
        GITHUB_TOKEN: ${{ github.token }} # GITHUB_TOKEN is the default env for the password

    - name: Set up Apache Maven Central
-      uses: actions/setup-java@v5
+      uses: actions/setup-java@v4
      with: # running setup-java again overwrites the settings.xml
        distribution: 'temurin'
        java-version: '11'
@@ -446,9 +446,9 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v4
    - name: Set up JDK 11 for Shared Runner
-      uses: actions/setup-java@v5
+      uses: actions/setup-java@v4
      with:
        distribution: '<distribution>'
        java-version: '11'
@@ -472,10 +472,10 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v4

    - name: Set up JDK 11
-      uses: actions/setup-java@v5
+      uses: actions/setup-java@v4
      with:
        distribution: '<distribution>'
        java-version: '11'
@@ -509,14 +509,14 @@ Subsequent calls to `setup-java` with distinct distribution and version paramete

 ```yaml
 steps:
- uses: actions/setup-java@v5
+- uses: actions/setup-java@v4
  with:
    distribution: '<distribution>'
    java-version: |
      8
      11

- uses: actions/setup-java@v5
+- uses: actions/setup-java@v4
  with:
    distribution: '<distribution>'
    java-version: '15'
@@ -528,7 +528,7 @@ The result is a Toolchain with entries for JDKs 8, 11 and 15. You can even combi
 - run: |
    download_url="https://example.com/java/jdk/6u45-b06/jdk-6u45-linux-x64.tar.gz"
    wget -O $RUNNER_TEMP/java_package.tar.gz $download_url
- uses: actions/setup-java@v5
+- uses: actions/setup-java@v4
  with:
    distribution: 'jdkfile'
    jdkFile: ${{ runner.temp }}/java_package.tar.gz
@@ -545,7 +545,7 @@ Each JDK provider will receive a default `vendor` using the `distribution` input
 - run: |
    download_url="https://example.com/java/jdk/6u45-b06/jdk-6u45-linux-x64.tar.gz"
    wget -O $RUNNER_TEMP/java_package.tar.gz $download_url
- uses: actions/setup-java@v5
+- uses: actions/setup-java@v4
  with:
    distribution: 'jdkfile'
    jdkFile: ${{ runner.temp }}/java_package.tar.gz
@@ -560,7 +560,7 @@ In case you install multiple versions of Java at once with multi-line `java-vers

 ```yaml
 steps:
- uses: actions/setup-java@v5
+- uses: actions/setup-java@v4
  with:
    distribution: '<distribution>'
    java-version: |
@@ -574,8 +574,8 @@ Each JDK provider will receive a default `id` based on the combination of `distr

 ```yaml
 steps:
- uses: actions/checkout@v5
- uses: actions/setup-java@v5
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
  with:
    distribution: 'temurin'
    java-version: '11'
@@ -587,7 +587,7 @@ In case you install multiple versions of Java at once you can use the same synta

 ```yaml
 steps:
- uses: actions/setup-java@v5
+- uses: actions/setup-java@v4
  with:
    distribution: '<distribution>'
    java-version: |
@@ -614,9 +614,5 @@ major versions: 8, 11, 16, 17, 21
 more specific versions: 8.0.282+8, 8.0.232, 11.0, 11.0.4, 17.0
 early access (EA) versions: 15-ea, 15.0.0-ea
 versions with specified distribution: openjdk64-11.0.2
-LTS versions : temurin-21.0.5+11.0.LTS
 ```
 If the file contains multiple versions, only the first one will be recognized.
-
-***NOTE***:
-For the tool-version file, ensure that you use standard semantic versioning (semver) formats, as non-standard formats (such as jetbrains-21b212.1) may not be parsed correctly. Additionally, for complex version strings containing multiple version-like segments (for example, java semeru-openj9-11.0.15+10_openj9-0.32.0), the extraction logic may incorrectly capture the last segment (0.32.0) instead of the main version (11.0.15+10).
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "setup-java",
-  "version": "5.0.0",
+  "version": "4.0.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "setup-java",
-      "version": "5.0.0",
+      "version": "4.0.0",
      "license": "MIT",
      "dependencies": {
        "@actions/cache": "^4.0.3",
@@ -17,11 +17,11 @@
        "@actions/io": "^1.0.2",
        "@actions/tool-cache": "^2.0.1",
        "semver": "^7.6.0",
-        "xmlbuilder2": "^4.0.0"
+        "xmlbuilder2": "^2.4.0"
      },
      "devDependencies": {
        "@types/jest": "^29.5.14",
-        "@types/node": "^24.1.0",
+        "@types/node": "^20.11.24",
        "@types/semver": "^7.5.8",
        "@typescript-eslint/eslint-plugin": "^8.35.1",
        "@typescript-eslint/parser": "^8.35.1",
@@ -32,12 +32,9 @@
        "eslint-plugin-node": "^11.1.0",
        "jest": "^29.7.0",
        "jest-circus": "^29.7.0",
-        "prettier": "^3.6.2",
+        "prettier": "^2.8.4",
        "ts-jest": "^29.3.0",
        "typescript": "^5.3.3"
-      },
-      "engines": {
-        "node": ">=24.0.0"
      }
    },
    "node_modules/@aashutoshrathi/word-wrap": {
@@ -978,11 +975,10 @@
      }
    },
    "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
-      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "argparse": "^1.0.7",
        "esprima": "^4.0.0"
@@ -1410,51 +1406,47 @@
      }
    },
    "node_modules/@oozcitak/dom": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@oozcitak/dom/-/dom-2.0.1.tgz",
-      "integrity": "sha512-Un5k8MKqGak1LQM/behcHylmGdRopBXZax19weVedEAIrOCRZooY+MvX4Ehcz0ftOEPgYZ7vjIm/+MokVBFO3w==",
-      "license": "MIT",
+      "version": "1.15.8",
+      "resolved": "https://registry.npmjs.org/@oozcitak/dom/-/dom-1.15.8.tgz",
+      "integrity": "sha512-MoOnLBNsF+ok0HjpAvxYxR4piUhRDCEWK0ot3upwOOHYudJd30j6M+LNcE8RKpwfnclAX9T66nXXzkytd29XSw==",
      "dependencies": {
-        "@oozcitak/infra": "^2.0.1",
-        "@oozcitak/url": "^2.0.1",
-        "@oozcitak/util": "^9.0.2"
+        "@oozcitak/infra": "1.0.8",
+        "@oozcitak/url": "1.0.4",
+        "@oozcitak/util": "8.3.8"
      },
      "engines": {
-        "node": ">=20.0"
+        "node": ">=8.0"
      }
    },
    "node_modules/@oozcitak/infra": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@oozcitak/infra/-/infra-2.0.1.tgz",
-      "integrity": "sha512-TtjI+kducm0ExL3OTKglPLkAIQ3alq0Otbokml62haZESfQaL3ojLJxl7+UTBhWCkBBuCshzGEEYmX5MXo8WOg==",
-      "license": "MIT",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@oozcitak/infra/-/infra-1.0.8.tgz",
+      "integrity": "sha512-JRAUc9VR6IGHOL7OGF+yrvs0LO8SlqGnPAMqyzOuFZPSZSXI7Xf2O9+awQPSMXgIWGtgUf/dA6Hs6X6ySEaWTg==",
      "dependencies": {
-        "@oozcitak/util": "~9.0.2"
+        "@oozcitak/util": "8.3.8"
      },
      "engines": {
-        "node": ">=20.0"
+        "node": ">=6.0"
      }
    },
    "node_modules/@oozcitak/url": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@oozcitak/url/-/url-2.0.1.tgz",
-      "integrity": "sha512-lLHUQUyYy86q+qbALr0TMVh+VQAYwNGbsxBx4LhfjvkNYG0hgAwWtq7ePebGs2nEhZmmIFl24ikuCpH2r5d3+A==",
-      "license": "MIT",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@oozcitak/url/-/url-1.0.4.tgz",
+      "integrity": "sha512-kDcD8y+y3FCSOvnBI6HJgl00viO/nGbQoCINmQ0h98OhnGITrWR3bOGfwYCthgcrV8AnTJz8MzslTQbC3SOAmw==",
      "dependencies": {
-        "@oozcitak/infra": "^2.0.1",
-        "@oozcitak/util": "^9.0.2"
+        "@oozcitak/infra": "1.0.8",
+        "@oozcitak/util": "8.3.8"
      },
      "engines": {
-        "node": ">=20.0"
+        "node": ">=8.0"
      }
    },
    "node_modules/@oozcitak/util": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/@oozcitak/util/-/util-9.0.4.tgz",
-      "integrity": "sha512-kmx1hRJlsvxiTCpK97off59LqSEOtkWOPe4rdfFL8TjZtihYSTVNObIfc86jtLngfnuIuuTRt+TUCgRS220RSQ==",
-      "license": "MIT",
+      "version": "8.3.8",
+      "resolved": "https://registry.npmjs.org/@oozcitak/util/-/util-8.3.8.tgz",
+      "integrity": "sha512-T8TbSnGsxo6TDBJx/Sgv/BlVJL3tshxZP7Aq5R1mSnM5OcHY2dQaxLMu2+E8u3gN0MLOzdjurqN4ZRVuzQycOQ==",
      "engines": {
-        "node": ">=20.0"
+        "node": ">=8.0"
      }
    },
    "node_modules/@opentelemetry/api": {
@@ -1652,12 +1644,11 @@
      }
    },
    "node_modules/@types/node": {
-      "version": "24.1.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.1.0.tgz",
-      "integrity": "sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==",
-      "license": "MIT",
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
      "dependencies": {
-        "undici-types": "~7.8.0"
+        "undici-types": "~5.26.4"
      }
    },
    "node_modules/@types/node-fetch": {
@@ -2119,7 +2110,8 @@
    "node_modules/argparse": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
    },
    "node_modules/async": {
      "version": "3.2.6",
@@ -2966,7 +2958,6 @@
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
      "bin": {
        "esparse": "bin/esparse.js",
        "esvalidate": "bin/esvalidate.js"
@@ -4306,10 +4297,10 @@
      "license": "MIT"
    },
    "node_modules/js-yaml": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
-      "license": "MIT",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
      "dependencies": {
        "argparse": "^2.0.1"
      },
@@ -4881,16 +4872,15 @@
      }
    },
    "node_modules/prettier": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
-      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
      "dev": true,
-      "license": "MIT",
      "bin": {
-        "prettier": "bin/prettier.cjs"
+        "prettier": "bin-prettier.js"
      },
      "engines": {
-        "node": ">=14"
+        "node": ">=10.13.0"
      },
      "funding": {
        "url": "https://github.com/prettier/prettier?sponsor=1"
@@ -5219,8 +5209,7 @@
    "node_modules/sprintf-js": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
    },
    "node_modules/stack-utils": {
      "version": "2.0.6",
@@ -5521,10 +5510,9 @@
      }
    },
    "node_modules/undici-types": {
-      "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
-      "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
-      "license": "MIT"
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
    },
    "node_modules/update-browserslist-db": {
      "version": "1.0.13",
@@ -5669,18 +5657,38 @@
      }
    },
    "node_modules/xmlbuilder2": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xmlbuilder2/-/xmlbuilder2-4.0.0.tgz",
-      "integrity": "sha512-zIoY033NGmbzHX1cYOGKNfeWpZyiGLzXGHNoxQ6tR/R+WqT7mqz+EDtFdPwqnhIms6vHz9BNtMS47DiGPyGfwg==",
-      "license": "MIT",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder2/-/xmlbuilder2-2.4.1.tgz",
+      "integrity": "sha512-vliUplZsk5vJnhxXN/mRcij/AE24NObTUm/Zo4vkLusgayO6s3Et5zLEA14XZnY1c3hX5o1ToR0m0BJOPy0UvQ==",
      "dependencies": {
-        "@oozcitak/dom": "^2.0.1",
-        "@oozcitak/infra": "^2.0.1",
-        "@oozcitak/util": "^9.0.4",
-        "js-yaml": "^4.1.0"
+        "@oozcitak/dom": "1.15.8",
+        "@oozcitak/infra": "1.0.8",
+        "@oozcitak/util": "8.3.8",
+        "@types/node": "*",
+        "js-yaml": "3.14.0"
      },
      "engines": {
-        "node": ">=20.0"
+        "node": ">=10.0"
+      }
+    },
+    "node_modules/xmlbuilder2/node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/xmlbuilder2/node_modules/js-yaml": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
      }
    },
    "node_modules/y18n": {
--- a/package.json
+++ b/package.json
@@ -1,12 +1,9 @@
 {
  "name": "setup-java",
-  "version": "5.0.0",
+  "version": "4.0.0",
  "private": true,
  "description": "setup java action",
  "main": "dist/setup/index.js",
-  "engines": {
-    "node": ">=24.0.0"
-  },
  "scripts": {
    "build": "ncc build -o dist/setup src/setup-java.ts && ncc build -o dist/cleanup src/cleanup-java.ts",
    "format": "prettier --no-error-on-unmatched-pattern --config ./.prettierrc.js --write \"**/*.{ts,yml,yaml}\"",
@@ -37,11 +34,11 @@
    "@actions/io": "^1.0.2",
    "@actions/tool-cache": "^2.0.1",
    "semver": "^7.6.0",
-    "xmlbuilder2": "^4.0.0"
+    "xmlbuilder2": "^2.4.0"
  },
  "devDependencies": {
    "@types/jest": "^29.5.14",
-    "@types/node": "^24.1.0",
+    "@types/node": "^20.11.24",
    "@types/semver": "^7.5.8",
    "@typescript-eslint/eslint-plugin": "^8.35.1",
    "@typescript-eslint/parser": "^8.35.1",
@@ -52,7 +49,7 @@
    "eslint-plugin-node": "^11.1.0",
    "jest": "^29.7.0",
    "jest-circus": "^29.7.0",
-    "prettier": "^3.6.2",
+    "prettier": "^2.8.4",
    "ts-jest": "^29.3.0",
    "typescript": "^5.3.3"
  },
--- a/src/distributions/base-installer.ts
+++ b/src/distributions/base-installer.ts
@@ -51,22 +51,7 @@ 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;
-      const RETRY_DELAY_MS = 2000;
-      const retryableCodes = [
-        'ETIMEDOUT',
-        'ECONNRESET',
-        '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 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) {
@@ -76,90 +61,29 @@ export abstract class JavaBase {
          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.'
-              );
+            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);
+          core.error(
+            `Java setup failed due to network issue or timeout: ${message}`
+          );
        }
-            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)}`);
-            });
+        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,
--- a/src/distributions/microsoft/microsoft-openjdk-versions.json
+++ b/src/distributions/microsoft/microsoft-openjdk-versions.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.2",
  "stable": true,
@@ -84,7 +41,7 @@
      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-aarch64.zip"
    }
  ]
-  },
+},
  {
  "version": "21.0.1",
  "stable": true,
@@ -127,7 +84,7 @@
      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-aarch64.zip"
    }
  ]
-  },
+},
  {
    "version": "21.0.0",
    "stable": true,
--- a/src/distributions/sapmachine/installer.ts
+++ b/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()
      );
    }

--- a/src/toolchains.ts
+++ b/src/toolchains.ts
@@ -59,8 +59,9 @@ export async function createToolchainsSettings({
  // when an alternate m2 location is specified use only that location (no .m2 directory)
  // otherwise use the home/.m2/ path
  await io.mkdirP(settingsDirectory);
-  const originalToolchains =
-    await readExistingToolchainsFile(settingsDirectory);
+  const originalToolchains = await readExistingToolchainsFile(
+    settingsDirectory
+  );
  const updatedToolchains = generateToolchainDefinition(
    originalToolchains,
    jdkInfo.version,
--- a/src/util.ts
+++ b/src/util.ts
@@ -133,7 +133,7 @@ export function getVersionFromFileContent(
  const versionFileName = getFileName(versionFile);
  if (versionFileName == '.tool-versions') {
    javaVersionRegExp =
-      /^java\s+(?:\S*-)?(?<version>\d+(?:\.\d+)*([+_.-](?:openj9[-._]?\d[\w.-]*|java\d+|jre[-_\w]*|OpenJDK\d+[\w_.-]*|[a-z0-9]+))*)/im;
+      /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
  } else {
    javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
  }