Merge 915dff3470 into fe779bf55e

Updated the Java version in the README setup examples from 21 to 25
to reflect the latest supported version. This change ensures that
users are guided to use the most current Java version for their
projects.

- Updated all instances of 'java-version: 21' to 'java-version: 25'
- Modified supported version syntax to include '25'

.github/workflows/e2e-cache-dependency-path.yml

@@ -24,7 +24,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Run setup-java with the cache for gradle
         uses: ./
         id: setup-java
@@ -51,7 +51,7 @@ jobs:
     needs: gradle1-save
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Run setup-java with the cache for gradle
         uses: ./
         id: setup-java
@@ -76,7 +76,7 @@ jobs:
     needs: gradle1-save
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Run setup-java with the cache for gradle
         uses: ./
         id: setup-java

.github/workflows/e2e-cache.yml

@@ -21,10 +21,10 @@ 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
+        uses: actions/checkout@v6
       - name: Run setup-java with the cache for gradle
         uses: ./
         id: setup-java
@@ -46,11 +46,11 @@ 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
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Run setup-java with the cache for gradle
         uses: ./
         id: setup-java
@@ -70,10 +70,10 @@ 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
+        uses: actions/checkout@v6
       - name: Run setup-java with the cache for maven
         uses: ./
         id: setup-java
@@ -93,11 +93,11 @@ 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
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Run setup-java with the cache for maven
         uses: ./
         id: setup-java
@@ -121,10 +121,10 @@ 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
+        uses: actions/checkout@v6
       - name: Run setup-java with the cache for sbt
         uses: ./
         id: setup-java
@@ -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,11 +170,11 @@ 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
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Run setup-java with the cache for sbt
         uses: ./
         id: setup-java
@@ -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"

.github/workflows/e2e-local-file.yml

@@ -21,7 +21,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Download Adopt OpenJDK file
         run: |
           if ($IsLinux) {
@@ -58,7 +58,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Download Zulu OpenJDK file
         run: |
           if ($IsLinux) {
@@ -95,7 +95,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Download Eclipse Temurin file
         run: |
           if ($IsLinux) {

.github/workflows/e2e-publishing.yml

@@ -25,7 +25,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: setup-java
         uses: ./
         id: setup-java
@@ -60,7 +60,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Create fake settings.xml
         run: |
           $xmlDirectory = Join-Path $HOME ".m2"
@@ -96,7 +96,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Create fake settings.xml
         run: |
           $xmlDirectory = Join-Path $HOME ".m2"
@@ -133,7 +133,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: setup-java
         uses: ./
         id: setup-java

.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
@@ -64,7 +73,7 @@ jobs:
             version: '24-ea'
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: setup-java
         uses: ./
         id: setup-java
@@ -114,7 +123,7 @@ jobs:
             version: '17.0.7'
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: setup-java
         uses: ./
         id: setup-java
@@ -149,7 +158,7 @@ jobs:
             os: macos-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: setup-java
         uses: ./
         id: setup-java
@@ -185,7 +194,7 @@ jobs:
             os: macos-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: setup-java
         uses: ./
         id: setup-java
@@ -220,11 +229,11 @@ 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
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: setup-java
         uses: ./
         id: setup-java
@@ -246,7 +255,7 @@ jobs:
         version: ['17-ea']
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: setup-java
         uses: ./
         id: setup-java
@@ -268,7 +277,7 @@ jobs:
         version: ['17-ea', '21-ea']
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: setup-java
         uses: ./
         id: setup-java
@@ -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']
@@ -355,7 +364,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: setup-java
         uses: ./
         id: setup-java
@@ -383,7 +392,7 @@ jobs:
         version: ['11']
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: setup-java
         uses: ./
         id: setup-java
@@ -406,7 +415,7 @@ jobs:
         java-version-file: ['.java-version', '.tool-versions']
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Create .java-version file
         shell: bash
         run: echo "17" > .java-version
@@ -435,7 +444,7 @@ jobs:
         java-version-file: ['.java-version', '.tool-versions']
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Create .java-version file
         shell: bash
         run: echo "11" > .java-version
@@ -463,7 +472,7 @@ jobs:
         java-version-file: ['.java-version', '.tool-versions']
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Create .java-version file
         shell: bash
         run: echo "17.0.10" > .java-version
@@ -481,23 +490,26 @@ 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
+        uses: actions/checkout@v6
       - name: Create .java-version file
         shell: bash
         run: echo "openjdk64-17.0.10" > .java-version
       - 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

.github/workflows/publish-immutable-actions.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checking out
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Publish
         id: publish
         uses: actions/publish-immutable-action@v0.0.4

.github/workflows/release-new-action-version.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
       - name: Update the ${{ env.TAG_NAME }} tag
         id: update-major-tag
-        uses: actions/publish-action@v0.3.0
+        uses: actions/publish-action@v0.4.0
         with:
           source-tag: ${{ env.TAG_NAME }}
           slack-webhook: ${{ secrets.SLACK_WEBHOOK }}

.licensed.yml

@@ -13,3 +13,4 @@ allowed:
 
 reviewed:
   npm:
+    - "@actions/http-client" # MIT (license text present), but detected as "other"

README.md

@@ -55,7 +55,13 @@ For information about the latest releases, recent updates, and newly supported d
   #### Maven options
   The action has a bunch of inputs to generate maven's [settings.xml](https://maven.apache.org/settings.html) on the fly and pass the values to Apache Maven GPG Plugin as well as Apache Maven Toolchains. See [advanced usage](docs/advanced-usage.md) for more.
 
-  - `overwrite-settings`: By default action overwrites the settings.xml. In order to skip generation of file if it exists, set this to `false`.
+  - `overwrite-settings`: By default action overwrites the settings.xml and adds a toolchain entry to toolchains.xml. In order to skip generation of settings.xml and skip adding a toolchain entry to toolchains.xml if the according file exists, set this to `false`.
+
+  - `update-env-javahome`: By default action updates `env.JAVA_HOME` with the path of java installed. In order to skip update of JAVA_HOME, set this to `false`. The creation of the env variable JAVA_HOME_{{ MAJOR_VERSION }}_{{ ARCHITECTURE }} is NOT affected by this item. That will be created for any setup.
+
+  - `update-env-path`: By default action adds `<java_install_dir>/bin` to `env.PATH`. In order to skip this, set this to `false`.
+
+  - `update-toolchains-only`: If set to true, then `overwrite-settings`, `update-env-javahome` and `update-env-path` are propagated to `false` if the specific one is not explicitly configured to `true`. Only a toolchain entry will be added to toolchains.xml. Default is `false`.
 
   - `server-id`: ID of the distributionManagement repository in the pom.xml file. Default is `github`.
 
@@ -78,28 +84,28 @@ For information about the latest releases, recent updates, and newly supported d
 #### Eclipse Temurin
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'temurin' # See 'Supported distributions' for available options
-    java-version: '21'
+    java-version: '25'
 - run: java HelloWorldApp.java
 ```
 
 #### Azul Zulu OpenJDK
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'zulu' # See 'Supported distributions' for available options
-    java-version: '21'
+    java-version: '25'
 - run: java HelloWorldApp.java
 ```
 
 #### Supported version syntax
 The `java-version` input supports an exact version or a version range using [SemVer](https://semver.org/) notation:
-- major versions: `8`, `11`, `16`, `17`, `21`
+- major versions: `8`, `11`, `16`, `17`, `21`, `25`
 - 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`
 
@@ -145,26 +151,31 @@ The cache input is optional, and caching is turned off by default.
 #### Caching gradle dependencies
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'temurin'
-    java-version: '21'
+    java-version: '25'
     cache: 'gradle'
     cache-dependency-path: | # optional
       sub-project/*.gradle*
       sub-project/**/gradle-wrapper.properties
 - run: ./gradlew build --no-daemon
 ```
+Using the `cache: gradle` provides a simple and effective way to cache Gradle dependencies with minimal configuration.
+
+For projects that require more advanced `Gradle` caching features, such as caching build outputs, support for Gradle configuration cache, encrypted cache storage, fine-grained cache control (including options to enable or disable the cache, set it to read-only or write-only, perform automated cleanup, and define custom cache rules), or optimized performance for complex CI workflows, consider using [`gradle/actions/setup-gradle`](https://github.com/gradle/actions/tree/main/setup-gradle).  
+
+For setup details and a comprehensive overview of all available features, visit the [setup-gradle documentation](https://github.com/gradle/actions/blob/main/docs/setup-gradle.md).
 
 #### Caching maven dependencies
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'temurin'
-    java-version: '21'
+    java-version: '25'
     cache: 'maven'
     cache-dependency-path: 'sub-project/pom.xml' # optional
 - name: Build with Maven
@@ -174,11 +185,11 @@ steps:
 #### Caching sbt dependencies
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'temurin'
-    java-version: '21'
+    java-version: '25'
     cache: 'sbt'
     cache-dependency-path: | # optional
       sub-project/build.sbt
@@ -194,11 +205,11 @@ Usually, cache gets downloaded in multiple segments of fixed sizes. Sometimes, a
 env:
   SEGMENT_DOWNLOAD_TIMEOUT_MINS: '5'
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'temurin'
-    java-version: '21'
+    java-version: '25'
     cache: 'gradle'
 - run: ./gradlew build --no-daemon
 ```
@@ -214,11 +225,11 @@ For Java distributions that are not cached on Hosted images, `check-latest` alwa
 
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'temurin'
-    java-version: '21'
+    java-version: '25'
     check-latest: true
 - run: java HelloWorldApp.java
 ```
@@ -230,10 +241,10 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        java: [ '8', '11', '17', '21' ]
+        java: [ '8', '11', '17', '21', '25' ]
     name: Java ${{ matrix.Java }} sample
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup java
         uses: actions/setup-java@v5
         with:
@@ -257,6 +268,8 @@ All configured Java versions are added to the PATH. The last one added to the PA
             15
 ```
 
+**NOTE:** An alternative option is to use multiple setup-java steps. In this case the behavior can be controlled more granular by making use of the input items `overwrite-settings`, `update-env-javahome`, `update-env-path` and `update-toolchains-only`.
+
 ### Using Maven Toolchains
 In the example above multiple JDKs are installed for the same job. The result after the last JDK is installed is a Maven Toolchains declaration containing references to all three JDKs. The values for `id`, `version`, and `vendor` of the individual Toolchain entries are the given input values for `distribution` and `java-version` (`vendor` being the combination of `${distribution}_${java-version}`) by default.
 

__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,

__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

__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',

__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;
 

action.yml

@@ -43,9 +43,21 @@ inputs:
     description: 'Path to where the settings.xml file will be written. Default is ~/.m2.'
     required: false
   overwrite-settings:
-    description: 'Overwrite the settings.xml file if it exists. Default is "true".'
+    description: 'Overwrite the settings.xml file if it exists. Default is "!update-toolchains-only". If explcitly set "true", it will update settings.xml regardless of "update-toolchains-only"'
     required: false
-    default: true
+    # DO NOT set a default here! The default will be propagated from input 'update-toolchains-only'!
+  update-toolchains-only:
+    description: 'Update toolchains.xml only. Default is "false". No update of settings.xml, no update of JAVA_HOME, no adding to PATH by default - unless "overwrite-settings", "update-env-javahome" or "add-to-env-path" are not explicitly set "true"'
+    required: false
+    default: false
+  update-env-javahome:
+    description: 'Update the JAVA_HOME environment variable. Default is "!update-toolchains-only"'
+    required: false
+    # DO NOT set a default here! The default will be propagated from input 'update-toolchains-only'!
+  add-to-env-path:
+    description: 'Add "<JDK home>/bin" to the PATH environment variable. Default is "!update-toolchains-only"'
+    required: false
+    # DO NOT set a default here! The default will be propagated from input 'update-toolchains-only'!
   gpg-private-key:
     description: 'GPG private key to import. Default is empty string.'
     required: false

docs/advanced-usage.md

@@ -31,7 +31,7 @@ Inputs `java-version` and `distribution` are mandatory and needs to be provided.
 
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'temurin'
@@ -44,7 +44,7 @@ steps:
 
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'adopt-hotspot'
@@ -56,7 +56,7 @@ steps:
 
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'zulu'
@@ -69,7 +69,7 @@ steps:
 
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'liberica'
@@ -82,7 +82,7 @@ steps:
 
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'microsoft'
@@ -111,7 +111,7 @@ If the runner is not able to access github.com, any Java versions requested duri
 
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'corretto'
@@ -124,7 +124,7 @@ steps:
 
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'oracle'
@@ -137,7 +137,7 @@ steps:
 
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'dragonwell'
@@ -149,7 +149,7 @@ steps:
 **NOTE:** An OpenJDK release maintained and supported by SAP
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'sapmachine'
@@ -162,7 +162,7 @@ steps:
 
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'graalvm'
@@ -181,7 +181,7 @@ For example, `11.0.24` is not available but `11.0.16` is.
 
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'jetbrains'
@@ -194,7 +194,7 @@ GitHub token to the action to increase the rate limit. Set the `GITHUB_TOKEN` en
 
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'jetbrains'
@@ -219,7 +219,7 @@ The available package types are:
 ## Installing custom Java package type
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: '<distribution>'
@@ -232,7 +232,7 @@ steps:
 
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: '<distribution>'
@@ -296,7 +296,7 @@ jobs:
         java: [ '8', '11' ]
     name: Java ${{ matrix.Java }} (${{ matrix.distribution }}) sample
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup java
         uses: actions/setup-java@v5
         with:
@@ -316,7 +316,7 @@ jobs:
         os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
     name: Java ${{ matrix.Java }} (${{ matrix.os }}) sample
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup java
         uses: actions/setup-java@v5
         with:
@@ -333,7 +333,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up JDK 11
       uses: actions/setup-java@v5
       with:
@@ -446,7 +446,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up JDK 11 for Shared Runner
       uses: actions/setup-java@v5
       with:
@@ -472,7 +472,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Set up JDK 11
       uses: actions/setup-java@v5
@@ -574,7 +574,7 @@ Each JDK provider will receive a default `id` based on the combination of `distr
 
 ```yaml
 steps:
-- uses: actions/checkout@v5
+- uses: actions/checkout@v6
 - uses: actions/setup-java@v5
   with:
     distribution: 'temurin'
@@ -601,14 +601,29 @@ 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.
+  Supported files are `.java-version`, `.tool-versions` and `.sdkmanrc`.
-  In .java-version file, only the version should be specified (e.g., 17.0.7).
+  * 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).
+  * 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/)).
-  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/)).
+  * 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.
 
-  If both java-version and java-version-file inputs are provided, the java-version input will be used.
     
-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

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:
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-java",
-  "version": "5.0.0",
+  "version": "5.2.0",
   "private": true,
   "description": "setup java action",
   "main": "dist/setup/index.js",
@@ -29,7 +29,7 @@
   "author": "GitHub",
   "license": "MIT",
   "dependencies": {
-    "@actions/cache": "^4.0.3",
+    "@actions/cache": "^5.0.1",
     "@actions/core": "^1.10.0",
     "@actions/exec": "^1.0.4",
     "@actions/glob": "^0.5.0",

src/auth.ts

@@ -10,17 +10,13 @@ import * as constants from './constants';
 import * as gpg from './gpg';
 import {getBooleanInput} from './util';
 
-export async function configureAuthentication() {
+export async function configureAuthentication(overwriteSettings: boolean) {
   const id = core.getInput(constants.INPUT_SERVER_ID);
   const username = core.getInput(constants.INPUT_SERVER_USERNAME);
   const password = core.getInput(constants.INPUT_SERVER_PASSWORD);
   const settingsDirectory =
     core.getInput(constants.INPUT_SETTINGS_PATH) ||
     path.join(os.homedir(), constants.M2_DIR);
-  const overwriteSettings = getBooleanInput(
-    constants.INPUT_OVERWRITE_SETTINGS,
-    true
-  );
   const gpgPrivateKey =
     core.getInput(constants.INPUT_GPG_PRIVATE_KEY) ||
     constants.INPUT_DEFAULT_GPG_PRIVATE_KEY;

src/constants.ts

@@ -11,6 +11,9 @@ export const INPUT_SERVER_USERNAME = 'server-username';
 export const INPUT_SERVER_PASSWORD = 'server-password';
 export const INPUT_SETTINGS_PATH = 'settings-path';
 export const INPUT_OVERWRITE_SETTINGS = 'overwrite-settings';
+export const INPUT_UPDATE_TOOLCHAINS_ONLY = 'update-toolchains-only';
+export const INPUT_UPDATE_JAVA_HOME = 'update-env-javahome';
+export const INPUT_ADD_TO_PATH = 'add-to-env-path';
 export const INPUT_GPG_PRIVATE_KEY = 'gpg-private-key';
 export const INPUT_GPG_PASSPHRASE = 'gpg-passphrase';
 

src/distributions/base-installer.ts

@@ -10,7 +10,11 @@ import {
   JavaInstallerOptions,
   JavaInstallerResults
 } from './base-models';
-import {MACOS_JAVA_CONTENT_POSTFIX} from '../constants';
+import {
+  MACOS_JAVA_CONTENT_POSTFIX,
+  INPUT_UPDATE_JAVA_HOME,
+  INPUT_ADD_TO_PATH
+} from '../constants';
 import os from 'os';
 
 export abstract class JavaBase {
@@ -20,6 +24,8 @@ export abstract class JavaBase {
   protected packageType: string;
   protected stable: boolean;
   protected checkLatest: boolean;
+  protected updateEnvJavaHome: boolean;
+  protected addToEnvPath: boolean;
 
   constructor(
     protected distribution: string,
@@ -36,6 +42,8 @@ export abstract class JavaBase {
     this.architecture = installerOptions.architecture || os.arch();
     this.packageType = installerOptions.packageType;
     this.checkLatest = installerOptions.checkLatest;
+    this.updateEnvJavaHome = installerOptions.updateEnvJavaHome;
+    this.addToEnvPath = installerOptions.addToEnvPath;
   }
 
   protected abstract downloadTool(
@@ -51,39 +59,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 MAX_RETRIES = 4;
-        const javaRelease = await this.findPackageForDownload(this.version);
+      const RETRY_DELAY_MS = 2000;
-        core.info(`Resolved latest version as ${javaRelease.version}`);
+      const retryableCodes = [
-        if (foundJava?.version === javaRelease.version) {
+        'ETIMEDOUT',
-          core.info(`Resolved Java ${foundJava.version} from tool-cache`);
+        'ECONNRESET',
-        } else {
+        'ENOTFOUND',
-          core.info('Trying to download...');
+        'ECONNREFUSED'
-          foundJava = await this.downloadTool(javaRelease);
+      ];
-          core.info(`Java ${foundJava.version} was downloaded`);
+      let retries = MAX_RETRIES;
-        }
+      while (retries > 0) {
-      } catch (error: any) {
+        try {
-        if (error instanceof tc.HTTPError) {
+          // Clear console timers before each attempt to prevent conflicts
-          if (error.httpStatusCode === 403) {
+          if (retries < MAX_RETRIES && core.isDebug()) {
-            core.error('HTTP 403: Permission denied or access restricted.');
+            const consoleAny = console as any;
-          } else if (error.httpStatusCode === 429) {
+            consoleAny._times?.clear?.();
-            core.warning('HTTP 429: Rate limit exceeded. Please retry later.');
-          } else {
-            core.error(`HTTP ${error.httpStatusCode}: ${error.message}`);
           }
-        } else {
+          const javaRelease = await this.findPackageForDownload(this.version);
-          const message =
+          core.info(`Resolved latest version as ${javaRelease.version}`);
-            error instanceof Error ? error.message : JSON.stringify(error);
+          if (foundJava?.version === javaRelease.version) {
-          core.error(
+            core.info(`Resolved Java ${foundJava.version} from tool-cache`);
-            `Java setup failed due to network issue or timeout: ${message}`
+          } 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, 522].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,
@@ -185,8 +269,18 @@ export abstract class JavaBase {
 
   protected setJavaDefault(version: string, toolPath: string) {
     const majorVersion = version.split('.')[0];
-    core.exportVariable('JAVA_HOME', toolPath);
+    if (this.updateEnvJavaHome) {
-    core.addPath(path.join(toolPath, 'bin'));
+      core.exportVariable('JAVA_HOME', toolPath);
+    } else {
+      core.info(
+        `Skip updating env.JAVA_HOME according to ${INPUT_UPDATE_JAVA_HOME}`
+      );
+    }
+    if (this.addToEnvPath) {
+      core.addPath(path.join(toolPath, 'bin'));
+    } else {
+      core.info(`Skip adding to env.PATH according to ${INPUT_ADD_TO_PATH}`);
+    }
     core.setOutput('distribution', this.distribution);
     core.setOutput('path', toolPath);
     core.setOutput('version', version);

src/distributions/base-models.ts

@@ -3,6 +3,8 @@ export interface JavaInstallerOptions {
   architecture: string;
   packageType: string;
   checkLatest: boolean;
+  updateEnvJavaHome: boolean;
+  addToEnvPath: boolean;
 }
 
 export interface JavaInstallerResults {

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(
+    try {
-      `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
+      core.info(
-    );
+        `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
-    let javaArchivePath = await tc.downloadTool(javaRelease.url);
+      );
+      let javaArchivePath = await tc.downloadTool(javaRelease.url);
 
-    core.info(`Extracting Java archive...`);
+      core.info(`Extracting Java archive...`);
-    const extension = getDownloadArchiveExtension();
+      const extension = getDownloadArchiveExtension();
-    if (process.platform === 'win32') {
+      if (IS_WINDOWS) {
-      javaArchivePath = renameWinArchive(javaArchivePath);
+        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') {
+    if (!SUPPORTED_ARCHITECTURES.includes(arch as SupportedArchitecture)) {
-      throw new Error(`Unsupported architecture: ${this.architecture}`);
+      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;
+    const major = range.includes('.') ? range.split('.')[0] : range;
-    let fileUrl;
+    const majorVersion = parseInt(major);
-    if (range.includes('.')) {
+
-      major = range.split('.')[0];
+    if (isNaN(majorVersion)) {
-      fileUrl = `${GRAALVM_DL_BASE}/${major}/archive/graalvm-jdk-${range}_${platform}-${arch}_bin.${extension}`;
+      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) {
+    if (majorVersion < GRAALVM_MIN_VERSION) {
-      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) {
       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 url = `https://api.github.com/repos/graalvm/oracle-graalvm-ea-builds/contents/versions/${javaEaVersion}.json?ref=main`;
-    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 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))
+      const response = await this.http.getJson<GraalVMEAVersion[]>(
-        .result;
+        url,
-    } catch (err) {
+        headers
-      throw Error(
+      );
-        `Fetching version info for GraalVM EA builds from '${url}' failed with the error: ${
+
-          (err as Error).message
+      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) {
+    const platformMap: Record<string, OsVersions> = {
-      case 'darwin':
+      darwin: 'macos',
-        return 'macos';
+      win32: 'windows',
-      case 'win32':
+      linux: 'linux'
-        return 'windows';
+    };
-      case 'linux':
+
-        return 'linux';
+    const result = platformMap[platform];
-      default:
+    if (!result) {
-        throw new Error(
+      throw new Error(
-          `Platform '${platform}' is not supported. Supported platforms: 'linux', 'macos', 'windows'`
+        `Platform '${platform}' is not supported. Supported platforms: 'linux', 'macos', 'windows'`
-        );
+      );
     }
+    return result;
   }
 }

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

@@ -1,90 +1,133 @@
 [
   {
-  "version": "21.0.2",
+    "version": "25.0.0",
-  "stable": true,
+    "stable": true,
-  "release_url": "https://aka.ms/download-jdk",
+    "release_url": "https://aka.ms/download-jdk",
-  "files": [
+    "files": [
-    {
+      {
-      "filename": "microsoft-jdk-21.0.2-macos-x64.tar.gz",
+        "filename": "microsoft-jdk-25.0.0-macos-x64.tar.gz",
-      "arch": "x64",
+        "arch": "x64",
-      "platform": "darwin",
+        "platform": "darwin",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-x64.tar.gz"
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-macos-x64.tar.gz"
-    },
+      },
-    {
+      {
-      "filename": "microsoft-jdk-21.0.2-linux-x64.tar.gz",
+        "filename": "microsoft-jdk-25.0.0-linux-x64.tar.gz",
-      "arch": "x64",
+        "arch": "x64",
-      "platform": "linux",
+        "platform": "linux",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-x64.tar.gz"
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-linux-x64.tar.gz"
-    },
+      },
-    {
+      {
-      "filename": "microsoft-jdk-21.0.2-windows-x64.zip",
+        "filename": "microsoft-jdk-25.0.0-windows-x64.zip",
-      "arch": "x64",
+        "arch": "x64",
-      "platform": "win32",
+        "platform": "win32",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-x64.zip"
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-windows-x64.zip"
-    },
+      },
-    {
+      {
-      "filename": "microsoft-jdk-21.0.2-macos-aarch64.tar.gz",
+        "filename": "microsoft-jdk-25.0.0-macos-aarch64.tar.gz",
-      "arch": "aarch64",
+        "arch": "aarch64",
-      "platform": "darwin",
+        "platform": "darwin",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-aarch64.tar.gz"
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-macos-aarch64.tar.gz"
-    },
+      },
-    {
+      {
-      "filename": "microsoft-jdk-21.0.2-linux-aarch64.tar.gz",
+        "filename": "microsoft-jdk-25.0.0-linux-aarch64.tar.gz",
-      "arch": "aarch64",
+        "arch": "aarch64",
-      "platform": "linux",
+        "platform": "linux",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-aarch64.tar.gz"
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-linux-aarch64.tar.gz"
-    },
+      },
-    {
+      {
-      "filename": "microsoft-jdk-21.0.2-windows-aarch64.zip",
+        "filename": "microsoft-jdk-25.0.0-windows-aarch64.zip",
-      "arch": "aarch64",
+        "arch": "aarch64",
-      "platform": "win32",
+        "platform": "win32",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-aarch64.zip"
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-windows-aarch64.zip"
-    }
+      }
-  ]
+    ]
-},
+  },
   {
-  "version": "21.0.1",
+    "version": "21.0.2",
-  "stable": true,
+    "stable": true,
-  "release_url": "https://aka.ms/download-jdk",
+    "release_url": "https://aka.ms/download-jdk",
-  "files": [
+    "files": [
-    {
+      {
-      "filename": "microsoft-jdk-21.0.1-macos-x64.tar.gz",
+        "filename": "microsoft-jdk-21.0.2-macos-x64.tar.gz",
-      "arch": "x64",
+        "arch": "x64",
-      "platform": "darwin",
+        "platform": "darwin",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-macos-x64.tar.gz"
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-x64.tar.gz"
-    },
+      },
-    {
+      {
-      "filename": "microsoft-jdk-21.0.1-linux-x64.tar.gz",
+        "filename": "microsoft-jdk-21.0.2-linux-x64.tar.gz",
-      "arch": "x64",
+        "arch": "x64",
-      "platform": "linux",
+        "platform": "linux",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-linux-x64.tar.gz"
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-x64.tar.gz"
-    },
+      },
-    {
+      {
-      "filename": "microsoft-jdk-21.0.1-windows-x64.zip",
+        "filename": "microsoft-jdk-21.0.2-windows-x64.zip",
-      "arch": "x64",
+        "arch": "x64",
-      "platform": "win32",
+        "platform": "win32",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-x64.zip"
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-x64.zip"
-    },
+      },
-    {
+      {
-      "filename": "microsoft-jdk-21.0.1-macos-aarch64.tar.gz",
+        "filename": "microsoft-jdk-21.0.2-macos-aarch64.tar.gz",
-      "arch": "aarch64",
+        "arch": "aarch64",
-      "platform": "darwin",
+        "platform": "darwin",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-macos-aarch64.tar.gz"
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-aarch64.tar.gz"
-    },
+      },
-    {
+      {
-      "filename": "microsoft-jdk-21.0.1-linux-aarch64.tar.gz",
+        "filename": "microsoft-jdk-21.0.2-linux-aarch64.tar.gz",
-      "arch": "aarch64",
+        "arch": "aarch64",
-      "platform": "linux",
+        "platform": "linux",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-linux-aarch64.tar.gz"
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-aarch64.tar.gz"
-    },
+      },
-    {
+      {
-      "filename": "microsoft-jdk-21.0.1-windows-aarch64.zip",
+        "filename": "microsoft-jdk-21.0.2-windows-aarch64.zip",
-      "arch": "aarch64",
+        "arch": "aarch64",
-      "platform": "win32",
+        "platform": "win32",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-aarch64.zip"
+        "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",
+        "filename": "microsoft-jdk-17.0.9-macos-x64.tar.gz",
-      "arch": "x64",
+        "arch": "x64",
-      "platform": "darwin",
+        "platform": "darwin",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-x64.tar.gz"
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-x64.tar.gz"
-    },
+      },
-    {
+      {
-      "filename": "microsoft-jdk-17.0.9-linux-x64.tar.gz",
+        "filename": "microsoft-jdk-17.0.9-linux-x64.tar.gz",
-      "arch": "x64",
+        "arch": "x64",
-      "platform": "linux",
+        "platform": "linux",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-x64.tar.gz"
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-x64.tar.gz"
-    },
+      },
-    {
+      {
-      "filename": "microsoft-jdk-17.0.9-windows-x64.zip",
+        "filename": "microsoft-jdk-17.0.9-windows-x64.zip",
-      "arch": "x64",
+        "arch": "x64",
-      "platform": "win32",
+        "platform": "win32",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-x64.zip"
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-x64.zip"
-    },
+      },
-    {
+      {
-      "filename": "microsoft-jdk-17.0.9-macos-aarch64.tar.gz",
+        "filename": "microsoft-jdk-17.0.9-macos-aarch64.tar.gz",
-      "arch": "aarch64",
+        "arch": "aarch64",
-      "platform": "darwin",
+        "platform": "darwin",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-aarch64.tar.gz"
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-aarch64.tar.gz"
-    },
+      },
-    {
+      {
-      "filename": "microsoft-jdk-17.0.9-linux-aarch64.tar.gz",
+        "filename": "microsoft-jdk-17.0.9-linux-aarch64.tar.gz",
-      "arch": "aarch64",
+        "arch": "aarch64",
-      "platform": "linux",
+        "platform": "linux",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-aarch64.tar.gz"
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-aarch64.tar.gz"
-    },
+      },
-    {
+      {
-      "filename": "microsoft-jdk-17.0.9-windows-aarch64.zip",
+        "filename": "microsoft-jdk-17.0.9-windows-aarch64.zip",
-      "arch": "aarch64",
+        "arch": "aarch64",
-      "platform": "win32",
+        "platform": "win32",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-aarch64.zip"
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-aarch64.zip"
-    }
+      }
     ]
   },
   {

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',
+        'https://sap.github.io/SapMachine/assets/data/sapmachine-releases-all.json'
-        getGitHubHttpHeaders()
       );
     }
 

src/setup-java.ts

@@ -13,6 +13,19 @@ import * as path from 'path';
 import {getJavaDistribution} from './distributions/distribution-factory';
 import {JavaInstallerOptions} from './distributions/base-models';
 
+interface IInstallerInputsOptions {
+  architecture: string;
+  packageType: string;
+  checkLatest: boolean;
+  distributionName: string;
+  jdkFile: string;
+  toolchainIds: Array<string>;
+  updateToolchainsOnly: boolean;
+  overwriteSettings: boolean;
+  updateEnvJavaHome: boolean;
+  addToEnvPath: boolean;
+}
+
 async function run() {
   try {
     const versions = core.getMultilineInput(constants.INPUT_JAVA_VERSION);
@@ -28,6 +41,23 @@ async function run() {
       constants.INPUT_CACHE_DEPENDENCY_PATH
     );
     const checkLatest = getBooleanInput(constants.INPUT_CHECK_LATEST, false);
+    const updateToolchainsOnly = getBooleanInput(
+      constants.INPUT_UPDATE_TOOLCHAINS_ONLY,
+      false
+    );
+    const overwriteSettings = getBooleanInput(
+      constants.INPUT_OVERWRITE_SETTINGS,
+      !updateToolchainsOnly
+    );
+    const updateEnvJavaHome = getBooleanInput(
+      constants.INPUT_UPDATE_JAVA_HOME,
+      !updateToolchainsOnly
+    );
+    const addToEnvPath = getBooleanInput(
+      constants.INPUT_ADD_TO_PATH,
+      !updateToolchainsOnly
+    );
+
     let toolchainIds = core.getMultilineInput(constants.INPUT_MVN_TOOLCHAIN_ID);
 
     core.startGroup('Installed distributions');
@@ -40,13 +70,17 @@ async function run() {
       throw new Error('java-version or java-version-file input expected');
     }
 
-    const installerInputsOptions: installerInputsOptions = {
+    const installerInputsOptions: IInstallerInputsOptions = {
       architecture,
       packageType,
       checkLatest,
       distributionName,
       jdkFile,
-      toolchainIds
+      toolchainIds,
+      updateToolchainsOnly,
+      overwriteSettings,
+      updateEnvJavaHome,
+      addToEnvPath
     };
 
     if (!versions.length) {
@@ -78,7 +112,7 @@ async function run() {
     const matchersPath = path.join(__dirname, '..', '..', '.github');
     core.info(`##[add-matcher]${path.join(matchersPath, 'java.json')}`);
 
-    await auth.configureAuthentication();
+    await auth.configureAuthentication(overwriteSettings);
     if (cache && isCacheFeatureAvailable()) {
       await restore(cache, cacheDependencyPath);
     }
@@ -91,7 +125,7 @@ run();
 
 async function installVersion(
   version: string,
-  options: installerInputsOptions,
+  options: IInstallerInputsOptions,
   toolchainId = 0
 ) {
   const {
@@ -100,14 +134,20 @@ async function installVersion(
     architecture,
     packageType,
     checkLatest,
-    toolchainIds
+    toolchainIds,
+    updateToolchainsOnly,
+    overwriteSettings,
+    updateEnvJavaHome,
+    addToEnvPath
   } = options;
 
   const installerOptions: JavaInstallerOptions = {
+    version,
     architecture,
     packageType,
     checkLatest,
-    version
+    updateEnvJavaHome,
+    addToEnvPath
   };
 
   const distribution = getJavaDistribution(
@@ -126,6 +166,7 @@ async function installVersion(
     version,
     distributionName,
     result.path,
+    overwriteSettings || updateToolchainsOnly,
     toolchainIds[toolchainId]
   );
 
@@ -136,12 +177,3 @@ async function installVersion(
   core.info(`  Path: ${result.path}`);
   core.info('');
 }
-
-interface installerInputsOptions {
-  architecture: string;
-  packageType: string;
-  checkLatest: boolean;
-  distributionName: string;
-  jdkFile: string;
-  toolchainIds: Array<string>;
-}

src/toolchains.ts

@@ -19,6 +19,7 @@ export async function configureToolchains(
   version: string,
   distributionName: string,
   jdkHome: string,
+  updateToolchains: boolean,
   toolchainId?: string
 ) {
   const vendor =
@@ -27,10 +28,6 @@ export async function configureToolchains(
   const settingsDirectory =
     core.getInput(constants.INPUT_SETTINGS_PATH) ||
     path.join(os.homedir(), constants.M2_DIR);
-  const overwriteSettings = getBooleanInput(
-    constants.INPUT_OVERWRITE_SETTINGS,
-    true
-  );
 
   await createToolchainsSettings({
     jdkInfo: {
@@ -40,21 +37,21 @@ export async function configureToolchains(
       jdkHome
     },
     settingsDirectory,
-    overwriteSettings
+    updateToolchains
   });
 }
 
 export async function createToolchainsSettings({
   jdkInfo,
   settingsDirectory,
-  overwriteSettings
+  updateToolchains
 }: {
   jdkInfo: JdkInfo;
   settingsDirectory: string;
-  overwriteSettings: boolean;
+  updateToolchains: boolean;
 }) {
   core.info(
-    `Creating ${constants.MVN_TOOLCHAINS_FILE} for JDK version ${jdkInfo.version} from ${jdkInfo.vendor}`
+    `Adding a toolchain entry in ${constants.MVN_TOOLCHAINS_FILE} for JDK version ${jdkInfo.version} from ${jdkInfo.vendor}`
   );
   // when an alternate m2 location is specified use only that location (no .m2 directory)
   // otherwise use the home/.m2/ path
@@ -71,7 +68,7 @@ export async function createToolchainsSettings({
   await writeToolchainsFileToDisk(
     settingsDirectory,
     updatedToolchains,
-    overwriteSettings
+    updateToolchains
   );
 }
 
@@ -146,17 +143,17 @@ async function readExistingToolchainsFile(directory: string) {
 async function writeToolchainsFileToDisk(
   directory: string,
   settings: string,
-  overwriteSettings: boolean
+  updateToolchains: boolean
 ) {
   const location = path.join(directory, constants.MVN_TOOLCHAINS_FILE);
-  const settingsExists = fs.existsSync(location);
+  const toolchainsExists = fs.existsSync(location);
-  if (settingsExists && overwriteSettings) {
+  if (toolchainsExists && updateToolchains) {
-    core.info(`Overwriting existing file ${location}`);
+    core.info(`Updating existing file ${location}`);
-  } else if (!settingsExists) {
+  } else if (!toolchainsExists) {
-    core.info(`Writing to ${location}`);
+    core.info(`Creating file ${location}`);
   } else {
     core.info(
-      `Skipping generation of ${location} because file already exists and overwriting is not enabled`
+      `Skipping update of ${location} since file already exists and updating is not enabled`
     );
     return;
   }

src/util.ts

@@ -134,20 +134,24 @@ export function getVersionFromFileContent(
   if (versionFileName == '.tool-versions') {
     javaVersionRegExp =
       /^java\s+(?:\S*-)?(?<version>\d+(?:\.\d+)*([+_.-](?:openj9[-._]?\d[\w.-]*|java\d+|jre[-_\w]*|OpenJDK\d+[\w_.-]*|[a-z0-9]+))*)/im;
+  } 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(capturedVersion);
-
-  const tentativeVersion = avoidOldNotation(fileContent);
   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 resolvedToken = core.getInput('token') || process.env.GITHUB_TOKEN;
-  const auth = !token ? undefined : `token ${token}`;
+  const auth = !resolvedToken ? undefined : `token ${resolvedToken}`;
 
   const headers: OutgoingHttpHeaders = {
     accept: 'application/vnd.github.VERSION.raw'