feat: Add support for .sdkmanrc file in java-version-file parameter (#736 )

* chore(e2e-versions): Add e2e test scenario on `setup-java-version-from-file-major-minor-patch-with-dist` for `.sdkmanrc` * chore(e2e-versions): Update `setup-java-version-from-file-major-minor-patch-with-dist` test to include the file name of the java-version-file that is used * feat: Add support for `.sdkmanrc` as *Java Version File* * chore: Add test for the latest known sdkman java versions * docs(advanced-usage): Document support for `.sdkmanrc` as java-version-file * chore(docs): Anyone can contribute and maintain 🤷 * Update advanced-usage.md Add example step/file for `.sdkmanrc` * Update advanced-usage.md * Update util.ts * chore: format and rebuild * chore: untouch toolchains.ts * fix check dist error --------- Co-authored-by: mahabaleshwars <147705296+mahabaleshwars@users.noreply.github.com>
Add GitHub Token Support for GraalVM and Refactor Code (#849 )
2025-11-26 17:09:09 +08:00 · 2025-11-25 13:36:29 -06:00 · 2025-11-18 12:04:23 -06:00 · 2025-11-17 10:33:06 -06:00 · 2025-11-13 13:34:50 -06:00 · 2025-10-27 15:17:49 -05:00
24 changed files with 2028 additions and 674 deletions
--- a/.github/workflows/e2e-cache.yml
+++ b/.github/workflows/e2e-cache.yml
@@ -21,7 +21,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-13, windows-latest, ubuntu-latest]
+        os: [macos-15-intel, windows-latest, ubuntu-latest]
    steps:
      - name: Checkout
        uses: actions/checkout@v5
@@ -46,7 +46,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-13, windows-latest, ubuntu-latest]
+        os: [macos-15-intel, windows-latest, ubuntu-latest]
    needs: gradle-save
    steps:
      - name: Checkout
@@ -70,7 +70,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-13, windows-latest, ubuntu-latest]
+        os: [macos-15-intel, windows-latest, ubuntu-latest]
    steps:
      - name: Checkout
        uses: actions/checkout@v5
@@ -93,7 +93,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-13, windows-latest, ubuntu-latest]
+        os: [macos-15-intel, windows-latest, ubuntu-latest]
    needs: maven-save
    steps:
      - name: Checkout
@@ -121,7 +121,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-13, windows-latest, ubuntu-22.04]
+        os: [macos-15-intel, 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-13'
+        if: matrix.os == 'macos-15-intel'
        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-13'
+        if: matrix.os == 'macos-15-intel'
        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-13, windows-latest, ubuntu-22.04]
+        os: [macos-15-intel, 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-13'
+        if: matrix.os == 'macos-15-intel'
        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-13, windows-latest, ubuntu-latest]
+        os: [macos-15-intel, windows-latest, ubuntu-latest]
        distribution: [
            'temurin',
            'adopt',
@@ -39,10 +39,19 @@ jobs:
          - distribution: microsoft
            version: 8
          - distribution: dragonwell
-            os: macos-13
+            os: macos-15-intel
        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-13
+            os: macos-15-intel
            version: 17
          - distribution: oracle
            os: windows-latest
@@ -220,7 +229,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-13, windows-latest, ubuntu-latest]
+        os: [macos-15-intel, windows-latest, ubuntu-latest]
        version: ['17-ea', '15.0.0-ea.14']
    steps:
      - name: Checkout
@@ -286,7 +295,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os: [macos-13, windows-latest, ubuntu-latest]
+        os: [macos-15-intel, windows-latest, ubuntu-latest]
        distribution:
          ['temurin', 'zulu', 'liberica', 'semeru', 'sapmachine', 'jetbrains']
        java-package: ['jre']
@@ -481,14 +490,14 @@ jobs:
        shell: bash

  setup-java-version-from-file-major-minor-patch-with-dist:
-    name: ${{ matrix.distribution }} version from file 'openjdk64-17.0.10' - ${{ matrix.os }}
+    name: ${{ matrix.distribution }} version from file '${{ matrix.java-version-file }}' - ${{ matrix.os }}
    runs-on: ${{ matrix.os }}
    strategy:
      fail-fast: false
      matrix:
        os: [macos-latest, windows-latest, ubuntu-latest]
        distribution: ['adopt', 'zulu', 'liberica']
-        java-version-file: ['.java-version', '.tool-versions']
+        java-version-file: ['.java-version', '.tool-versions', '.sdkmanrc']
    steps:
      - name: Checkout
        uses: actions/checkout@v5
@@ -498,6 +507,9 @@ jobs:
      - name: Create .tool-versions file
        shell: bash
        run: echo "java openjdk64-17.0.10" > .tool-versions
+      - name: Create .sdkmanrc file
+        shell: bash
+        run: echo "java=17.0.10-tem" > .sdkmanrc
      - name: setup-java
        uses: ./
        id: setup-java
--- a/README.md
+++ b/README.md
@@ -18,11 +18,20 @@ 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.
@@ -69,8 +78,8 @@ This action allows you to work with Java and Scala projects.
 #### Eclipse Temurin
 ```yaml
 steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
+- uses: actions/checkout@v5
+- uses: actions/setup-java@v5
  with:
    distribution: 'temurin' # See 'Supported distributions' for available options
    java-version: '21'
@@ -80,8 +89,8 @@ steps:
 #### Azul Zulu OpenJDK
 ```yaml
 steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
+- uses: actions/checkout@v5
+- uses: actions/setup-java@v5
  with:
    distribution: 'zulu' # See 'Supported distributions' for available options
    java-version: '21'
@@ -136,8 +145,8 @@ The cache input is optional, and caching is turned off by default.
 #### Caching gradle dependencies
 ```yaml
 steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
+- uses: actions/checkout@v5
+- uses: actions/setup-java@v5
  with:
    distribution: 'temurin'
    java-version: '21'
@@ -151,8 +160,8 @@ steps:
 #### Caching maven dependencies
 ```yaml
 steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
+- uses: actions/checkout@v5
+- uses: actions/setup-java@v5
  with:
    distribution: 'temurin'
    java-version: '21'
@@ -165,8 +174,8 @@ steps:
 #### Caching sbt dependencies
 ```yaml
 steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
+- uses: actions/checkout@v5
+- uses: actions/setup-java@v5
  with:
    distribution: 'temurin'
    java-version: '21'
@@ -185,8 +194,8 @@ Usually, cache gets downloaded in multiple segments of fixed sizes. Sometimes, a
 env:
  SEGMENT_DOWNLOAD_TIMEOUT_MINS: '5'
 steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
+- uses: actions/checkout@v5
+- uses: actions/setup-java@v5
  with:
    distribution: 'temurin'
    java-version: '21'
@@ -205,8 +214,8 @@ For Java distributions that are not cached on Hosted images, `check-latest` alwa

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

 ### Install multiple JDKs

-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 }}'.
+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.

 ```yaml
    steps:
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
        with:
          distribution: '<distribution>'
          java-version: |
--- a/tests/data/microsoft.json
+++ b/tests/data/microsoft.json
@@ -1,4 +1,47 @@
 [
+    {
+      "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/data/sdkman-java-versions.csv
+++ b/tests/data/sdkman-java-versions.csv
@@ -0,0 +1,135 @@
+6.0.119-zulu, 6.0.119
+7.0.352-zulu, 7.0.352
+8.0.282-trava, 8.0.282
+8.0.432-albba, 8.0.432
+8.0.432-amzn, 8.0.432
+8.0.432-kona, 8.0.432
+8.0.432-librca, 8.0.432
+8.0.432-sem, 8.0.432
+8.0.432-tem, 8.0.432
+8.0.432-zulu, 8.0.432
+8.0.432.fx-librca, 8.0.432
+8.0.432.fx-zulu, 8.0.432
+8.0.442-amzn, 8.0.442
+8.0.442-librca, 8.0.442
+8.0.442-tem, 8.0.442
+8.0.442-zulu, 8.0.442
+8.0.442.fx-librca, 8.0.442
+8.0.442.fx-zulu, 8.0.442
+11.0.14.1-jbr, 11.0.14
+11.0.15-trava, 11.0.15
+11.0.25-albba, 11.0.25
+11.0.25-amzn, 11.0.25
+11.0.25-kona, 11.0.25
+11.0.25-librca, 11.0.25
+11.0.25-ms, 11.0.25
+11.0.25-sapmchn, 11.0.25
+11.0.25-sem, 11.0.25
+11.0.25-tem, 11.0.25
+11.0.25-zulu, 11.0.25
+11.0.25.fx-librca, 11.0.25
+11.0.25.fx-zulu, 11.0.25
+11.0.26-amzn, 11.0.26
+11.0.26-librca, 11.0.26
+11.0.26-ms, 11.0.26
+11.0.26-sapmchn, 11.0.26
+11.0.26-zulu, 11.0.26
+11.0.26.fx-librca, 11.0.26
+11.0.26.fx-zulu, 11.0.26
+17.0.12-graal, 17.0.12
+17.0.12-jbr, 17.0.12
+17.0.12-oracle, 17.0.12
+17.0.13-albba, 17.0.13
+17.0.13-amzn, 17.0.13
+17.0.13-kona, 17.0.13
+17.0.13-librca, 17.0.13
+17.0.13-ms, 17.0.13
+17.0.13-sapmchn, 17.0.13
+17.0.13-sem, 17.0.13
+17.0.13-tem, 17.0.13
+17.0.13-zulu, 17.0.13
+17.0.13.crac-librca, 17.0.13
+17.0.13.crac-zulu, 17.0.13
+17.0.13.fx-librca, 17.0.13
+17.0.13.fx-zulu, 17.0.13
+17.0.14-amzn, 17.0.14
+17.0.14-librca, 17.0.14
+17.0.14-ms, 17.0.14
+17.0.14-sapmchn, 17.0.14
+17.0.14-zulu, 17.0.14
+17.0.14.fx-librca, 17.0.14
+17.0.14.fx-zulu, 17.0.14
+17.0.9-graalce, 17.0.9
+21.0.2-graalce, 21.0.2
+21.0.2-open, 21.0.2
+21.0.5-amzn, 21.0.5
+21.0.5-graal, 21.0.5
+21.0.5-jbr, 21.0.5
+21.0.5-kona, 21.0.5
+21.0.5-librca, 21.0.5
+21.0.5-ms, 21.0.5
+21.0.5-oracle, 21.0.5
+21.0.5-sapmchn, 21.0.5
+21.0.5-sem, 21.0.5
+21.0.5-tem, 21.0.5
+21.0.5-zulu, 21.0.5
+21.0.5.crac-librca, 21.0.5
+21.0.5.crac-zulu, 21.0.5
+21.0.5.fx-librca, 21.0.5
+21.0.5.fx-zulu, 21.0.5
+21.0.6-amzn, 21.0.6
+21.0.6-graal, 21.0.6
+21.0.6-librca, 21.0.6
+21.0.6-ms, 21.0.6
+21.0.6-oracle, 21.0.6
+21.0.6-sapmchn, 21.0.6
+21.0.6-tem, 21.0.6
+21.0.6-zulu, 21.0.6
+21.0.6.fx-librca, 21.0.6
+21.0.6.fx-zulu, 21.0.6
+22.0.2-oracle, 22.0.2
+22.1.0.1.r11-gln, 22.1.0
+22.1.0.1.r17-gln, 22.1.0
+22.3.5.r11-nik, 22.3.5
+22.3.5.r17-mandrel, 22.3.5
+22.3.5.r17-nik, 22.3.5
+23-open, 23
+23.0.1-amzn, 23.0.1
+23.0.1-graal, 23.0.1
+23.0.1-graalce, 23.0.1
+23.0.1-librca, 23.0.1
+23.0.1-open, 23.0.1
+23.0.1-oracle, 23.0.1
+23.0.1-sapmchn, 23.0.1
+23.0.1-tem, 23.0.1
+23.0.1-zulu, 23.0.1
+23.0.1.crac-zulu, 23.0.1
+23.0.1.fx-librca, 23.0.1
+23.0.1.fx-zulu, 23.0.1
+23.0.2-amzn, 23.0.2
+23.0.2-graal, 23.0.2
+23.0.2-graalce, 23.0.2
+23.0.2-librca, 23.0.2
+23.0.2-oracle, 23.0.2
+23.0.2-sapmchn, 23.0.2
+23.0.2-tem, 23.0.2
+23.0.2-zulu, 23.0.2
+23.0.2.fx-librca, 23.0.2
+23.0.2.fx-zulu, 23.0.2
+23.0.6.fx-nik, 23.0.6
+23.0.6.r17-mandrel, 23.0.6
+23.0.6.r17-nik, 23.0.6
+23.1.5.fx-nik, 23.1.5
+23.1.5.r21-mandrel, 23.1.5
+23.1.5.r21-nik, 23.1.5
+24.0.2.r22-mandrel, 24.0.2
+24.ea.27-graal, 24.0.0
+24.ea.28-graal, 24.0.0
+24.ea.31-open, 24.0.0
+24.ea.32-open, 24.0.0
+24.1.1.r23-mandrel, 24.1.1
+24.1.1.r23-nik, 24.1.1
+25.ea.4-graal, 25.0.0
+25.ea.5-graal, 25.0.0
+25.ea.5-open, 25.0.0
+25.ea.6-open, 25.0.0
--- a/tests/distributors/corretto-installer.test.ts
+++ b/tests/distributors/corretto-installer.test.ts
@@ -150,9 +150,8 @@ 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);
    });
@@ -222,9 +221,8 @@ describe('getAvailableVersions', () => {

        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']('17');
        expect(availableVersion).not.toBeNull();
        expect(availableVersion.url).toBe(expectedLink);
      }
--- a/tests/distributors/dragonwell-installer.test.ts
+++ b/tests/distributors/dragonwell-installer.test.ts
@@ -206,9 +206,8 @@ 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
--- a/tests/distributors/jetbrains-installer.test.ts
+++ b/tests/distributors/jetbrains-installer.test.ts
@@ -76,9 +76,8 @@ 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/microsoft-installer.test.ts
+++ b/tests/distributors/microsoft-installer.test.ts
@@ -29,6 +29,11 @@ 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',
--- a/tests/distributors/sapmachine-installer.test.ts
+++ b/tests/distributors/sapmachine-installer.test.ts
@@ -61,9 +61,8 @@ 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'
@@ -230,9 +229,8 @@ 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/util.test.ts
+++ b/tests/util.test.ts
@@ -1,7 +1,10 @@
 import * as cache from '@actions/cache';
 import * as core from '@actions/core';
+import * as fs from 'fs';
+import * as path from 'path';
 import {
  convertVersionToSemver,
+  getVersionFromFileContent,
  isVersionSatisfies,
  isCacheFeatureAvailable,
  isGhes
@@ -82,6 +85,43 @@ describe('convertVersionToSemver', () => {
  });
 });

+describe('getVersionFromFileContent', () => {
+  describe('.sdkmanrc', () => {
+    it.each([
+      ['java=11.0.20.1-tem', '11.0.20'],
+      ['java = 11.0.20.1-tem', '11.0.20'],
+      ['java=11.0.20.1-tem # a comment in sdkmanrc', '11.0.20'],
+      ['java=11.0.20.1-tem\n#java=21.0.20.1-tem\n', '11.0.20'], // choose first match
+      ['java=11.0.20.1-tem\njava=21.0.20.1-tem\n', '11.0.20'], // choose first match
+      ['#java=11.0.20.1-tem\njava=21.0.20.1-tem\n', '21.0.20'] // first one is 'commented' in .sdkmanrc
+    ])('parsing %s should return %s', (content: string, expected: string) => {
+      const actual = getVersionFromFileContent(content, 'openjdk', '.sdkmanrc');
+      expect(actual).toBe(expected);
+    });
+
+    describe('known versions', () => {
+      const csv = fs.readFileSync(
+        path.join(__dirname, 'data/sdkman-java-versions.csv'),
+        'utf8'
+      );
+      const versions = csv.split('\n').map(r => r.split(', '));
+
+      it.each(versions)(
+        'parsing %s should return %s',
+        (sdkmanJavaVersion: string, expected: string) => {
+          const asContent = `java=${sdkmanJavaVersion}`;
+          const actual = getVersionFromFileContent(
+            asContent,
+            'openjdk',
+            '.sdkmanrc'
+          );
+          expect(actual).toBe(expected);
+        }
+      );
+    });
+  });
+});
+
 describe('isGhes', () => {
  const pristineEnv = process.env;

--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
@@ -94704,19 +94704,22 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
    const versionFileName = getFileName(versionFile);
    if (versionFileName == '.tool-versions') {
        javaVersionRegExp =
-            /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
+            /^java\s+(?:\S*-)?(?<version>\d+(?:\.\d+)*([+_.-](?:openj9[-._]?\d[\w.-]*|java\d+|jre[-_\w]*|OpenJDK\d+[\w_.-]*|[a-z0-9]+))*)/im;
+    }
+    else if (versionFileName == '.sdkmanrc') {
+        javaVersionRegExp = /^java\s*=\s*(?<version>[^-]+)/m;
    }
    else {
        javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
    }
-    const fileContent = ((_b = (_a = content.match(javaVersionRegExp)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.version)
+    const capturedVersion = ((_b = (_a = content.match(javaVersionRegExp)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.version)
        ? (_d = (_c = content.match(javaVersionRegExp)) === null || _c === void 0 ? void 0 : _c.groups) === null || _d === void 0 ? void 0 : _d.version
        : '';
-    if (!fileContent) {
+    core.debug(`Parsed version '${capturedVersion}' from file '${versionFileName}'`);
+    if (!capturedVersion) {
        return null;
    }
-    core.debug(`Version from file '${fileContent}'`);
-    const tentativeVersion = avoidOldNotation(fileContent);
+    const tentativeVersion = avoidOldNotation(capturedVersion);
    const rawVersion = tentativeVersion.split('-')[0];
    let version = semver.validRange(rawVersion)
        ? tentativeVersion
@@ -94747,8 +94750,8 @@ function convertVersionToSemver(version) {
 }
 exports.convertVersionToSemver = convertVersionToSemver;
 function getGitHubHttpHeaders() {
-    const token = core.getInput('token');
-    const auth = !token ? undefined : `token ${token}`;
+    const resolvedToken = core.getInput('token') || process.env.GITHUB_TOKEN;
+    const auth = !resolvedToken ? undefined : `token ${resolvedToken}`;
    const headers = {
        accept: 'application/vnd.github.VERSION.raw'
    };
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -129856,6 +129856,7 @@ 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) {
@@ -129863,40 +129864,106 @@ class JavaBase {
            }
            else {
                core.info('Trying to resolve the latest version from remote');
-                try {
-                    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`);
-                    }
-                }
-                catch (error) {
-                    if (error instanceof tc.HTTPError) {
-                        if (error.httpStatusCode === 403) {
-                            core.error('HTTP 403: Permission denied or access restricted.');
+                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);
                        }
-                        else if (error.httpStatusCode === 429) {
-                            core.warning('HTTP 429: Rate limit exceeded. Please retry later.');
+                        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.error(`HTTP ${error.httpStatusCode}: ${error.message}`);
+                            core.info('Trying to download...');
+                            foundJava = yield this.downloadTool(javaRelease);
+                            core.info(`Java ${foundJava.version} was downloaded`);
                        }
+                        break;
                    }
-                    else {
-                        const message = error instanceof Error ? error.message : JSON.stringify(error);
-                        core.error(`Java setup failed due to network issue or timeout: ${message}`);
+                    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.');
+                            }
+                            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;
                    }
-                    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_1.default.join(foundJava.path, constants_1.MACOS_JAVA_CONTENT_POSTFIX);
            if (process.platform === 'darwin' && fs.existsSync(macOSPostfixPath)) {
@@ -130525,37 +130592,56 @@ const tc = __importStar(__nccwpck_require__(27784));
 const fs_1 = __importDefault(__nccwpck_require__(57147));
 const path_1 = __importDefault(__nccwpck_require__(71017));
 const base_installer_1 = __nccwpck_require__(59741);
-const util_1 = __nccwpck_require__(92629);
 const http_client_1 = __nccwpck_require__(96255);
+const util_1 = __nccwpck_require__(92629);
 const GRAALVM_DL_BASE = 'https://download.oracle.com/graalvm';
 const IS_WINDOWS = process.platform === 'win32';
 const GRAALVM_PLATFORM = IS_WINDOWS ? 'windows' : process.platform;
+const GRAALVM_MIN_VERSION = 17;
+const SUPPORTED_ARCHITECTURES = ['x64', 'aarch64'];
 class GraalVMDistribution extends base_installer_1.JavaBase {
    constructor(installerOptions) {
        super('GraalVM', installerOptions);
    }
    downloadTool(javaRelease) {
        return __awaiter(this, void 0, void 0, function* () {
-            core.info(`Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`);
-            let javaArchivePath = yield tc.downloadTool(javaRelease.url);
-            core.info(`Extracting Java archive...`);
-            const extension = (0, util_1.getDownloadArchiveExtension)();
-            if (process.platform === 'win32') {
-                javaArchivePath = (0, util_1.renameWinArchive)(javaArchivePath);
+            try {
+                core.info(`Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`);
+                let javaArchivePath = yield tc.downloadTool(javaRelease.url);
+                core.info(`Extracting Java archive...`);
+                const extension = (0, util_1.getDownloadArchiveExtension)();
+                if (IS_WINDOWS) {
+                    javaArchivePath = (0, util_1.renameWinArchive)(javaArchivePath);
+                }
+                const extractedJavaPath = yield (0, util_1.extractJdkFile)(javaArchivePath, extension);
+                // Add validation for extracted path
+                if (!fs_1.default.existsSync(extractedJavaPath)) {
+                    throw new Error(`Extraction failed: path ${extractedJavaPath} does not exist`);
+                }
+                const dirContents = fs_1.default.readdirSync(extractedJavaPath);
+                if (dirContents.length === 0) {
+                    throw new Error('Extraction failed: no files found in extracted directory');
+                }
+                const archivePath = path_1.default.join(extractedJavaPath, dirContents[0]);
+                const version = this.getToolcacheVersionName(javaRelease.version);
+                const javaPath = yield tc.cacheDir(archivePath, this.toolcacheFolderName, version, this.architecture);
+                return { version: javaRelease.version, path: javaPath };
+            }
+            catch (error) {
+                core.error(`Failed to download and extract GraalVM: ${error}`);
+                throw error;
            }
-            const extractedJavaPath = yield (0, util_1.extractJdkFile)(javaArchivePath, extension);
-            const archiveName = fs_1.default.readdirSync(extractedJavaPath)[0];
-            const archivePath = path_1.default.join(extractedJavaPath, archiveName);
-            const version = this.getToolcacheVersionName(javaRelease.version);
-            const javaPath = yield tc.cacheDir(archivePath, this.toolcacheFolderName, version, this.architecture);
-            return { version: javaRelease.version, path: javaPath };
        });
    }
    findPackageForDownload(range) {
        return __awaiter(this, void 0, void 0, function* () {
+            // Add input validation
+            if (!range || typeof range !== 'string') {
+                throw new Error('Version range is required and must be a string');
+            }
            const arch = this.distributionArchitecture();
-            if (arch !== 'x64' && arch !== 'aarch64') {
-                throw new Error(`Unsupported architecture: ${this.architecture}`);
+            if (!SUPPORTED_ARCHITECTURES.includes(arch)) {
+                throw new Error(`Unsupported architecture: ${this.architecture}. Supported architectures are: ${SUPPORTED_ARCHITECTURES.join(', ')}`);
            }
            if (!this.stable) {
                return this.findEABuildDownloadUrl(`${range}-ea`);
@@ -130565,81 +130651,104 @@ class GraalVMDistribution extends base_installer_1.JavaBase {
            }
            const platform = this.getPlatform();
            const extension = (0, util_1.getDownloadArchiveExtension)();
-            let major;
-            let fileUrl;
-            if (range.includes('.')) {
-                major = range.split('.')[0];
-                fileUrl = `${GRAALVM_DL_BASE}/${major}/archive/graalvm-jdk-${range}_${platform}-${arch}_bin.${extension}`;
+            const major = range.includes('.') ? range.split('.')[0] : range;
+            const majorVersion = parseInt(major);
+            if (isNaN(majorVersion)) {
+                throw new Error(`Invalid version format: ${range}`);
            }
-            else {
-                major = range;
-                fileUrl = `${GRAALVM_DL_BASE}/${range}/latest/graalvm-jdk-${range}_${platform}-${arch}_bin.${extension}`;
-            }
-            if (parseInt(major) < 17) {
-                throw new Error('GraalVM is only supported for JDK 17 and later');
+            if (majorVersion < GRAALVM_MIN_VERSION) {
+                throw new Error(`GraalVM is only supported for JDK ${GRAALVM_MIN_VERSION} and later. Requested version: ${major}`);
            }
+            const fileUrl = this.constructFileUrl(range, major, platform, arch, extension);
            const response = yield this.http.head(fileUrl);
-            if (response.message.statusCode === http_client_1.HttpCodes.NotFound) {
-                throw new Error(`Could not find GraalVM for SemVer ${range}`);
-            }
-            if (response.message.statusCode !== http_client_1.HttpCodes.OK) {
-                throw new Error(`Http request for GraalVM failed with status code: ${response.message.statusCode}`);
-            }
+            this.handleHttpResponse(response, range);
            return { url: fileUrl, version: range };
        });
    }
+    constructFileUrl(range, major, platform, arch, extension) {
+        return range.includes('.')
+            ? `${GRAALVM_DL_BASE}/${major}/archive/graalvm-jdk-${range}_${platform}-${arch}_bin.${extension}`
+            : `${GRAALVM_DL_BASE}/${range}/latest/graalvm-jdk-${range}_${platform}-${arch}_bin.${extension}`;
+    }
+    handleHttpResponse(response, range) {
+        const statusCode = response.message.statusCode;
+        if (statusCode === http_client_1.HttpCodes.NotFound) {
+            throw new Error(`Could not find GraalVM for SemVer ${range}. Please check if this version is available at ${GRAALVM_DL_BASE}`);
+        }
+        if (statusCode === http_client_1.HttpCodes.Unauthorized ||
+            statusCode === http_client_1.HttpCodes.Forbidden) {
+            throw new Error(`Access denied when downloading GraalVM. Status code: ${statusCode}. Please check your credentials or permissions.`);
+        }
+        if (statusCode !== http_client_1.HttpCodes.OK) {
+            throw new Error(`HTTP request for GraalVM failed with status code: ${statusCode} (${response.message.statusMessage || 'Unknown error'})`);
+        }
+    }
    findEABuildDownloadUrl(javaEaVersion) {
        return __awaiter(this, void 0, void 0, function* () {
+            core.debug(`Searching for EA build: ${javaEaVersion}`);
            const versions = yield this.fetchEAJson(javaEaVersion);
+            core.debug(`Found ${versions.length} EA versions`);
            const latestVersion = versions.find(v => v.latest);
            if (!latestVersion) {
+                core.error(`Available versions: ${versions.map(v => v.version).join(', ')}`);
                throw new Error(`Unable to find latest version for '${javaEaVersion}'`);
            }
+            core.debug(`Latest version found: ${latestVersion.version}`);
            const arch = this.distributionArchitecture();
            const file = latestVersion.files.find(f => f.arch === arch && f.platform === GRAALVM_PLATFORM);
-            if (!file || !file.filename.startsWith('graalvm-jdk-')) {
-                throw new Error(`Unable to find file metadata for '${javaEaVersion}'`);
+            if (!file) {
+                core.error(`Available files for architecture ${arch}: ${JSON.stringify(latestVersion.files)}`);
+                throw new Error(`Unable to find file for architecture '${arch}' and platform '${GRAALVM_PLATFORM}'`);
            }
+            if (!file.filename.startsWith('graalvm-jdk-')) {
+                throw new Error(`Invalid filename format: ${file.filename}. Expected to start with 'graalvm-jdk-'`);
+            }
+            const downloadUrl = `${latestVersion.download_base_url}${file.filename}`;
+            core.debug(`Download URL: ${downloadUrl}`);
            return {
-                url: `${latestVersion.download_base_url}${file.filename}`,
+                url: downloadUrl,
                version: latestVersion.version
            };
        });
    }
    fetchEAJson(javaEaVersion) {
+        var _a;
        return __awaiter(this, void 0, void 0, function* () {
-            const owner = 'graalvm';
-            const repository = 'oracle-graalvm-ea-builds';
-            const branch = 'main';
-            const filePath = `versions/${javaEaVersion}.json`;
-            const url = `https://api.github.com/repos/${owner}/${repository}/contents/${filePath}?ref=${branch}`;
+            const url = `https://api.github.com/repos/graalvm/oracle-graalvm-ea-builds/contents/versions/${javaEaVersion}.json?ref=main`;
            const headers = (0, util_1.getGitHubHttpHeaders)();
            core.debug(`Trying to fetch available version info for GraalVM EA builds from '${url}'`);
-            let fetchedJson;
            try {
-                fetchedJson = (yield this.http.getJson(url, headers))
-                    .result;
+                const response = yield this.http.getJson(url, headers);
+                if (!response.result) {
+                    throw new Error(`No GraalVM EA build found for version '${javaEaVersion}'. Please check if the version is correct.`);
+                }
+                return response.result;
            }
-            catch (err) {
-                throw Error(`Fetching version info for GraalVM EA builds from '${url}' failed with the error: ${err.message}`);
+            catch (error) {
+                if (error instanceof Error) {
+                    // Check if it's a 404 error (file not found)
+                    if ((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('404')) {
+                        throw new Error(`GraalVM EA version '${javaEaVersion}' not found. Please verify the version exists in the EA builds repository.`);
+                    }
+                    // Re-throw with more context
+                    throw new Error(`Failed to fetch GraalVM EA version information for '${javaEaVersion}': ${error.message}`);
+                }
+                // If it's not an Error instance, throw a generic error
+                throw new Error(`Failed to fetch GraalVM EA version information for '${javaEaVersion}'`);
            }
-            if (fetchedJson === null) {
-                throw Error(`No GraalVM EA build found. Are you sure java-version: '${javaEaVersion}' is correct?`);
-            }
-            return fetchedJson;
        });
    }
    getPlatform(platform = process.platform) {
-        switch (platform) {
-            case 'darwin':
-                return 'macos';
-            case 'win32':
-                return 'windows';
-            case 'linux':
-                return 'linux';
-            default:
-                throw new Error(`Platform '${platform}' is not supported. Supported platforms: 'linux', 'macos', 'windows'`);
+        const platformMap = {
+            darwin: 'macos',
+            win32: 'windows',
+            linux: 'linux'
+        };
+        const result = platformMap[platform];
+        if (!result) {
+            throw new Error(`Platform '${platform}' is not supported. Supported platforms: 'linux', 'macos', 'windows'`);
        }
+        return result;
    }
 }
 exports.GraalVMDistribution = GraalVMDistribution;
@@ -131520,9 +131629,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://sap.github.io/SapMachine/assets/data/sapmachine-releases-all.json');
+            let fetchedReleasesJson = yield this.fetchReleasesFromUrl('https://sapmachine.io/assets/data/sapmachine-releases-all.json');
            if (!fetchedReleasesJson) {
-                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)());
+                fetchedReleasesJson = yield this.fetchReleasesFromUrl('https://sap.github.io/SapMachine/assets/data/sapmachine-releases-all.json');
            }
            if (!fetchedReleasesJson) {
                throw new Error(`Couldn't fetch SapMachine versions information from both primary and backup urls`);
@@ -132739,19 +132848,22 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
    const versionFileName = getFileName(versionFile);
    if (versionFileName == '.tool-versions') {
        javaVersionRegExp =
-            /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
+            /^java\s+(?:\S*-)?(?<version>\d+(?:\.\d+)*([+_.-](?:openj9[-._]?\d[\w.-]*|java\d+|jre[-_\w]*|OpenJDK\d+[\w_.-]*|[a-z0-9]+))*)/im;
+    }
+    else if (versionFileName == '.sdkmanrc') {
+        javaVersionRegExp = /^java\s*=\s*(?<version>[^-]+)/m;
    }
    else {
        javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
    }
-    const fileContent = ((_b = (_a = content.match(javaVersionRegExp)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.version)
+    const capturedVersion = ((_b = (_a = content.match(javaVersionRegExp)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.version)
        ? (_d = (_c = content.match(javaVersionRegExp)) === null || _c === void 0 ? void 0 : _c.groups) === null || _d === void 0 ? void 0 : _d.version
        : '';
-    if (!fileContent) {
+    core.debug(`Parsed version '${capturedVersion}' from file '${versionFileName}'`);
+    if (!capturedVersion) {
        return null;
    }
-    core.debug(`Version from file '${fileContent}'`);
-    const tentativeVersion = avoidOldNotation(fileContent);
+    const tentativeVersion = avoidOldNotation(capturedVersion);
    const rawVersion = tentativeVersion.split('-')[0];
    let version = semver.validRange(rawVersion)
        ? tentativeVersion
@@ -132782,8 +132894,8 @@ function convertVersionToSemver(version) {
 }
 exports.convertVersionToSemver = convertVersionToSemver;
 function getGitHubHttpHeaders() {
-    const token = core.getInput('token');
-    const auth = !token ? undefined : `token ${token}`;
+    const resolvedToken = core.getInput('token') || process.env.GITHUB_TOKEN;
+    const auth = !resolvedToken ? undefined : `token ${resolvedToken}`;
    const headers = {
        accept: 'application/vnd.github.VERSION.raw'
    };
--- 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@v4
- uses: actions/setup-java@v4
+- uses: actions/checkout@v5
+- uses: actions/setup-java@v5
  with:
    distribution: 'temurin'
    java-version: '21'
@@ -44,8 +44,8 @@ steps:

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

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

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

 ```yaml
 steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
+- uses: actions/checkout@v5
+- uses: actions/setup-java@v5
  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@v4
+uses: actions/setup-java@v5
 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@v4
- uses: actions/setup-java@v4
+- uses: actions/checkout@v5
+- uses: actions/setup-java@v5
  with:
    distribution: 'corretto'
    java-version: '21'
@@ -124,8 +124,8 @@ steps:

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

 ```yaml
 steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
+- uses: actions/checkout@v5
+- uses: actions/setup-java@v5
  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@v4
- uses: actions/setup-java@v4
+- uses: actions/checkout@v5
+- uses: actions/setup-java@v5
  with:
    distribution: 'sapmachine'
    java-version: '21'
@@ -162,8 +162,8 @@ steps:

 ```yaml
 steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
+- uses: actions/checkout@v5
+- uses: actions/setup-java@v5
  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@v4
- uses: actions/setup-java@v4
+- uses: actions/checkout@v5
+- uses: actions/setup-java@v5
  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@v4
- uses: actions/setup-java@v4
+- uses: actions/checkout@v5
+- uses: actions/setup-java@v5
  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@v4
- uses: actions/setup-java@v4
+- uses: actions/checkout@v5
+- uses: actions/setup-java@v5
  with:
    distribution: '<distribution>'
    java-version: '11'
@@ -232,8 +232,8 @@ steps:

 ```yaml
 steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
+- uses: actions/checkout@v5
+- uses: actions/setup-java@v5
  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@v4
+- uses: actions/setup-java@v5
  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@v4
+      - uses: actions/setup-java@v5
        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@v4
+      - uses: actions/checkout@v5
      - name: Setup java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        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@v4
+      - uses: actions/checkout@v5
      - name: Setup java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin'
          java-version: ${{ matrix.java }}
@@ -333,9 +333,9 @@ jobs:
    runs-on: ubuntu-latest

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

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

    - name: Set up JDK 11
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
      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@v4
+- uses: actions/setup-java@v5
  with:
    distribution: '<distribution>'
    java-version: |
      8
      11

- uses: actions/setup-java@v4
+- uses: actions/setup-java@v5
  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@v4
+- uses: actions/setup-java@v5
  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@v4
+- uses: actions/setup-java@v5
  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@v4
+- uses: actions/setup-java@v5
  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@v4
- uses: actions/setup-java@v4
+- uses: actions/checkout@v5
+- uses: actions/setup-java@v5
  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@v4
+- uses: actions/setup-java@v5
  with:
    distribution: '<distribution>'
    java-version: |
@@ -601,18 +601,37 @@ steps:
 ## Java version file
  If the `java-version-file` input is specified, the action will extract the version from the file and install it.
  
-  Supported files are .java-version and .tool-versions.
-  In .java-version file, only the version should be specified (e.g., 17.0.7).
-  In .tool-versions file, java version should be preceded by the java keyword (e.g., java 17.0.7).
-  The `.java-version` file recognizes all variants of the version description according to [jenv](https://github.com/jenv/jenv). Similarly, the `.tool-versions` file supports version specifications in accordance with [asdf](https://github.com/asdf-vm/asdf) standards, adhering to Semantic Versioning ([semver](https://semver.org/)).
-  
-  If both java-version and java-version-file inputs are provided, the java-version input will be used.
+  Supported files are `.java-version`, `.tool-versions` and `.sdkmanrc`.
+  * In `.java-version` file, only the version should be specified (e.g., 17.0.7). The `.java-version` file recognizes all variants of the version description according to [jenv](https://github.com/jenv/jenv).
+  * In `.tool-versions` file, java version should be preceded by the java keyword (e.g., java 17.0.7). The `.tool-versions` file supports version specifications in accordance with [asdf](https://github.com/asdf-vm/asdf) standards, adhering to Semantic Versioning ([semver](https://semver.org/)).
+  * In `.sdkmanrc` file, java version should be preceded by the `java=` prefix (e.g., java=17.0.7-tem) and include the distribution. The `.sdkmanrc` file supports version specifications in accordance with [file format](https://sdkman.io/usage#env-command), see [Sdkman! documentation](https://sdkman.io/jdks) for more information.

-Valid entry options:
+    
+  If both `java-version` and `java-version-file` **inputs** are provided, the `java-version` input will be used.
+
+**Example step using `Sdkman!`**:
+```yml
+  - name: Setup java
+    uses: actions/setup-java@v5
+    with:
+      java-version-file: '.sdkmanrc'
+      distribution: 'temurin'
+```
+
+**Example `.sdkmanrc`**:
+```
+java=17.0.7-tem
+```
+
+Valid entry options (does not apply to `.sdkmanrc`):
 ```
 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/docs/contributors.md
+++ b/docs/contributors.md
@@ -68,7 +68,7 @@ Pull requests are the easiest way to contribute changes to git repos at GitHub.
 Adding or changing tests is an integral part of making a change to the code. 
 Unit tests are in the `__tests__` folder, and end-to-end tests are in the `workflows` folder, particularly take a look at the files with `e2e` prefix, for instance, [e2e-cache.yml](https://github.com/actions/setup-java/blob/main/.github/workflows/e2e-cache.yml).

- The contributor can add various types of tests (like unit tests or end-to-end tests), which, in his opinion, will be necessary and sufficient for testing new or changed functionality
+- The contributor can add various types of tests (like unit tests or end-to-end tests), which, in their opinion, will be necessary and sufficient for testing new or changed functionality
 - Tests should cover a successful execution, as well as some edge cases and possible errors
 - As already mentioned, pull requests without tests will be considered more carefully by maintainers. If you are sure that in this situation the tests are not needed or cannot be implemented with a commensurate effort - please add this clarification message to your pull request

@@ -76,7 +76,7 @@ Unit tests are in the `__tests__` folder, and end-to-end tests are in the `workf

 - CI will start automatically with some checks. Wait until the end of the execution and make sure that all checks passed successfully. If some checks fail, you can open them one by one, try to find the reason for failing and make changes to your code to resolve the problem
 - Maintainers will review your pull request
- If a maintainer requests changes, first of all, try to think about his request critically and only after that implement and request another review
+- If a maintainer requests changes, first of all, try to think about their request critically and only after that implement and request another review
 - If your PR gets accepted, it will soon be merged into the main branch. But your contribution will take effect only after the release of a new version of the action and updating the major tag
 > Sometimes maintainers reject pull requests and that's ok! Usually, along with rejection, we supply the reason for it. Nonetheless, we still really appreciate you taking the time to do it, and we don't take that lightly :heart:

--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
        "eslint-plugin-node": "^11.1.0",
        "jest": "^29.7.0",
        "jest-circus": "^29.7.0",
-        "prettier": "^2.8.4",
+        "prettier": "^3.6.2",
        "ts-jest": "^29.3.0",
        "typescript": "^5.3.3"
      },
@@ -366,6 +366,7 @@
      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz",
      "integrity": "sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==",
      "dev": true,
+      "peer": true,
      "dependencies": {
        "@ampproject/remapping": "^2.2.0",
        "@babel/code-frame": "^7.22.13",
@@ -840,9 +841,9 @@
      "dev": true
    },
    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
-      "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
+      "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==",
      "dev": true,
      "dependencies": {
        "eslint-visitor-keys": "^3.4.3"
@@ -1715,17 +1716,16 @@
      "dev": true
    },
    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.1.tgz",
-      "integrity": "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.43.0.tgz",
+      "integrity": "sha512-8tg+gt7ENL7KewsKMKDHXR1vm8tt9eMxjJBYINf6swonlWgkYn5NwyIgXpbbDxTNU5DgpDFfj95prcTq2clIQQ==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/type-utils": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/scope-manager": "8.43.0",
+        "@typescript-eslint/type-utils": "8.43.0",
+        "@typescript-eslint/utils": "8.43.0",
+        "@typescript-eslint/visitor-keys": "8.43.0",
        "graphemer": "^1.4.0",
        "ignore": "^7.0.0",
        "natural-compare": "^1.4.0",
@@ -1739,9 +1739,9 @@
        "url": "https://opencollective.com/typescript-eslint"
      },
      "peerDependencies": {
-        "@typescript-eslint/parser": "^8.35.1",
+        "@typescript-eslint/parser": "^8.43.0",
        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
      }
    },
    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
@@ -1749,22 +1749,22 @@
      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
      "dev": true,
-      "license": "MIT",
      "engines": {
        "node": ">= 4"
      }
    },
    "node_modules/@typescript-eslint/parser": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.1.tgz",
-      "integrity": "sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.43.0.tgz",
+      "integrity": "sha512-B7RIQiTsCBBmY+yW4+ILd6mF5h1FUwJsVvpqkrgpszYifetQ2Ke+Z4u6aZh0CblkUGIdR59iYVyXqqZGkZ3aBw==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/typescript-estree": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/scope-manager": "8.43.0",
+        "@typescript-eslint/types": "8.43.0",
+        "@typescript-eslint/typescript-estree": "8.43.0",
+        "@typescript-eslint/visitor-keys": "8.43.0",
        "debug": "^4.3.4"
      },
      "engines": {
@@ -1776,18 +1776,17 @@
      },
      "peerDependencies": {
        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
      }
    },
    "node_modules/@typescript-eslint/project-service": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.1.tgz",
-      "integrity": "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.43.0.tgz",
+      "integrity": "sha512-htB/+D/BIGoNTQYffZw4uM4NzzuolCoaA/BusuSIcC8YjmBYQioew5VUZAYdAETPjeed0hqCaW7EHg+Robq8uw==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.35.1",
-        "@typescript-eslint/types": "^8.35.1",
+        "@typescript-eslint/tsconfig-utils": "^8.43.0",
+        "@typescript-eslint/types": "^8.43.0",
        "debug": "^4.3.4"
      },
      "engines": {
@@ -1798,18 +1797,17 @@
        "url": "https://opencollective.com/typescript-eslint"
      },
      "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
      }
    },
    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz",
-      "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.43.0.tgz",
+      "integrity": "sha512-daSWlQ87ZhsjrbMLvpuuMAt3y4ba57AuvadcR7f3nl8eS3BjRc8L9VLxFLk92RL5xdXOg6IQ+qKjjqNEimGuAg==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1"
+        "@typescript-eslint/types": "8.43.0",
+        "@typescript-eslint/visitor-keys": "8.43.0"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1820,11 +1818,10 @@
      }
    },
    "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.1.tgz",
-      "integrity": "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.43.0.tgz",
+      "integrity": "sha512-ALC2prjZcj2YqqL5X/bwWQmHA2em6/94GcbB/KKu5SX3EBDOsqztmmX1kMkvAJHzxk7TazKzJfFiEIagNV3qEA==",
      "dev": true,
-      "license": "MIT",
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
      },
@@ -1833,18 +1830,18 @@
        "url": "https://opencollective.com/typescript-eslint"
      },
      "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
      }
    },
    "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.1.tgz",
-      "integrity": "sha512-HOrUBlfVRz5W2LIKpXzZoy6VTZzMu2n8q9C2V/cFngIC5U1nStJgv0tMV4sZPzdf4wQm9/ToWUFPMN9Vq9VJQQ==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.43.0.tgz",
+      "integrity": "sha512-qaH1uLBpBuBBuRf8c1mLJ6swOfzCXryhKND04Igr4pckzSEW9JX5Aw9AgW00kwfjWJF0kk0ps9ExKTfvXfw4Qg==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1",
+        "@typescript-eslint/types": "8.43.0",
+        "@typescript-eslint/typescript-estree": "8.43.0",
+        "@typescript-eslint/utils": "8.43.0",
        "debug": "^4.3.4",
        "ts-api-utils": "^2.1.0"
      },
@@ -1857,15 +1854,14 @@
      },
      "peerDependencies": {
        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
      }
    },
    "node_modules/@typescript-eslint/types": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
-      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.43.0.tgz",
+      "integrity": "sha512-vQ2FZaxJpydjSZJKiSW/LJsabFFvV7KgLC5DiLhkBcykhQj8iK9BOaDmQt74nnKdLvceM5xmhaTF+pLekrxEkw==",
      "dev": true,
-      "license": "MIT",
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
      },
@@ -1875,16 +1871,15 @@
      }
    },
    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz",
-      "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.43.0.tgz",
+      "integrity": "sha512-7Vv6zlAhPb+cvEpP06WXXy/ZByph9iL6BQRBDj4kmBsW98AqEeQHlj/13X+sZOrKSo9/rNKH4Ul4f6EICREFdw==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/project-service": "8.35.1",
-        "@typescript-eslint/tsconfig-utils": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/project-service": "8.43.0",
+        "@typescript-eslint/tsconfig-utils": "8.43.0",
+        "@typescript-eslint/types": "8.43.0",
+        "@typescript-eslint/visitor-keys": "8.43.0",
        "debug": "^4.3.4",
        "fast-glob": "^3.3.2",
        "is-glob": "^4.0.3",
@@ -1900,7 +1895,7 @@
        "url": "https://opencollective.com/typescript-eslint"
      },
      "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
      }
    },
    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
@@ -1908,7 +1903,6 @@
      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "balanced-match": "^1.0.0"
      }
@@ -1918,7 +1912,6 @@
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
      "dev": true,
-      "license": "ISC",
      "dependencies": {
        "brace-expansion": "^2.0.1"
      },
@@ -1930,16 +1923,15 @@
      }
    },
    "node_modules/@typescript-eslint/utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.1.tgz",
-      "integrity": "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.43.0.tgz",
+      "integrity": "sha512-S1/tEmkUeeswxd0GGcnwuVQPFWo8NzZTOMxCvw8BX7OMxnNae+i8Tm7REQen/SwUIPoPqfKn7EaZ+YLpiB3k9g==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/typescript-estree": "8.35.1"
+        "@typescript-eslint/scope-manager": "8.43.0",
+        "@typescript-eslint/types": "8.43.0",
+        "@typescript-eslint/typescript-estree": "8.43.0"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1950,17 +1942,16 @@
      },
      "peerDependencies": {
        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
      }
    },
    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz",
-      "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.43.0.tgz",
+      "integrity": "sha512-T+S1KqRD4sg/bHfLwrpF/K3gQLBM1n7Rp7OjjikjTEssI2YJzQpi5WXoynOaQ93ERIuq3O8RBTOUYDKszUCEHw==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/types": "8.43.0",
        "eslint-visitor-keys": "^4.2.1"
      },
      "engines": {
@@ -1976,7 +1967,6 @@
      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
      "dev": true,
-      "license": "Apache-2.0",
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
      },
@@ -2015,6 +2005,7 @@
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
      "dev": true,
+      "peer": true,
      "bin": {
        "acorn": "bin/acorn"
      },
@@ -2290,6 +2281,7 @@
          "url": "https://github.com/sponsors/ai"
        }
      ],
+      "peer": true,
      "dependencies": {
        "caniuse-lite": "^1.0.30001541",
        "electron-to-chromium": "^1.4.535",
@@ -2745,6 +2737,7 @@
      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
      "dev": true,
+      "peer": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
        "@eslint-community/regexpp": "^4.6.1",
@@ -3096,7 +3089,6 @@
      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "@nodelib/fs.stat": "^2.0.2",
        "@nodelib/fs.walk": "^1.2.3",
@@ -3113,7 +3105,6 @@
      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
      "dev": true,
-      "license": "ISC",
      "dependencies": {
        "is-glob": "^4.0.1"
      },
@@ -3743,6 +3734,7 @@
      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
      "dev": true,
+      "peer": true,
      "dependencies": {
        "@jest/core": "^29.7.0",
        "@jest/types": "^29.6.3",
@@ -4491,7 +4483,6 @@
      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
      "dev": true,
-      "license": "MIT",
      "engines": {
        "node": ">= 8"
      }
@@ -4876,15 +4867,16 @@
      }
    },
    "node_modules/prettier": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
      "dev": true,
+      "license": "MIT",
      "bin": {
-        "prettier": "bin-prettier.js"
+        "prettier": "bin/prettier.cjs"
      },
      "engines": {
-        "node": ">=10.13.0"
+        "node": ">=14"
      },
      "funding": {
        "url": "https://github.com/prettier/prettier?sponsor=1"
@@ -5493,6 +5485,7 @@
      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
      "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
      "dev": true,
+      "peer": true,
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
@@ -5505,7 +5498,6 @@
      "version": "5.29.0",
      "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz",
      "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==",
-      "license": "MIT",
      "dependencies": {
        "@fastify/busboy": "^2.0.0"
      },
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
  "private": true,
  "description": "setup java action",
  "main": "dist/setup/index.js",
-   "engines": {
+  "engines": {
    "node": ">=24.0.0"
  },
  "scripts": {
@@ -52,7 +52,7 @@
    "eslint-plugin-node": "^11.1.0",
    "jest": "^29.7.0",
    "jest-circus": "^29.7.0",
-    "prettier": "^2.8.4",
+    "prettier": "^3.6.2",
    "ts-jest": "^29.3.0",
    "typescript": "^5.3.3"
  },
@@ -60,4 +60,4 @@
    "url": "https://github.com/actions/setup-java/issues"
  },
  "homepage": "https://github.com/actions/setup-java#readme"
-}
+}
--- a/src/distributions/base-installer.ts
+++ b/src/distributions/base-installer.ts
@@ -51,39 +51,115 @@ export abstract class JavaBase {
      core.info(`Resolved Java ${foundJava.version} from tool-cache`);
    } else {
      core.info('Trying to resolve the latest version from remote');
-      try {
-        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`);
-        }
-      } 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}`);
+      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?.();
          }
-        } else {
-          const message =
-            error instanceof Error ? error.message : JSON.stringify(error);
-          core.error(
-            `Java setup failed due to network issue or timeout: ${message}`
-          );
+          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;
        }
-        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/graalvm/installer.ts
+++ b/src/distributions/graalvm/installer.ts
@@ -1,10 +1,10 @@
 import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
-
 import fs from 'fs';
 import path from 'path';
-
 import {JavaBase} from '../base-installer';
+import {HttpCodes} from '@actions/http-client';
+import {GraalVMEAVersion} from './models';
 import {
  JavaDownloadRelease,
  JavaInstallerOptions,
@@ -16,12 +16,14 @@ import {
  getGitHubHttpHeaders,
  renameWinArchive
 } from '../../util';
-import {HttpCodes} from '@actions/http-client';
-import {GraalVMEAVersion} from './models';

 const GRAALVM_DL_BASE = 'https://download.oracle.com/graalvm';
 const IS_WINDOWS = process.platform === 'win32';
 const GRAALVM_PLATFORM = IS_WINDOWS ? 'windows' : process.platform;
+const GRAALVM_MIN_VERSION = 17;
+const SUPPORTED_ARCHITECTURES = ['x64', 'aarch64'] as const;
+type SupportedArchitecture = (typeof SUPPORTED_ARCHITECTURES)[number];
+type OsVersions = 'linux' | 'macos' | 'windows';

 export class GraalVMDistribution extends JavaBase {
  constructor(installerOptions: JavaInstallerOptions) {
@@ -31,38 +33,67 @@ export class GraalVMDistribution extends JavaBase {
  protected async downloadTool(
    javaRelease: JavaDownloadRelease
  ): Promise<JavaInstallerResults> {
-    core.info(
-      `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
-    );
-    let javaArchivePath = await tc.downloadTool(javaRelease.url);
+    try {
+      core.info(
+        `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
+      );
+      let javaArchivePath = await tc.downloadTool(javaRelease.url);

-    core.info(`Extracting Java archive...`);
-    const extension = getDownloadArchiveExtension();
-    if (process.platform === 'win32') {
-      javaArchivePath = renameWinArchive(javaArchivePath);
+      core.info(`Extracting Java archive...`);
+      const extension = getDownloadArchiveExtension();
+      if (IS_WINDOWS) {
+        javaArchivePath = renameWinArchive(javaArchivePath);
+      }
+
+      const extractedJavaPath = await extractJdkFile(
+        javaArchivePath,
+        extension
+      );
+
+      // Add validation for extracted path
+      if (!fs.existsSync(extractedJavaPath)) {
+        throw new Error(
+          `Extraction failed: path ${extractedJavaPath} does not exist`
+        );
+      }
+
+      const dirContents = fs.readdirSync(extractedJavaPath);
+      if (dirContents.length === 0) {
+        throw new Error(
+          'Extraction failed: no files found in extracted directory'
+        );
+      }
+
+      const archivePath = path.join(extractedJavaPath, dirContents[0]);
+      const version = this.getToolcacheVersionName(javaRelease.version);
+
+      const javaPath = await tc.cacheDir(
+        archivePath,
+        this.toolcacheFolderName,
+        version,
+        this.architecture
+      );
+
+      return {version: javaRelease.version, path: javaPath};
+    } catch (error) {
+      core.error(`Failed to download and extract GraalVM: ${error}`);
+      throw error;
    }
-    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
-
-    const archiveName = fs.readdirSync(extractedJavaPath)[0];
-    const archivePath = path.join(extractedJavaPath, archiveName);
-    const version = this.getToolcacheVersionName(javaRelease.version);
-
-    const javaPath = await tc.cacheDir(
-      archivePath,
-      this.toolcacheFolderName,
-      version,
-      this.architecture
-    );
-
-    return {version: javaRelease.version, path: javaPath};
  }

  protected async findPackageForDownload(
    range: string
  ): Promise<JavaDownloadRelease> {
+    // Add input validation
+    if (!range || typeof range !== 'string') {
+      throw new Error('Version range is required and must be a string');
+    }
+
    const arch = this.distributionArchitecture();
-    if (arch !== 'x64' && arch !== 'aarch64') {
-      throw new Error(`Unsupported architecture: ${this.architecture}`);
+    if (!SUPPORTED_ARCHITECTURES.includes(arch as SupportedArchitecture)) {
+      throw new Error(
+        `Unsupported architecture: ${this.architecture}. Supported architectures are: ${SUPPORTED_ARCHITECTURES.join(', ')}`
+      );
    }

    if (!this.stable) {
@@ -75,52 +106,113 @@ export class GraalVMDistribution extends JavaBase {

    const platform = this.getPlatform();
    const extension = getDownloadArchiveExtension();
-    let major;
-    let fileUrl;
-    if (range.includes('.')) {
-      major = range.split('.')[0];
-      fileUrl = `${GRAALVM_DL_BASE}/${major}/archive/graalvm-jdk-${range}_${platform}-${arch}_bin.${extension}`;
-    } else {
-      major = range;
-      fileUrl = `${GRAALVM_DL_BASE}/${range}/latest/graalvm-jdk-${range}_${platform}-${arch}_bin.${extension}`;
+    const major = range.includes('.') ? range.split('.')[0] : range;
+    const majorVersion = parseInt(major);
+
+    if (isNaN(majorVersion)) {
+      throw new Error(`Invalid version format: ${range}`);
    }

-    if (parseInt(major) < 17) {
-      throw new Error('GraalVM is only supported for JDK 17 and later');
-    }
-
-    const response = await this.http.head(fileUrl);
-
-    if (response.message.statusCode === HttpCodes.NotFound) {
-      throw new Error(`Could not find GraalVM for SemVer ${range}`);
-    }
-
-    if (response.message.statusCode !== HttpCodes.OK) {
+    if (majorVersion < GRAALVM_MIN_VERSION) {
      throw new Error(
-        `Http request for GraalVM failed with status code: ${response.message.statusCode}`
+        `GraalVM is only supported for JDK ${GRAALVM_MIN_VERSION} and later. Requested version: ${major}`
      );
    }

+    const fileUrl = this.constructFileUrl(
+      range,
+      major,
+      platform,
+      arch,
+      extension
+    );
+
+    const response = await this.http.head(fileUrl);
+    this.handleHttpResponse(response, range);
+
    return {url: fileUrl, version: range};
  }

+  private constructFileUrl(
+    range: string,
+    major: string,
+    platform: string,
+    arch: string,
+    extension: string
+  ): string {
+    return range.includes('.')
+      ? `${GRAALVM_DL_BASE}/${major}/archive/graalvm-jdk-${range}_${platform}-${arch}_bin.${extension}`
+      : `${GRAALVM_DL_BASE}/${range}/latest/graalvm-jdk-${range}_${platform}-${arch}_bin.${extension}`;
+  }
+
+  private handleHttpResponse(response: any, range: string): void {
+    const statusCode = response.message.statusCode;
+
+    if (statusCode === HttpCodes.NotFound) {
+      throw new Error(
+        `Could not find GraalVM for SemVer ${range}. Please check if this version is available at ${GRAALVM_DL_BASE}`
+      );
+    }
+
+    if (
+      statusCode === HttpCodes.Unauthorized ||
+      statusCode === HttpCodes.Forbidden
+    ) {
+      throw new Error(
+        `Access denied when downloading GraalVM. Status code: ${statusCode}. Please check your credentials or permissions.`
+      );
+    }
+
+    if (statusCode !== HttpCodes.OK) {
+      throw new Error(
+        `HTTP request for GraalVM failed with status code: ${statusCode} (${response.message.statusMessage || 'Unknown error'})`
+      );
+    }
+  }
+
  private async findEABuildDownloadUrl(
    javaEaVersion: string
  ): Promise<JavaDownloadRelease> {
+    core.debug(`Searching for EA build: ${javaEaVersion}`);
+
    const versions = await this.fetchEAJson(javaEaVersion);
+    core.debug(`Found ${versions.length} EA versions`);
+
    const latestVersion = versions.find(v => v.latest);
    if (!latestVersion) {
+      core.error(
+        `Available versions: ${versions.map(v => v.version).join(', ')}`
+      );
      throw new Error(`Unable to find latest version for '${javaEaVersion}'`);
    }
+
+    core.debug(`Latest version found: ${latestVersion.version}`);
+
    const arch = this.distributionArchitecture();
    const file = latestVersion.files.find(
      f => f.arch === arch && f.platform === GRAALVM_PLATFORM
    );
-    if (!file || !file.filename.startsWith('graalvm-jdk-')) {
-      throw new Error(`Unable to find file metadata for '${javaEaVersion}'`);
+
+    if (!file) {
+      core.error(
+        `Available files for architecture ${arch}: ${JSON.stringify(latestVersion.files)}`
+      );
+      throw new Error(
+        `Unable to find file for architecture '${arch}' and platform '${GRAALVM_PLATFORM}'`
+      );
    }
+
+    if (!file.filename.startsWith('graalvm-jdk-')) {
+      throw new Error(
+        `Invalid filename format: ${file.filename}. Expected to start with 'graalvm-jdk-'`
+      );
+    }
+
+    const downloadUrl = `${latestVersion.download_base_url}${file.filename}`;
+    core.debug(`Download URL: ${downloadUrl}`);
+
    return {
-      url: `${latestVersion.download_base_url}${file.filename}`,
+      url: downloadUrl,
      version: latestVersion.version
    };
  }
@@ -128,49 +220,59 @@ export class GraalVMDistribution extends JavaBase {
  private async fetchEAJson(
    javaEaVersion: string
  ): Promise<GraalVMEAVersion[]> {
-    const owner = 'graalvm';
-    const repository = 'oracle-graalvm-ea-builds';
-    const branch = 'main';
-    const filePath = `versions/${javaEaVersion}.json`;
-
-    const url = `https://api.github.com/repos/${owner}/${repository}/contents/${filePath}?ref=${branch}`;
-
+    const url = `https://api.github.com/repos/graalvm/oracle-graalvm-ea-builds/contents/versions/${javaEaVersion}.json?ref=main`;
    const headers = getGitHubHttpHeaders();

    core.debug(
      `Trying to fetch available version info for GraalVM EA builds from '${url}'`
    );
-    let fetchedJson;
+
    try {
-      fetchedJson = (await this.http.getJson<GraalVMEAVersion[]>(url, headers))
-        .result;
-    } catch (err) {
-      throw Error(
-        `Fetching version info for GraalVM EA builds from '${url}' failed with the error: ${
-          (err as Error).message
-        }`
+      const response = await this.http.getJson<GraalVMEAVersion[]>(
+        url,
+        headers
+      );
+
+      if (!response.result) {
+        throw new Error(
+          `No GraalVM EA build found for version '${javaEaVersion}'. Please check if the version is correct.`
+        );
+      }
+
+      return response.result;
+    } catch (error) {
+      if (error instanceof Error) {
+        // Check if it's a 404 error (file not found)
+        if (error.message?.includes('404')) {
+          throw new Error(
+            `GraalVM EA version '${javaEaVersion}' not found. Please verify the version exists in the EA builds repository.`
+          );
+        }
+        // Re-throw with more context
+        throw new Error(
+          `Failed to fetch GraalVM EA version information for '${javaEaVersion}': ${error.message}`
+        );
+      }
+      // If it's not an Error instance, throw a generic error
+      throw new Error(
+        `Failed to fetch GraalVM EA version information for '${javaEaVersion}'`
      );
    }
-    if (fetchedJson === null) {
-      throw Error(
-        `No GraalVM EA build found. Are you sure java-version: '${javaEaVersion}' is correct?`
-      );
-    }
-    return fetchedJson;
  }

  public getPlatform(platform: NodeJS.Platform = process.platform): OsVersions {
-    switch (platform) {
-      case 'darwin':
-        return 'macos';
-      case 'win32':
-        return 'windows';
-      case 'linux':
-        return 'linux';
-      default:
-        throw new Error(
-          `Platform '${platform}' is not supported. Supported platforms: 'linux', 'macos', 'windows'`
-        );
+    const platformMap: Record<string, OsVersions> = {
+      darwin: 'macos',
+      win32: 'windows',
+      linux: 'linux'
+    };
+
+    const result = platformMap[platform];
+    if (!result) {
+      throw new Error(
+        `Platform '${platform}' is not supported. Supported platforms: 'linux', 'macos', 'windows'`
+      );
    }
+    return result;
  }
 }
--- a/src/distributions/microsoft/microsoft-openjdk-versions.json
+++ b/src/distributions/microsoft/microsoft-openjdk-versions.json
@@ -1,90 +1,133 @@
 [
  {
-  "version": "21.0.2",
-  "stable": true,
-  "release_url": "https://aka.ms/download-jdk",
-  "files": [
-    {
-      "filename": "microsoft-jdk-21.0.2-macos-x64.tar.gz",
-      "arch": "x64",
-      "platform": "darwin",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-x64.tar.gz"
-    },
-    {
-      "filename": "microsoft-jdk-21.0.2-linux-x64.tar.gz",
-      "arch": "x64",
-      "platform": "linux",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-x64.tar.gz"
-    },
-    {
-      "filename": "microsoft-jdk-21.0.2-windows-x64.zip",
-      "arch": "x64",
-      "platform": "win32",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-x64.zip"
-    },
-    {
-      "filename": "microsoft-jdk-21.0.2-macos-aarch64.tar.gz",
-      "arch": "aarch64",
-      "platform": "darwin",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-aarch64.tar.gz"
-    },
-    {
-      "filename": "microsoft-jdk-21.0.2-linux-aarch64.tar.gz",
-      "arch": "aarch64",
-      "platform": "linux",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-aarch64.tar.gz"
-    },
-    {
-      "filename": "microsoft-jdk-21.0.2-windows-aarch64.zip",
-      "arch": "aarch64",
-      "platform": "win32",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-aarch64.zip"
-    }
-  ]
-},
+    "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.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.2",
+    "stable": true,
+    "release_url": "https://aka.ms/download-jdk",
+    "files": [
+      {
+        "filename": "microsoft-jdk-21.0.2-macos-x64.tar.gz",
+        "arch": "x64",
+        "platform": "darwin",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-x64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-21.0.2-linux-x64.tar.gz",
+        "arch": "x64",
+        "platform": "linux",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-x64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-21.0.2-windows-x64.zip",
+        "arch": "x64",
+        "platform": "win32",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-x64.zip"
+      },
+      {
+        "filename": "microsoft-jdk-21.0.2-macos-aarch64.tar.gz",
+        "arch": "aarch64",
+        "platform": "darwin",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-aarch64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-21.0.2-linux-aarch64.tar.gz",
+        "arch": "aarch64",
+        "platform": "linux",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-aarch64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-21.0.2-windows-aarch64.zip",
+        "arch": "aarch64",
+        "platform": "win32",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-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,
@@ -176,42 +219,42 @@
    "stable": true,
    "release_url": "https://aka.ms/download-jdk",
    "files": [
-    {
-      "filename": "microsoft-jdk-17.0.9-macos-x64.tar.gz",
-      "arch": "x64",
-      "platform": "darwin",
-      "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",
-      "arch": "x64",
-      "platform": "linux",
-      "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",
-      "arch": "x64",
-      "platform": "win32",
-      "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",
-      "arch": "aarch64",
-      "platform": "darwin",
-      "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",
-      "arch": "aarch64",
-      "platform": "linux",
-      "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",
-      "arch": "aarch64",
-      "platform": "win32",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-aarch64.zip"
-    }
+      {
+        "filename": "microsoft-jdk-17.0.9-macos-x64.tar.gz",
+        "arch": "x64",
+        "platform": "darwin",
+        "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",
+        "arch": "x64",
+        "platform": "linux",
+        "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",
+        "arch": "x64",
+        "platform": "win32",
+        "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",
+        "arch": "aarch64",
+        "platform": "darwin",
+        "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",
+        "arch": "aarch64",
+        "platform": "linux",
+        "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",
+        "arch": "aarch64",
+        "platform": "win32",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-aarch64.zip"
+      }
    ]
  },
  {
@@ -835,4 +878,4 @@
      }
    ]
  }
-]
+]
--- a/src/distributions/sapmachine/installer.ts
+++ b/src/distributions/sapmachine/installer.ts
@@ -8,7 +8,6 @@ import {
  convertVersionToSemver,
  extractJdkFile,
  getDownloadArchiveExtension,
-  getGitHubHttpHeaders,
  isVersionSatisfies,
  renameWinArchive
 } from '../../util';
@@ -64,13 +63,12 @@ export class SapMachineDistribution extends JavaBase {
    const arch = this.distributionArchitecture();

    let fetchedReleasesJson = await this.fetchReleasesFromUrl(
-      'https://sap.github.io/SapMachine/assets/data/sapmachine-releases-all.json'
+      'https://sapmachine.io/assets/data/sapmachine-releases-all.json'
    );

    if (!fetchedReleasesJson) {
      fetchedReleasesJson = await this.fetchReleasesFromUrl(
-        'https://api.github.com/repos/SAP/SapMachine/contents/assets/data/sapmachine-releases-all.json?ref=gh-pages',
-        getGitHubHttpHeaders()
+        'https://sap.github.io/SapMachine/assets/data/sapmachine-releases-all.json'
      );
    }

--- a/src/toolchains.ts
+++ b/src/toolchains.ts
@@ -59,9 +59,8 @@ 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,21 +133,25 @@ export function getVersionFromFileContent(
  const versionFileName = getFileName(versionFile);
  if (versionFileName == '.tool-versions') {
    javaVersionRegExp =
-      /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
+      /^java\s+(?:\S*-)?(?<version>\d+(?:\.\d+)*([+_.-](?:openj9[-._]?\d[\w.-]*|java\d+|jre[-_\w]*|OpenJDK\d+[\w_.-]*|[a-z0-9]+))*)/im;
+  } else if (versionFileName == '.sdkmanrc') {
+    javaVersionRegExp = /^java\s*=\s*(?<version>[^-]+)/m;
  } else {
    javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
  }

-  const fileContent = content.match(javaVersionRegExp)?.groups?.version
+  const capturedVersion = content.match(javaVersionRegExp)?.groups?.version
    ? (content.match(javaVersionRegExp)?.groups?.version as string)
    : '';
-  if (!fileContent) {
+
+  core.debug(
+    `Parsed version '${capturedVersion}' from file '${versionFileName}'`
+  );
+  if (!capturedVersion) {
    return null;
  }

-  core.debug(`Version from file '${fileContent}'`);
-
-  const tentativeVersion = avoidOldNotation(fileContent);
+  const tentativeVersion = avoidOldNotation(capturedVersion);
  const rawVersion = tentativeVersion.split('-')[0];

  let version = semver.validRange(rawVersion)
@@ -184,8 +188,8 @@ export function convertVersionToSemver(version: number[] | string) {
 }

 export function getGitHubHttpHeaders(): OutgoingHttpHeaders {
-  const token = core.getInput('token');
-  const auth = !token ? undefined : `token ${token}`;
+  const resolvedToken = core.getInput('token') || process.env.GITHUB_TOKEN;
+  const auth = !resolvedToken ? undefined : `token ${resolvedToken}`;

  const headers: OutgoingHttpHeaders = {
    accept: 'application/vnd.github.VERSION.raw'
Author	SHA1	Message	Date
guicamest	4e7e684fbb	feat: Add support for `.sdkmanrc` file in `java-version-file` parameter (#736 ) * chore(e2e-versions): Add e2e test scenario on `setup-java-version-from-file-major-minor-patch-with-dist` for `.sdkmanrc` * chore(e2e-versions): Update `setup-java-version-from-file-major-minor-patch-with-dist` test to include the file name of the java-version-file that is used * feat: Add support for `.sdkmanrc` as Java Version File * chore: Add test for the latest known sdkman java versions * docs(advanced-usage): Document support for `.sdkmanrc` as java-version-file * chore(docs): Anyone can contribute and maintain 🤷 * Update advanced-usage.md Add example step/file for `.sdkmanrc` * Update advanced-usage.md * Update util.ts * chore: format and rebuild * chore: untouch toolchains.ts * fix check dist error --------- Co-authored-by: mahabaleshwars <147705296+mahabaleshwars@users.noreply.github.com>	2025-11-25 13:36:29 -06:00
mahabaleshwars	46c56d6f92	Add GitHub Token Support for GraalVM and Refactor Code (#849 ) * Code updated to let code accept github token and refactored the code. * github token accept through environment variable * fix test error * audit fix commit * update package-lock.json * Update GraalVM Tests * Lint Issue Resolve * Update Test case for Windows * update with enhance code and test	2025-11-18 12:04:23 -06:00
Christoph Langer	66b945764b	Update SapMachine URLs (#955 )	2025-11-17 10:33:06 -06:00
priya-kinthali	6ba5449b7d	Enhance error logging for network failures to include endpoint/IP details, add retry mechanism and update workflows to use macos-15-intel (#946 ) * enhance error logging and implement retry * Replace macos-13 with macos-15-intel * refactored code based on Copilot suggestions	2025-11-13 13:34:50 -06:00
the-mod	de5a937a1d	adds microsoft openjdk25 builds (#927 ) * adds microsoft java 25 build adds microsoft java 25 build * tests and formatting * Add Microsoft distribution for version 25 on multiple OS	2025-10-27 15:17:49 -05:00
aparnajyothi-y	ead9eaa3cf	Update Regex to Support All ASDF Versions for the supported distributions in tool-versions File (#767 ) * Regex update to fix #719 * Check failures fix * npm run format, npm run format-check & npm run build * Regex update * regex update * fixed check failures * updated regex * regex update for all the versions * regex and docmentation update * Regex update * format and doc update * doc format update * npm audit fix * resolve conflicts * resolve conflicts * resolve conflicts * doc update * Java version upgrade	2025-09-16 13:23:22 -05:00
Chiranjib Swain	8c57fa3627	Clarify JAVA_HOME and PATH setup in README (#841 ) * Update README to clarify JAVA_HOME and PATH setup * Clarify instructions for setting up multiple JDKs in README	2025-09-16 13:19:02 -05:00
dependabot[bot]	a7ab372554	Bump prettier from 2.8.8 to 3.6.2 (#873 ) * Bump prettier from 2.8.8 to 3.6.2 Bumps [prettier](https://github.com/prettier/prettier) from 2.8.8 to 3.6.2. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.8.8...3.6.2) --- updated-dependencies: - dependency-name: prettier dependency-version: 3.6.2 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * doc update and check failure fix * npm run format-check * doc format update * doc update * doc update --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aparna Jyothi <aparnajyothi-y@github.com>	2025-09-09 10:02:46 -05:00
lmvysakh	d0351b4837	Update documentation to use checkout and Java v5 (#903 ) Co-authored-by: lmvysakh <lmvysakh@github.com>	2025-09-03 14:04:05 -05:00