fix failures

.github/workflows/e2e-versions.yml

@@ -30,8 +30,7 @@ jobs:
             'microsoft',
             'semeru',
             'corretto',
-            'dragonwell',
+            'dragonwell'
-            'sapmachine'
           ] # internally 'adopt-hotspot' is the same as 'adopt'
         version: ['21', '11', '17']
         exclude:
@@ -45,22 +44,11 @@ jobs:
             version: 17
           - distribution: oracle
             os: windows-latest
-            version: 21
+            version: 20
           - distribution: oracle
             os: ubuntu-latest
-            version: 21
+            version: 20
-          - distribution: graalvm
+
-            os: macos-latest
-            version: 17
-          - distribution: graalvm
-            os: windows-latest
-            version: 21
-          - distribution: graalvm
-            os: ubuntu-latest
-            version: 21
-          - distribution: graalvm
-            os: ubuntu-latest
-            version: '24-ea'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -90,19 +78,13 @@ jobs:
         include:
           - distribution: oracle
             os: ubuntu-latest
-            version: '21.0.4'
+            version: '20.0.1'
-          - distribution: graalvm
-            os: ubuntu-latest
-            version: '21.0.4'
           - distribution: dragonwell
             os: ubuntu-latest
             version: '11.0'
           - distribution: dragonwell
             os: ubuntu-latest
             version: '11.0.13+9'
-          - distribution: sapmachine
-            os: ubuntu-latest
-            version: '17.0.7'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -124,8 +106,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution:
+        distribution: ['temurin', 'zulu', 'liberica', 'dragonwell']
-          ['temurin', 'zulu', 'liberica', 'dragonwell', 'sapmachine']
         exclude:
           - distribution: dragonwell
             os: macos-latest
@@ -151,8 +132,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution:
+        distribution: ['temurin', 'zulu', 'liberica', 'dragonwell']
-          ['temurin', 'zulu', 'liberica', 'dragonwell', 'sapmachine']
         exclude:
           - distribution: dragonwell
             os: macos-latest
@@ -228,28 +208,6 @@ jobs:
         run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
         shell: bash
 
-  setup-java-ea-versions-sapmachine:
-    name: sapmachine ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
-    needs: setup-java-major-minor-versions
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-        version: ['17-ea', '21-ea']
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: setup-java
-        uses: ./
-        id: setup-java
-        with:
-          java-version: ${{ matrix.version }}
-          distribution: sapmachine
-      - name: Verify Java
-        run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
-        shell: bash
-
   setup-java-custom-package-type:
     name: ${{ matrix.distribution }} ${{ matrix.version }} (${{ matrix.java-package }}-x64) - ${{ matrix.os }}
     needs: setup-java-major-minor-versions
@@ -258,7 +216,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-13, windows-latest, ubuntu-latest]
-        distribution: ['temurin', 'zulu', 'liberica', 'semeru', 'sapmachine']
+        distribution: ['temurin', 'zulu', 'liberica', 'semeru']
         java-package: ['jre']
         version: ['17.0']
         include:

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

@@ -1,20 +0,0 @@
-name: 'Publish Immutable Action Version'
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
-      packages: write
-
-    steps:
-      - name: Checking out
-        uses: actions/checkout@v4
-      - name: Publish
-        id: publish
-        uses: actions/publish-immutable-action@0.0.3

.licenses/npm/undici.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: undici
-version: 5.28.4
+version: 5.28.3
 type: npm
 summary: An HTTP/1.1 client, written from scratch for Node.js
 homepage: https://undici.nodejs.org

README.md

@@ -108,8 +108,6 @@ Currently, the following distributions are supported:
 | `semeru` | IBM Semeru Runtime Open Edition | [Link](https://developer.ibm.com/languages/java/semeru-runtimes/downloads/) | [Link](https://openjdk.java.net/legal/gplv2+ce.html) |
 | `oracle` | Oracle JDK | [Link](https://www.oracle.com/java/technologies/downloads/) | [Link](https://java.com/freeuselicense)
 | `dragonwell` | Alibaba Dragonwell JDK | [Link](https://dragonwell-jdk.io/) | [Link](https://www.aliyun.com/product/dragonwell/)
-| `sapmachine` | SAP SapMachine JDK/JRE | [Link](https://sapmachine.io/) | [Link](https://github.com/SAP/SapMachine/blob/sapmachine/LICENSE)
-| `graalvm` | Oracle GraalVM | [Link](https://www.graalvm.org/) | [Link](https://www.oracle.com/downloads/licenses/graal-free-license.html)
 
 **NOTE:** The different distributors can provide discrepant list of available versions / supported configurations. Please refer to the official documentation to see the list of supported versions.
 
@@ -259,8 +257,6 @@ In the example above multiple JDKs are installed for the same job. The result af
   - [Amazon Corretto](docs/advanced-usage.md#Amazon-Corretto)
   - [Oracle](docs/advanced-usage.md#Oracle)
   - [Alibaba Dragonwell](docs/advanced-usage.md#Alibaba-Dragonwell)
-  - [SapMachine](docs/advanced-usage.md#SapMachine)
-  - [GraalVM](docs/advanced-usage.md#GraalVM)
 - [Installing custom Java package type](docs/advanced-usage.md#Installing-custom-Java-package-type)
 - [Installing custom Java architecture](docs/advanced-usage.md#Installing-custom-Java-architecture)
 - [Installing custom Java distribution from local file](docs/advanced-usage.md#Installing-Java-from-local-file)

__tests__/data/dragonwell.json

@@ -481,54 +481,6 @@
           }
         }
       }
-    },
-    "11.0.23.20.9" : {
-      "alpine-linux" : {
-        "x64" : {
-          "Extended" : {
-            "sha256" : "9d61fefb4f1a8368f8e7eec17893934b438b67f360cb8b7ef727ab459695d14e",
-            "name" : "Alibaba_Dragonwell_Extended_11.0.23.20.9_x64_alpine-linux.tar.gz",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell11/releases/download/dragonwell-extended-11.0.23.20_jdk-11.0.23-ga/Alibaba_Dragonwell_Extended_11.0.23.20.9_x64_alpine-linux.tar.gz"
-          }
-        }
-      },
-      "linux" : {
-        "aarch64" : {
-          "Extended" : {
-            "sha256" : "2f399231644fe1e3f1b4b5298e85f21f4863017767e9e5afb00ee46e2d7780d9",
-            "name" : "Alibaba_Dragonwell_Extended_11.0.23.20.9_aarch64_linux.tar.gz",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell11/releases/download/dragonwell-extended-11.0.23.20_jdk-11.0.23-ga/Alibaba_Dragonwell_Extended_11.0.23.20.9_aarch64_linux.tar.gz"
-          }
-        },
-        "x64" : {
-          "Extended" : {
-            "sha256" : "662dfdc584e21bcfb7ed87942b5bb4e71a7b7467d4c82211a3615d0834d1c833",
-            "name" : "Alibaba_Dragonwell_Extended_11.0.23.20.9_x64_linux.tar.gz",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell11/releases/download/dragonwell-extended-11.0.23.20_jdk-11.0.23-ga/Alibaba_Dragonwell_Extended_11.0.23.20.9_x64_linux.tar.gz"
-          }
-        },
-        "riscv" : {
-          "Extended" : {
-            "sha256" : "f3488461cbfd95e6c08ad2dc01c51950b9c629c46eea6305002311b263ce2ad9",
-            "name" : "Alibaba_Dragonwell_Extended_11.0.23.20.9_riscv64_linux.tar.gz",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell11/releases/download/dragonwell-extended-11.0.23.20_jdk-11.0.23-ga/Alibaba_Dragonwell_Extended_11.0.23.20.9_riscv64_linux.tar.gz"
-          }
-        }
-      },
-      "windows" : {
-        "x64" : {
-          "Extended" : {
-            "sha256" : "ba8dba2b7f2279f87220f396afcce49cb26482705deb5144c6e22a90ba443f9d",
-            "name" : "Alibaba_Dragonwell_Extended_11.0.23.20.9_x64_windows.zip",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell11/releases/download/dragonwell-extended-11.0.23.20_jdk-11.0.23-ga/Alibaba_Dragonwell_Extended_11.0.23.20.9_x64_windows.zip"
-          }
-        }
-      }
     }
   },
   "17":{
@@ -1182,143 +1134,5 @@
         }
       }
     }
-  },
-  "21" : {
-    "21.0.3.0.3.9" : {
-      "alpine-linux" : {
-        "x64" : {
-          "Standard" : {
-            "sha256" : "c3c5d193a0a6aee8757fd3036dc13b7921a4306b089bf8759ba6b822d1e8416e",
-            "name" : "Alibaba_Dragonwell_Standard_21.0.3.0.3.9_x64_alpine-linux.tar.gz",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell21/releases/download/dragonwell-standard-21.0.3.0.3%2B9_jdk-21.0.3-ga/Alibaba_Dragonwell_Standard_21.0.3.0.3.9_x64_alpine-linux.tar.gz"
-          }
-        }
-      },
-      "linux" : {
-        "aarch64" : {
-          "Standard" : {
-            "sha256" : "3cc309627ad2a9515ca50cdeff9eff118f14326b37eaa536b758570082aeb242",
-            "name" : "Alibaba_Dragonwell_Standard_21.0.3.0.3.9_aarch64_linux.tar.gz",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell21/releases/download/dragonwell-standard-21.0.3.0.3%2B9_jdk-21.0.3-ga/Alibaba_Dragonwell_Standard_21.0.3.0.3.9_aarch64_linux.tar.gz"
-          }
-        },
-        "x64" : {
-          "Standard" : {
-            "sha256" : "1c0508db048c0b50e2d61b2cc5a5390d3b9bcafec6e185d2cb53dde1fc530203",
-            "name" : "Alibaba_Dragonwell_Standard_21.0.3.0.3.9_x64_linux.tar.gz",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell21/releases/download/dragonwell-standard-21.0.3.0.3%2B9_jdk-21.0.3-ga/Alibaba_Dragonwell_Standard_21.0.3.0.3.9_x64_linux.tar.gz"
-          }
-        },
-        "riscv" : {
-          "Standard" : {
-            "sha256" : "e374698f8ee9c66b8d4a59ba50d0511aa654b55514732bc787e29c9afaddf846",
-            "name" : "Alibaba_Dragonwell_Standard_21.0.3.0.3.9_riscv64_linux.tar.gz",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell21/releases/download/dragonwell-standard-21.0.3.0.3%2B9_jdk-21.0.3-ga/Alibaba_Dragonwell_Standard_21.0.3.0.3.9_riscv64_linux.tar.gz"
-          }
-        }
-      },
-      "windows" : {
-        "x64" : {
-          "Standard" : {
-            "sha256" : "0b75fc888cb2a9c7e050132fd020c30cbe65f3179feb36812a7c6be3c76ad277",
-            "name" : "Alibaba_Dragonwell_Standard_21.0.3.0.3.9_x64_windows.zip",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell21/releases/download/dragonwell-standard-21.0.3.0.3%2B9_jdk-21.0.3-ga/Alibaba_Dragonwell_Standard_21.0.3.0.3.9_x64_windows.zip"
-          }
-        }
-      }
-    },
-    "21.0.2.0.2.13" : {
-      "alpine-linux" : {
-        "x64" : {
-          "Standard" : {
-            "sha256" : "71a391987fdd569385c0afe1aaf16dbd48d127e14306793ef9ac0e0986b9632c",
-            "name" : "Alibaba_Dragonwell_Standard_21.0.2.0.2.13_x64_alpine-linux.tar.gz",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell21/releases/download/dragonwell-standard-21.0.2.0.2%2B13_jdk-21.0.2-ga/Alibaba_Dragonwell_Standard_21.0.2.0.2.13_x64_alpine-linux.tar.gz"
-          }
-        }
-      },
-      "linux" : {
-        "aarch64" : {
-          "Standard" : {
-            "sha256" : "307321a399c206f8d56e0ce5c65921f9448ec9882dfb81ffc5e841b8fb5f8ed8",
-            "name" : "Alibaba_Dragonwell_Standard_21.0.2.0.2.13_aarch64_linux.tar.gz",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell21/releases/download/dragonwell-standard-21.0.2.0.2%2B13_jdk-21.0.2-ga/Alibaba_Dragonwell_Standard_21.0.2.0.2.13_aarch64_linux.tar.gz"
-          }
-        },
-        "x64" : {
-          "Standard" : {
-            "sha256" : "24198f0d436bb913b152181e07205647b05da01c196f5c10a96e9a998b10381a",
-            "name" : "Alibaba_Dragonwell_Standard_21.0.2.0.2.13_x64_linux.tar.gz",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell21/releases/download/dragonwell-standard-21.0.2.0.2%2B13_jdk-21.0.2-ga/Alibaba_Dragonwell_Standard_21.0.2.0.2.13_x64_linux.tar.gz"
-          }
-        },
-        "riscv" : {
-          "Standard" : {
-            "sha256" : "970a49103b8971952e46c81be844bc3776caca04da8456337f12e3a7d2a18011",
-            "name" : "Alibaba_Dragonwell_Standard_21.0.2.0.2.13_riscv64_linux.tar.gz",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell21/releases/download/dragonwell-standard-21.0.2.0.2%2B13_jdk-21.0.2-ga/Alibaba_Dragonwell_Standard_21.0.2.0.2.13_riscv64_linux.tar.gz"
-          }
-        }
-      },
-      "windows" : {
-        "x64" : {
-          "Standard" : {
-            "sha256" : "b77de54be5ef1595fc568f6f18fbd4b61d64d99a0c9c5ef78a84018b4f82032b",
-            "name" : "Alibaba_Dragonwell_Standard_21.0.2.0.2.13_x64_windows.zip",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell21/releases/download/dragonwell-standard-21.0.2.0.2%2B13_jdk-21.0.2-ga/Alibaba_Dragonwell_Standard_21.0.2.0.2.13_x64_windows.zip"
-          }
-        }
-      }
-    },
-    "21.0.1.0.1.12" : {
-      "alpine-linux" : {
-        "x64" : {
-          "Standard" : {
-            "sha256" : "b9cea58bffe555484b831ff6d7cdb277c07e86a76d32b373ec35fa21ecb5fdc9",
-            "name" : "Alibaba_Dragonwell_Standard_21.0.1.0.1.12_x64_alpine-linux.tar.gz",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell21/releases/download/dragonwell-standard-21.0.1.0.1%2B12_jdk-21.0.1-ga/Alibaba_Dragonwell_Standard_21.0.1.0.1.12_x64_alpine-linux.tar.gz"
-          }
-        }
-      },
-      "linux" : {
-        "aarch64" : {
-          "Standard" : {
-            "sha256" : "d36cef494ccc1939c6b5da04133cfdbe0b03956fd04147aef46014536bc5a37b",
-            "name" : "Alibaba_Dragonwell_Standard_21.0.1.0.1.12_aarch64_linux.tar.gz",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell21/releases/download/dragonwell-standard-21.0.1.0.1%2B12_jdk-21.0.1-ga/Alibaba_Dragonwell_Standard_21.0.1.0.1.12_aarch64_linux.tar.gz"
-          }
-        },
-        "x64" : {
-          "Standard" : {
-            "sha256" : "dfb8d325a98b8f577d72fd639cc54feee325eec8ebba497868184c8405a1cf41",
-            "name" : "Alibaba_Dragonwell_Standard_21.0.1.0.1.12_x64_linux.tar.gz",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell21/releases/download/dragonwell-standard-21.0.1.0.1%2B12_jdk-21.0.1-ga/Alibaba_Dragonwell_Standard_21.0.1.0.1.12_x64_linux.tar.gz"
-          }
-        }
-      },
-      "windows" : {
-        "x64" : {
-          "Standard" : {
-            "sha256" : "b8ab99ed9060341f75edb8cc238830fbfd608e51536e43f34bd45c3e968ebab5",
-            "name" : "Alibaba_Dragonwell_Standard_21.0.1.0.1.12_x64_windows.zip",
-            "content_type" : "application/zip",
-            "download_url" : "https://github.com/dragonwell-project/dragonwell21/releases/download/dragonwell-standard-21.0.1.0.1%2B12_jdk-21.0.1-ga/Alibaba_Dragonwell_Standard_21.0.1.0.1.12_x64_windows.zip"
-          }
-        }
-      }
-    }
   }
 }

__tests__/distributors/dragonwell-installer.test.ts

@@ -41,16 +41,15 @@ describe('getAvailableVersions', () => {
   describe('getAvailableVersions', () => {
     it.each([
       ['8', 'x86', 'linux', 0],
-      ['8', 'aarch64', 'linux', 28],
+      ['8', 'aarch64', 'linux', 24],
-      ['8.6.6', 'x64', 'linux', 31],
+      ['8.6.6', 'x64', 'linux', 27],
       ['8', 'x86', 'anolis', 0],
       ['8', 'x86', 'windows', 0],
       ['8', 'x86', 'mac', 0],
-      ['11', 'x64', 'linux', 31],
+      ['11', 'x64', 'linux', 27],
-      ['11', 'aarch64', 'linux', 28],
+      ['11', 'aarch64', 'linux', 24],
-      ['17', 'riscv', 'linux', 3],
+      ['17', 'riscv', 'linux', 0],
-      ['16.0.1', 'x64', 'linux', 31],
+      ['16.0.1', 'x64', 'linux', 27]
-      ['21', 'x64', 'linux', 31]
     ])(
       'should get right number of available versions from JSON',
       async (
@@ -104,31 +103,25 @@ describe('getAvailableVersions', () => {
         '11',
         'linux',
         'x64',
-        'https://github.com/dragonwell-project/dragonwell11/releases/download/dragonwell-extended-11.0.23.20_jdk-11.0.23-ga/Alibaba_Dragonwell_Extended_11.0.23.20.9_x64_linux.tar.gz'
+        'https://github.com/alibaba/dragonwell11/releases/download/dragonwell-extended-11.0.17.13_jdk-11.0.17-ga/Alibaba_Dragonwell_Extended_11.0.17.13.8_x64_linux.tar.gz'
       ],
       [
         '11',
         'linux',
         'aarch64',
-        'https://github.com/dragonwell-project/dragonwell11/releases/download/dragonwell-extended-11.0.23.20_jdk-11.0.23-ga/Alibaba_Dragonwell_Extended_11.0.23.20.9_aarch64_linux.tar.gz'
+        'https://github.com/alibaba/dragonwell11/releases/download/dragonwell-extended-11.0.17.13_jdk-11.0.17-ga/Alibaba_Dragonwell_Extended_11.0.17.13.8_aarch64_linux.tar.gz'
-      ],
-      [
-        '11',
-        'linux',
-        'riscv',
-        'https://github.com/dragonwell-project/dragonwell11/releases/download/dragonwell-extended-11.0.23.20_jdk-11.0.23-ga/Alibaba_Dragonwell_Extended_11.0.23.20.9_riscv64_linux.tar.gz'
       ],
       [
         '11',
         'windows',
         'x64',
-        'https://github.com/dragonwell-project/dragonwell11/releases/download/dragonwell-extended-11.0.23.20_jdk-11.0.23-ga/Alibaba_Dragonwell_Extended_11.0.23.20.9_x64_windows.zip'
+        'https://github.com/alibaba/dragonwell11/releases/download/dragonwell-extended-11.0.17.13_jdk-11.0.17-ga/Alibaba_Dragonwell_Extended_11.0.17.13.8_x64_windows.zip'
       ],
       [
         '11',
         'alpine-linux',
         'x64',
-        'https://github.com/dragonwell-project/dragonwell11/releases/download/dragonwell-extended-11.0.23.20_jdk-11.0.23-ga/Alibaba_Dragonwell_Extended_11.0.23.20.9_x64_alpine-linux.tar.gz'
+        'https://github.com/alibaba/dragonwell11/releases/download/dragonwell-extended-11.0.17.13_jdk-11.0.17-ga/Alibaba_Dragonwell_Extended_11.0.17.13.8_x64_alpine-linux.tar.gz'
       ],
       [
         '11.0.17',
@@ -165,30 +158,6 @@ describe('getAvailableVersions', () => {
         'linux',
         'x64',
         'https://github.com/alibaba/dragonwell17/releases/download/dragonwell-standard-17.0.4.0.4%2B8_jdk-17.0.4-ga/Alibaba_Dragonwell_Standard_17.0.4.0.4%2B8_x64_linux.tar.gz'
-      ],
-      [
-        '17.0.4+8',
-        'linux',
-        'x64',
-        'https://github.com/alibaba/dragonwell17/releases/download/dragonwell-standard-17.0.4.0.4%2B8_jdk-17.0.4-ga/Alibaba_Dragonwell_Standard_17.0.4.0.4%2B8_x64_linux.tar.gz'
-      ],
-      [
-        '21',
-        'linux',
-        'aarch64',
-        'https://github.com/dragonwell-project/dragonwell21/releases/download/dragonwell-standard-21.0.3.0.3%2B9_jdk-21.0.3-ga/Alibaba_Dragonwell_Standard_21.0.3.0.3.9_aarch64_linux.tar.gz'
-      ],
-      [
-        '21.0.3+9',
-        'linux',
-        'riscv',
-        'https://github.com/dragonwell-project/dragonwell21/releases/download/dragonwell-standard-21.0.3.0.3%2B9_jdk-21.0.3-ga/Alibaba_Dragonwell_Standard_21.0.3.0.3.9_riscv64_linux.tar.gz'
-      ],
-      [
-        '21.0.1+12',
-        'linux',
-        'x64',
-        'https://github.com/dragonwell-project/dragonwell21/releases/download/dragonwell-standard-21.0.1.0.1%2B12_jdk-21.0.1-ga/Alibaba_Dragonwell_Standard_21.0.1.0.1.12_x64_linux.tar.gz'
       ]
     ])(
       'should return proper link according to the specified java-version, platform and arch',

__tests__/distributors/graalvm-installer.test.ts

@@ -1,152 +0,0 @@
-import {GraalVMDistribution} from '../../src/distributions/graalvm/installer';
-import os from 'os';
-import * as core from '@actions/core';
-import {getDownloadArchiveExtension} from '../../src/util';
-import {HttpClient} from '@actions/http-client';
-
-describe('findPackageForDownload', () => {
-  let distribution: GraalVMDistribution;
-  let spyDebug: jest.SpyInstance;
-  let spyHttpClient: jest.SpyInstance;
-
-  beforeEach(() => {
-    distribution = new GraalVMDistribution({
-      version: '',
-      architecture: 'x64',
-      packageType: 'jdk',
-      checkLatest: false
-    });
-
-    spyDebug = jest.spyOn(core, 'debug');
-    spyDebug.mockImplementation(() => {});
-  });
-
-  it.each([
-    [
-      '21',
-      '21',
-      'https://download.oracle.com/graalvm/21/latest/graalvm-jdk-21_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
-    ],
-    [
-      '21.0.4',
-      '21.0.4',
-      'https://download.oracle.com/graalvm/21/archive/graalvm-jdk-21.0.4_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
-    ],
-    [
-      '17',
-      '17',
-      'https://download.oracle.com/graalvm/17/latest/graalvm-jdk-17_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
-    ],
-    [
-      '17.0.12',
-      '17.0.12',
-      'https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.12_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
-    ]
-  ])('version is %s -> %s', async (input, expectedVersion, expectedUrl) => {
-    /* Needed only for this particular test because /latest/ urls tend to change */
-    spyHttpClient = jest.spyOn(HttpClient.prototype, 'head');
-    spyHttpClient.mockReturnValue(
-      Promise.resolve({
-        message: {
-          statusCode: 200
-        }
-      })
-    );
-
-    const result = await distribution['findPackageForDownload'](input);
-
-    jest.restoreAllMocks();
-
-    expect(result.version).toBe(expectedVersion);
-    const osType = distribution.getPlatform();
-    const archiveType = getDownloadArchiveExtension();
-    const url = expectedUrl
-      .replace('{{OS_TYPE}}', osType)
-      .replace('{{ARCHIVE_TYPE}}', archiveType);
-    expect(result.url).toBe(url);
-  });
-
-  it.each([
-    [
-      '24-ea',
-      /^https:\/\/github\.com\/graalvm\/oracle-graalvm-ea-builds\/releases\/download\/jdk-24\.0\.0-ea\./
-    ]
-  ])('version is %s -> %s', async (version, expectedUrlPrefix) => {
-    /* Needed only for this particular test because /latest/ urls tend to change */
-    spyHttpClient = jest.spyOn(HttpClient.prototype, 'head');
-    spyHttpClient.mockReturnValue(
-      Promise.resolve({
-        message: {
-          statusCode: 200
-        }
-      })
-    );
-
-    const eaDistro = new GraalVMDistribution({
-      version,
-      architecture: '', // to get default value
-      packageType: 'jdk',
-      checkLatest: false
-    });
-
-    const versionWithoutEA = version.split('-')[0];
-    const result = await eaDistro['findPackageForDownload'](versionWithoutEA);
-
-    jest.restoreAllMocks();
-
-    expect(result.url).toEqual(expect.stringMatching(expectedUrlPrefix));
-  });
-
-  it.each([
-    ['amd64', 'x64'],
-    ['arm64', 'aarch64']
-  ])(
-    'defaults to os.arch(): %s mapped to distro arch: %s',
-    async (osArch: string, distroArch: string) => {
-      jest.spyOn(os, 'arch').mockReturnValue(osArch);
-      jest.spyOn(os, 'platform').mockReturnValue('linux');
-
-      const version = '21';
-      const distro = new GraalVMDistribution({
-        version,
-        architecture: '', // to get default value
-        packageType: 'jdk',
-        checkLatest: false
-      });
-
-      const osType = distribution.getPlatform();
-      if (osType === 'windows' && distroArch == 'aarch64') {
-        return; // skip, aarch64 is not available for Windows
-      }
-      const archiveType = getDownloadArchiveExtension();
-      const result = await distro['findPackageForDownload'](version);
-      const expectedUrl = `https://download.oracle.com/graalvm/21/latest/graalvm-jdk-21_${osType}-${distroArch}_bin.${archiveType}`;
-
-      expect(result.url).toBe(expectedUrl);
-    }
-  );
-
-  it('should throw an error', async () => {
-    await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
-      /GraalVM is only supported for JDK 17 and later/
-    );
-    await expect(distribution['findPackageForDownload']('11')).rejects.toThrow(
-      /GraalVM is only supported for JDK 17 and later/
-    );
-    await expect(distribution['findPackageForDownload']('18')).rejects.toThrow(
-      /Could not find GraalVM for SemVer */
-    );
-
-    const unavailableEADistro = new GraalVMDistribution({
-      version: '17-ea',
-      architecture: '', // to get default value
-      packageType: 'jdk',
-      checkLatest: false
-    });
-    await expect(
-      unavailableEADistro['findPackageForDownload']('17')
-    ).rejects.toThrow(
-      /No GraalVM EA build found\. Are you sure java-version: '17-ea' is correct\?/
-    );
-  });
-});

__tests__/distributors/oracle-installer.test.ts

@@ -115,8 +115,7 @@ describe('findPackageForDownload', () => {
       const expectedUrl = `https://download.oracle.com/java/18/archive/jdk-18_${osType}-${distroArch}_bin.${archiveType}`;
 
       expect(result.url).toBe(expectedUrl);
-    },
+    }
-    10000
   );
 
   it('should throw an error', async () => {

__tests__/distributors/sapmachine-installer.test.ts

@@ -1,294 +0,0 @@
-import {HttpClient} from '@actions/http-client';
-import {SapMachineDistribution} from '../../src/distributions/sapmachine/installer';
-import * as utils from '../../src/util';
-
-import manifestData from '../data/sapmachine.json';
-
-describe('getAvailableVersions', () => {
-  let spyHttpClient: jest.SpyInstance;
-  let spyUtilGetDownloadArchiveExtension: jest.SpyInstance;
-
-  beforeEach(() => {
-    spyHttpClient = jest.spyOn(HttpClient.prototype, 'getJson');
-    spyHttpClient.mockReturnValue({
-      statusCode: 200,
-      headers: {},
-      result: manifestData
-    });
-
-    spyUtilGetDownloadArchiveExtension = jest.spyOn(
-      utils,
-      'getDownloadArchiveExtension'
-    );
-    spyUtilGetDownloadArchiveExtension.mockReturnValue('tar.gz');
-  });
-
-  afterEach(() => {
-    jest.resetAllMocks();
-    jest.clearAllMocks();
-    jest.restoreAllMocks();
-  });
-
-  const mockPlatform = (
-    distribution: SapMachineDistribution,
-    platform: string
-  ) => {
-    distribution['getPlatformOption'] = () => platform;
-    const mockedExtension = platform == 'windows' ? 'zip' : 'tar.gz';
-    spyUtilGetDownloadArchiveExtension.mockReturnValue(mockedExtension);
-  };
-
-  describe('shouldFallbackToBackupUrl', () => {
-    it('should return correct release when the primary URL is not available', async () => {
-      spyHttpClient.mockReturnValueOnce({
-        statusCode: 404,
-        headers: {},
-        result: ''
-      });
-      spyHttpClient.mockReturnValueOnce({
-        statusCode: 200,
-        headers: {},
-        result: manifestData
-      });
-
-      const version = '17';
-      const distribution = new SapMachineDistribution({
-        version: version,
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      });
-
-      mockPlatform(distribution, 'linux');
-
-      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'
-      );
-    });
-  });
-
-  describe('getAvailableVersions', () => {
-    it.each([
-      ['11', 'x64', 'linux', 71],
-      ['11', 'aarch64', 'linux', 54],
-      ['17', 'riscv', 'linux', 0],
-      ['16.0.1', 'x64', 'linux', 71],
-      ['23-ea', 'x64', 'linux', 798],
-      ['23-ea', 'aarch64', 'windows', 0],
-      ['23-ea', 'x64', 'windows', 750]
-    ])(
-      'should get right number of available versions from JSON',
-      async (
-        jdkVersion: string,
-        arch: string,
-        platform: string,
-        len: number
-      ) => {
-        const distribution = new SapMachineDistribution({
-          version: jdkVersion,
-          architecture: arch,
-          packageType: 'jdk',
-          checkLatest: false
-        });
-        mockPlatform(distribution, platform);
-
-        const availableVersions = await distribution['getAvailableVersions']();
-        expect(availableVersions).not.toBeNull();
-        expect(availableVersions.length).toBe(len);
-      }
-    );
-  });
-
-  describe('findPackageForDownload', () => {
-    it.each([
-      [
-        '11',
-        'linux',
-        'x64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.22/sapmachine-jdk-11.0.22_linux-x64_bin.tar.gz'
-      ],
-      [
-        '11',
-        'linux',
-        'aarch64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.22/sapmachine-jdk-11.0.22_linux-aarch64_bin.tar.gz'
-      ],
-      [
-        '11',
-        'windows',
-        'x64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.22/sapmachine-jdk-11.0.22_windows-x64_bin.zip'
-      ],
-      [
-        '11.0.17',
-        'linux',
-        'x64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.17/sapmachine-jdk-11.0.17_linux-x64_bin.tar.gz'
-      ],
-      [
-        '17',
-        'linux',
-        'x64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.10/sapmachine-jdk-17.0.10_linux-x64_bin.tar.gz'
-      ],
-      [
-        '17',
-        'linux',
-        'aarch64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.10/sapmachine-jdk-17.0.10_linux-aarch64_bin.tar.gz'
-      ],
-      [
-        '17',
-        'windows',
-        'x64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.10/sapmachine-jdk-17.0.10_windows-x64_bin.zip'
-      ],
-      [
-        '17.0.4',
-        'linux',
-        'x64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.4.1/sapmachine-jdk-17.0.4.1_linux-x64_bin.tar.gz'
-      ],
-      [
-        '17',
-        'linux',
-        'x64',
-        'jre',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.10/sapmachine-jre-17.0.10_linux-x64_bin.tar.gz'
-      ],
-      [
-        '17',
-        'linux',
-        'aarch64',
-        'jre',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.10/sapmachine-jre-17.0.10_linux-aarch64_bin.tar.gz'
-      ],
-      [
-        '17',
-        'windows',
-        'x64',
-        'jre',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.10/sapmachine-jre-17.0.10_windows-x64_bin.zip'
-      ],
-      [
-        '17.0.4',
-        'linux',
-        'x64',
-        'jre',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.4.1/sapmachine-jre-17.0.4.1_linux-x64_bin.tar.gz'
-      ],
-      [
-        '23-ea',
-        'linux',
-        'x64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-23%2B15/sapmachine-jdk-23-ea.15_linux-x64_bin.tar.gz',
-        '23'
-      ],
-      [
-        '21.0.2+2-ea',
-        'linux',
-        'x64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.2%2B2/sapmachine-jdk-21.0.2-ea.2_linux-x64_bin.tar.gz',
-        '21.0.2+2'
-      ],
-      [
-        '17',
-        'linux-musl',
-        'x64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.10/sapmachine-jdk-17.0.10_linux-x64-musl_bin.tar.gz'
-      ]
-    ])(
-      'should return proper link according to the specified java-version, platform and arch',
-      async (
-        version: string,
-        platform: string,
-        arch: string,
-        packageType: string,
-        expectedLink: string,
-        normalizedVersion: string = version
-      ) => {
-        const distribution = new SapMachineDistribution({
-          version: version,
-          architecture: arch,
-          packageType: packageType,
-          checkLatest: false
-        });
-        mockPlatform(distribution, platform);
-
-        const availableVersion = await distribution['findPackageForDownload'](
-          normalizedVersion
-        );
-        expect(availableVersion).not.toBeNull();
-        expect(availableVersion.url).toBe(expectedLink);
-      }
-    );
-
-    it.each([
-      ['8', 'linux', 'x64'],
-      ['8', 'macos', 'aarch64'],
-      ['23', 'macos', 'aarch64'],
-      ['17', 'linux', 'riscv'],
-      ['23', 'linux', 'x64'],
-      ['25-ea', 'linux', 'x64', '25'],
-      ['8-ea', 'linux', 'x64', '8'],
-      ['21.0.3+7', 'linux', 'x64', '21.0.3+7'],
-      ['21.0.3+8-ea', 'linux', 'x64', '21.0.3+8'],
-      ['17', 'linux-muse', 'aarch64']
-    ])(
-      'should throw when required version of JDK can not be found in the JSON',
-      async (
-        version: string,
-        platform: string,
-        arch: string,
-        normalizedVersion: string = version
-      ) => {
-        const distribution = new SapMachineDistribution({
-          version: version,
-          architecture: arch,
-          packageType: 'jdk',
-          checkLatest: false
-        });
-        mockPlatform(distribution, platform);
-
-        await expect(
-          distribution['findPackageForDownload'](normalizedVersion)
-        ).rejects.toThrow(
-          `Couldn't find any satisfied version for the specified java-version: "${normalizedVersion}" and architecture: "${arch}".`
-        );
-      }
-    );
-
-    it('should throw when required package type is not supported', async () => {
-      const jdkVersion = '17';
-      const arch = 'x64';
-      const platform = 'linux';
-      const distribution = new SapMachineDistribution({
-        version: jdkVersion,
-        architecture: arch,
-        packageType: 'jdk+fx',
-        checkLatest: false
-      });
-      mockPlatform(distribution, platform);
-      await expect(
-        distribution['findPackageForDownload'](jdkVersion)
-      ).rejects.toThrow(
-        'SapMachine provides only the `jdk` and `jre` package type'
-      );
-    });
-  });
-});

__tests__/distributors/semeru-installer.test.ts

@@ -207,7 +207,7 @@ describe('findPackageForDownload', () => {
       });
       distribution['getAvailableVersions'] = async () => [];
       await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
-        `Unsupported architecture for IBM Semeru: ${arch} for your current OS version, the following are supported: x64, x86, ppc64le, ppc64, s390x, aarch64`
+        `Unsupported architecture for IBM Semeru: ${arch}, the following are supported: x64, x86, ppc64le, ppc64, s390x, aarch64`
       );
     }
   );

dist/cleanup/index.js

@@ -66943,132 +66943,6 @@ function onConnectTimeout (socket) {
 module.exports = buildConnector
 
 
-/***/ }),
-
-/***/ 4462:
-/***/ ((module) => {
-
-"use strict";
-
-
-/** @type {Record<string, string | undefined>} */
-const headerNameLowerCasedRecord = {}
-
-// https://developer.mozilla.org/docs/Web/HTTP/Headers
-const wellknownHeaderNames = [
-  'Accept',
-  'Accept-Encoding',
-  'Accept-Language',
-  'Accept-Ranges',
-  'Access-Control-Allow-Credentials',
-  'Access-Control-Allow-Headers',
-  'Access-Control-Allow-Methods',
-  'Access-Control-Allow-Origin',
-  'Access-Control-Expose-Headers',
-  'Access-Control-Max-Age',
-  'Access-Control-Request-Headers',
-  'Access-Control-Request-Method',
-  'Age',
-  'Allow',
-  'Alt-Svc',
-  'Alt-Used',
-  'Authorization',
-  'Cache-Control',
-  'Clear-Site-Data',
-  'Connection',
-  'Content-Disposition',
-  'Content-Encoding',
-  'Content-Language',
-  'Content-Length',
-  'Content-Location',
-  'Content-Range',
-  'Content-Security-Policy',
-  'Content-Security-Policy-Report-Only',
-  'Content-Type',
-  'Cookie',
-  'Cross-Origin-Embedder-Policy',
-  'Cross-Origin-Opener-Policy',
-  'Cross-Origin-Resource-Policy',
-  'Date',
-  'Device-Memory',
-  'Downlink',
-  'ECT',
-  'ETag',
-  'Expect',
-  'Expect-CT',
-  'Expires',
-  'Forwarded',
-  'From',
-  'Host',
-  'If-Match',
-  'If-Modified-Since',
-  'If-None-Match',
-  'If-Range',
-  'If-Unmodified-Since',
-  'Keep-Alive',
-  'Last-Modified',
-  'Link',
-  'Location',
-  'Max-Forwards',
-  'Origin',
-  'Permissions-Policy',
-  'Pragma',
-  'Proxy-Authenticate',
-  'Proxy-Authorization',
-  'RTT',
-  'Range',
-  'Referer',
-  'Referrer-Policy',
-  'Refresh',
-  'Retry-After',
-  'Sec-WebSocket-Accept',
-  'Sec-WebSocket-Extensions',
-  'Sec-WebSocket-Key',
-  'Sec-WebSocket-Protocol',
-  'Sec-WebSocket-Version',
-  'Server',
-  'Server-Timing',
-  'Service-Worker-Allowed',
-  'Service-Worker-Navigation-Preload',
-  'Set-Cookie',
-  'SourceMap',
-  'Strict-Transport-Security',
-  'Supports-Loading-Mode',
-  'TE',
-  'Timing-Allow-Origin',
-  'Trailer',
-  'Transfer-Encoding',
-  'Upgrade',
-  'Upgrade-Insecure-Requests',
-  'User-Agent',
-  'Vary',
-  'Via',
-  'WWW-Authenticate',
-  'X-Content-Type-Options',
-  'X-DNS-Prefetch-Control',
-  'X-Frame-Options',
-  'X-Permitted-Cross-Domain-Policies',
-  'X-Powered-By',
-  'X-Requested-With',
-  'X-XSS-Protection'
-]
-
-for (let i = 0; i < wellknownHeaderNames.length; ++i) {
-  const key = wellknownHeaderNames[i]
-  const lowerCasedKey = key.toLowerCase()
-  headerNameLowerCasedRecord[key] = headerNameLowerCasedRecord[lowerCasedKey] =
-    lowerCasedKey
-}
-
-// Note: object prototypes should not be able to be referenced. e.g. `Object#hasOwnProperty`.
-Object.setPrototypeOf(headerNameLowerCasedRecord, null)
-
-module.exports = {
-  wellknownHeaderNames,
-  headerNameLowerCasedRecord
-}
-
-
 /***/ }),
 
 /***/ 8045:
@@ -67901,7 +67775,6 @@ const { InvalidArgumentError } = __nccwpck_require__(8045)
 const { Blob } = __nccwpck_require__(4300)
 const nodeUtil = __nccwpck_require__(3837)
 const { stringify } = __nccwpck_require__(3477)
-const { headerNameLowerCasedRecord } = __nccwpck_require__(4462)
 
 const [nodeMajor, nodeMinor] = process.versions.node.split('.').map(v => Number(v))
 
@@ -68111,15 +67984,6 @@ function parseKeepAliveTimeout (val) {
   return m ? parseInt(m[1], 10) * 1000 : null
 }
 
-/**
- * Retrieves a header name and returns its lowercase value.
- * @param {string | Buffer} value Header name
- * @returns {string}
- */
-function headerNameToString (value) {
-  return headerNameLowerCasedRecord[value] || value.toLowerCase()
-}
-
 function parseHeaders (headers, obj = {}) {
   // For H2 support
   if (!Array.isArray(headers)) return headers
@@ -68391,7 +68255,6 @@ module.exports = {
   isIterable,
   isAsyncIterable,
   isDestroyed,
-  headerNameToString,
   parseRawHeaders,
   parseHeaders,
   parseKeepAliveTimeout,
@@ -75039,18 +74902,14 @@ const { isBlobLike, toUSVString, ReadableStreamFrom } = __nccwpck_require__(3983
 const assert = __nccwpck_require__(9491)
 const { isUint8Array } = __nccwpck_require__(9830)
 
-let supportedHashes = []
-
 // https://nodejs.org/api/crypto.html#determining-if-crypto-support-is-unavailable
 /** @type {import('crypto')|undefined} */
 let crypto
 
 try {
   crypto = __nccwpck_require__(6113)
-  const possibleRelevantHashes = ['sha256', 'sha384', 'sha512']
-  supportedHashes = crypto.getHashes().filter((hash) => possibleRelevantHashes.includes(hash))
-/* c8 ignore next 3 */
 } catch {
+
 }
 
 function responseURL (response) {
@@ -75578,56 +75437,66 @@ function bytesMatch (bytes, metadataList) {
     return true
   }
 
-  // 3. If response is not eligible for integrity validation, return false.
+  // 3. If parsedMetadata is the empty set, return true.
-  // TODO
-
-  // 4. If parsedMetadata is the empty set, return true.
   if (parsedMetadata.length === 0) {
     return true
   }
 
-  // 5. Let metadata be the result of getting the strongest
+  // 4. Let metadata be the result of getting the strongest
   //    metadata from parsedMetadata.
-  const strongest = getStrongestMetadata(parsedMetadata)
+  const list = parsedMetadata.sort((c, d) => d.algo.localeCompare(c.algo))
-  const metadata = filterMetadataListByAlgorithm(parsedMetadata, strongest)
+  // get the strongest algorithm
+  const strongest = list[0].algo
+  // get all entries that use the strongest algorithm; ignore weaker
+  const metadata = list.filter((item) => item.algo === strongest)
 
-  // 6. For each item in metadata:
+  // 5. For each item in metadata:
   for (const item of metadata) {
     // 1. Let algorithm be the alg component of item.
     const algorithm = item.algo
 
     // 2. Let expectedValue be the val component of item.
-    const expectedValue = item.hash
+    let expectedValue = item.hash
 
     // See https://github.com/web-platform-tests/wpt/commit/e4c5cc7a5e48093220528dfdd1c4012dc3837a0e
     // "be liberal with padding". This is annoying, and it's not even in the spec.
 
+    if (expectedValue.endsWith('==')) {
+      expectedValue = expectedValue.slice(0, -2)
+    }
+
     // 3. Let actualValue be the result of applying algorithm to bytes.
     let actualValue = crypto.createHash(algorithm).update(bytes).digest('base64')
 
-    if (actualValue[actualValue.length - 1] === '=') {
+    if (actualValue.endsWith('==')) {
-      if (actualValue[actualValue.length - 2] === '=') {
       actualValue = actualValue.slice(0, -2)
-      } else {
-        actualValue = actualValue.slice(0, -1)
-      }
     }
 
     // 4. If actualValue is a case-sensitive match for expectedValue,
     //    return true.
-    if (compareBase64Mixed(actualValue, expectedValue)) {
+    if (actualValue === expectedValue) {
+      return true
+    }
+
+    let actualBase64URL = crypto.createHash(algorithm).update(bytes).digest('base64url')
+
+    if (actualBase64URL.endsWith('==')) {
+      actualBase64URL = actualBase64URL.slice(0, -2)
+    }
+
+    if (actualBase64URL === expectedValue) {
       return true
     }
   }
 
-  // 7. Return false.
+  // 6. Return false.
   return false
 }
 
 // https://w3c.github.io/webappsec-subresource-integrity/#grammardef-hash-with-options
 // https://www.w3.org/TR/CSP2/#source-list-syntax
 // https://www.rfc-editor.org/rfc/rfc5234#appendix-B.1
-const parseHashWithOptions = /(?<algo>sha256|sha384|sha512)-((?<hash>[A-Za-z0-9+/]+|[A-Za-z0-9_-]+)={0,2}(?:\s|$)( +[!-~]*)?)?/i
+const parseHashWithOptions = /((?<algo>sha256|sha384|sha512)-(?<hash>[A-z0-9+/]{1}.*={0,2}))( +[\x21-\x7e]?)?/i
 
 /**
  * @see https://w3c.github.io/webappsec-subresource-integrity/#parse-metadata
@@ -75641,6 +75510,8 @@ function parseMetadata (metadata) {
   // 2. Let empty be equal to true.
   let empty = true
 
+  const supportedHashes = crypto.getHashes()
+
   // 3. For each token returned by splitting metadata on spaces:
   for (const token of metadata.split(' ')) {
     // 1. Set empty to false.
@@ -75650,11 +75521,7 @@ function parseMetadata (metadata) {
     const parsedToken = parseHashWithOptions.exec(token)
 
     // 3. If token does not parse, continue to the next token.
-    if (
+    if (parsedToken === null || parsedToken.groups === undefined) {
-      parsedToken === null ||
-      parsedToken.groups === undefined ||
-      parsedToken.groups.algo === undefined
-    ) {
       // Note: Chromium blocks the request at this point, but Firefox
       // gives a warning that an invalid integrity was given. The
       // correct behavior is to ignore these, and subsequently not
@@ -75663,11 +75530,11 @@ function parseMetadata (metadata) {
     }
 
     // 4. Let algorithm be the hash-algo component of token.
-    const algorithm = parsedToken.groups.algo.toLowerCase()
+    const algorithm = parsedToken.groups.algo
 
     // 5. If algorithm is a hash function recognized by the user
     //    agent, add the parsed token to result.
-    if (supportedHashes.includes(algorithm)) {
+    if (supportedHashes.includes(algorithm.toLowerCase())) {
       result.push(parsedToken.groups)
     }
   }
@@ -75680,82 +75547,6 @@ function parseMetadata (metadata) {
   return result
 }
 
-/**
- * @param {{ algo: 'sha256' | 'sha384' | 'sha512' }[]} metadataList
- */
-function getStrongestMetadata (metadataList) {
-  // Let algorithm be the algo component of the first item in metadataList.
-  // Can be sha256
-  let algorithm = metadataList[0].algo
-  // If the algorithm is sha512, then it is the strongest
-  // and we can return immediately
-  if (algorithm[3] === '5') {
-    return algorithm
-  }
-
-  for (let i = 1; i < metadataList.length; ++i) {
-    const metadata = metadataList[i]
-    // If the algorithm is sha512, then it is the strongest
-    // and we can break the loop immediately
-    if (metadata.algo[3] === '5') {
-      algorithm = 'sha512'
-      break
-    // If the algorithm is sha384, then a potential sha256 or sha384 is ignored
-    } else if (algorithm[3] === '3') {
-      continue
-    // algorithm is sha256, check if algorithm is sha384 and if so, set it as
-    // the strongest
-    } else if (metadata.algo[3] === '3') {
-      algorithm = 'sha384'
-    }
-  }
-  return algorithm
-}
-
-function filterMetadataListByAlgorithm (metadataList, algorithm) {
-  if (metadataList.length === 1) {
-    return metadataList
-  }
-
-  let pos = 0
-  for (let i = 0; i < metadataList.length; ++i) {
-    if (metadataList[i].algo === algorithm) {
-      metadataList[pos++] = metadataList[i]
-    }
-  }
-
-  metadataList.length = pos
-
-  return metadataList
-}
-
-/**
- * Compares two base64 strings, allowing for base64url
- * in the second string.
- *
-* @param {string} actualValue always base64
- * @param {string} expectedValue base64 or base64url
- * @returns {boolean}
- */
-function compareBase64Mixed (actualValue, expectedValue) {
-  if (actualValue.length !== expectedValue.length) {
-    return false
-  }
-  for (let i = 0; i < actualValue.length; ++i) {
-    if (actualValue[i] !== expectedValue[i]) {
-      if (
-        (actualValue[i] === '+' && expectedValue[i] === '-') ||
-        (actualValue[i] === '/' && expectedValue[i] === '_')
-      ) {
-        continue
-      }
-      return false
-    }
-  }
-
-  return true
-}
-
 // https://w3c.github.io/webappsec-upgrade-insecure-requests/#upgrade-request
 function tryUpgradeRequestToAPotentiallyTrustworthyURL (request) {
   // TODO
@@ -76171,8 +75962,7 @@ module.exports = {
   urlHasHttpsScheme,
   urlIsHttpHttpsScheme,
   readAllBytes,
-  normalizeMethodRecord,
+  normalizeMethodRecord
-  parseMetadata
 }
 
 
@@ -78259,17 +78049,12 @@ function parseLocation (statusCode, headers) {
 
 // https://tools.ietf.org/html/rfc7231#section-6.4.4
 function shouldRemoveHeader (header, removeContent, unknownOrigin) {
-  if (header.length === 4) {
+  return (
-    return util.headerNameToString(header) === 'host'
+    (header.length === 4 && header.toString().toLowerCase() === 'host') ||
-  }
+    (removeContent && header.toString().toLowerCase().indexOf('content-') === 0) ||
-  if (removeContent && util.headerNameToString(header).startsWith('content-')) {
+    (unknownOrigin && header.length === 13 && header.toString().toLowerCase() === 'authorization') ||
-    return true
+    (unknownOrigin && header.length === 6 && header.toString().toLowerCase() === 'cookie')
-  }
+  )
-  if (unknownOrigin && (header.length === 13 || header.length === 6 || header.length === 19)) {
-    const name = util.headerNameToString(header)
-    return name === 'authorization' || name === 'cookie' || name === 'proxy-authorization'
-  }
-  return false
 }
 
 // https://tools.ietf.org/html/rfc7231#section-6.4
@@ -88116,7 +87901,7 @@ function computeCacheKey(packageManager, cacheDependencyPath) {
         if (!fileHash) {
             throw new Error(`No file in ${process.cwd()} matched to [${pattern}], make sure you have checked out the target repository`);
         }
-        return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${process.arch}-${packageManager.id}-${fileHash}`;
+        return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${fileHash}`;
     });
 }
 /**

dist/setup/index.js

@@ -91797,132 +91797,6 @@ function onConnectTimeout (socket) {
 module.exports = buildConnector
 
 
-/***/ }),
-
-/***/ 14462:
-/***/ ((module) => {
-
-"use strict";
-
-
-/** @type {Record<string, string | undefined>} */
-const headerNameLowerCasedRecord = {}
-
-// https://developer.mozilla.org/docs/Web/HTTP/Headers
-const wellknownHeaderNames = [
-  'Accept',
-  'Accept-Encoding',
-  'Accept-Language',
-  'Accept-Ranges',
-  'Access-Control-Allow-Credentials',
-  'Access-Control-Allow-Headers',
-  'Access-Control-Allow-Methods',
-  'Access-Control-Allow-Origin',
-  'Access-Control-Expose-Headers',
-  'Access-Control-Max-Age',
-  'Access-Control-Request-Headers',
-  'Access-Control-Request-Method',
-  'Age',
-  'Allow',
-  'Alt-Svc',
-  'Alt-Used',
-  'Authorization',
-  'Cache-Control',
-  'Clear-Site-Data',
-  'Connection',
-  'Content-Disposition',
-  'Content-Encoding',
-  'Content-Language',
-  'Content-Length',
-  'Content-Location',
-  'Content-Range',
-  'Content-Security-Policy',
-  'Content-Security-Policy-Report-Only',
-  'Content-Type',
-  'Cookie',
-  'Cross-Origin-Embedder-Policy',
-  'Cross-Origin-Opener-Policy',
-  'Cross-Origin-Resource-Policy',
-  'Date',
-  'Device-Memory',
-  'Downlink',
-  'ECT',
-  'ETag',
-  'Expect',
-  'Expect-CT',
-  'Expires',
-  'Forwarded',
-  'From',
-  'Host',
-  'If-Match',
-  'If-Modified-Since',
-  'If-None-Match',
-  'If-Range',
-  'If-Unmodified-Since',
-  'Keep-Alive',
-  'Last-Modified',
-  'Link',
-  'Location',
-  'Max-Forwards',
-  'Origin',
-  'Permissions-Policy',
-  'Pragma',
-  'Proxy-Authenticate',
-  'Proxy-Authorization',
-  'RTT',
-  'Range',
-  'Referer',
-  'Referrer-Policy',
-  'Refresh',
-  'Retry-After',
-  'Sec-WebSocket-Accept',
-  'Sec-WebSocket-Extensions',
-  'Sec-WebSocket-Key',
-  'Sec-WebSocket-Protocol',
-  'Sec-WebSocket-Version',
-  'Server',
-  'Server-Timing',
-  'Service-Worker-Allowed',
-  'Service-Worker-Navigation-Preload',
-  'Set-Cookie',
-  'SourceMap',
-  'Strict-Transport-Security',
-  'Supports-Loading-Mode',
-  'TE',
-  'Timing-Allow-Origin',
-  'Trailer',
-  'Transfer-Encoding',
-  'Upgrade',
-  'Upgrade-Insecure-Requests',
-  'User-Agent',
-  'Vary',
-  'Via',
-  'WWW-Authenticate',
-  'X-Content-Type-Options',
-  'X-DNS-Prefetch-Control',
-  'X-Frame-Options',
-  'X-Permitted-Cross-Domain-Policies',
-  'X-Powered-By',
-  'X-Requested-With',
-  'X-XSS-Protection'
-]
-
-for (let i = 0; i < wellknownHeaderNames.length; ++i) {
-  const key = wellknownHeaderNames[i]
-  const lowerCasedKey = key.toLowerCase()
-  headerNameLowerCasedRecord[key] = headerNameLowerCasedRecord[lowerCasedKey] =
-    lowerCasedKey
-}
-
-// Note: object prototypes should not be able to be referenced. e.g. `Object#hasOwnProperty`.
-Object.setPrototypeOf(headerNameLowerCasedRecord, null)
-
-module.exports = {
-  wellknownHeaderNames,
-  headerNameLowerCasedRecord
-}
-
-
 /***/ }),
 
 /***/ 48045:
@@ -92755,7 +92629,6 @@ const { InvalidArgumentError } = __nccwpck_require__(48045)
 const { Blob } = __nccwpck_require__(14300)
 const nodeUtil = __nccwpck_require__(73837)
 const { stringify } = __nccwpck_require__(63477)
-const { headerNameLowerCasedRecord } = __nccwpck_require__(14462)
 
 const [nodeMajor, nodeMinor] = process.versions.node.split('.').map(v => Number(v))
 
@@ -92965,15 +92838,6 @@ function parseKeepAliveTimeout (val) {
   return m ? parseInt(m[1], 10) * 1000 : null
 }
 
-/**
- * Retrieves a header name and returns its lowercase value.
- * @param {string | Buffer} value Header name
- * @returns {string}
- */
-function headerNameToString (value) {
-  return headerNameLowerCasedRecord[value] || value.toLowerCase()
-}
-
 function parseHeaders (headers, obj = {}) {
   // For H2 support
   if (!Array.isArray(headers)) return headers
@@ -93245,7 +93109,6 @@ module.exports = {
   isIterable,
   isAsyncIterable,
   isDestroyed,
-  headerNameToString,
   parseRawHeaders,
   parseHeaders,
   parseKeepAliveTimeout,
@@ -99893,18 +99756,14 @@ const { isBlobLike, toUSVString, ReadableStreamFrom } = __nccwpck_require__(8398
 const assert = __nccwpck_require__(39491)
 const { isUint8Array } = __nccwpck_require__(29830)
 
-let supportedHashes = []
-
 // https://nodejs.org/api/crypto.html#determining-if-crypto-support-is-unavailable
 /** @type {import('crypto')|undefined} */
 let crypto
 
 try {
   crypto = __nccwpck_require__(6113)
-  const possibleRelevantHashes = ['sha256', 'sha384', 'sha512']
-  supportedHashes = crypto.getHashes().filter((hash) => possibleRelevantHashes.includes(hash))
-/* c8 ignore next 3 */
 } catch {
+
 }
 
 function responseURL (response) {
@@ -100432,56 +100291,66 @@ function bytesMatch (bytes, metadataList) {
     return true
   }
 
-  // 3. If response is not eligible for integrity validation, return false.
+  // 3. If parsedMetadata is the empty set, return true.
-  // TODO
-
-  // 4. If parsedMetadata is the empty set, return true.
   if (parsedMetadata.length === 0) {
     return true
   }
 
-  // 5. Let metadata be the result of getting the strongest
+  // 4. Let metadata be the result of getting the strongest
   //    metadata from parsedMetadata.
-  const strongest = getStrongestMetadata(parsedMetadata)
+  const list = parsedMetadata.sort((c, d) => d.algo.localeCompare(c.algo))
-  const metadata = filterMetadataListByAlgorithm(parsedMetadata, strongest)
+  // get the strongest algorithm
+  const strongest = list[0].algo
+  // get all entries that use the strongest algorithm; ignore weaker
+  const metadata = list.filter((item) => item.algo === strongest)
 
-  // 6. For each item in metadata:
+  // 5. For each item in metadata:
   for (const item of metadata) {
     // 1. Let algorithm be the alg component of item.
     const algorithm = item.algo
 
     // 2. Let expectedValue be the val component of item.
-    const expectedValue = item.hash
+    let expectedValue = item.hash
 
     // See https://github.com/web-platform-tests/wpt/commit/e4c5cc7a5e48093220528dfdd1c4012dc3837a0e
     // "be liberal with padding". This is annoying, and it's not even in the spec.
 
+    if (expectedValue.endsWith('==')) {
+      expectedValue = expectedValue.slice(0, -2)
+    }
+
     // 3. Let actualValue be the result of applying algorithm to bytes.
     let actualValue = crypto.createHash(algorithm).update(bytes).digest('base64')
 
-    if (actualValue[actualValue.length - 1] === '=') {
+    if (actualValue.endsWith('==')) {
-      if (actualValue[actualValue.length - 2] === '=') {
       actualValue = actualValue.slice(0, -2)
-      } else {
-        actualValue = actualValue.slice(0, -1)
-      }
     }
 
     // 4. If actualValue is a case-sensitive match for expectedValue,
     //    return true.
-    if (compareBase64Mixed(actualValue, expectedValue)) {
+    if (actualValue === expectedValue) {
+      return true
+    }
+
+    let actualBase64URL = crypto.createHash(algorithm).update(bytes).digest('base64url')
+
+    if (actualBase64URL.endsWith('==')) {
+      actualBase64URL = actualBase64URL.slice(0, -2)
+    }
+
+    if (actualBase64URL === expectedValue) {
       return true
     }
   }
 
-  // 7. Return false.
+  // 6. Return false.
   return false
 }
 
 // https://w3c.github.io/webappsec-subresource-integrity/#grammardef-hash-with-options
 // https://www.w3.org/TR/CSP2/#source-list-syntax
 // https://www.rfc-editor.org/rfc/rfc5234#appendix-B.1
-const parseHashWithOptions = /(?<algo>sha256|sha384|sha512)-((?<hash>[A-Za-z0-9+/]+|[A-Za-z0-9_-]+)={0,2}(?:\s|$)( +[!-~]*)?)?/i
+const parseHashWithOptions = /((?<algo>sha256|sha384|sha512)-(?<hash>[A-z0-9+/]{1}.*={0,2}))( +[\x21-\x7e]?)?/i
 
 /**
  * @see https://w3c.github.io/webappsec-subresource-integrity/#parse-metadata
@@ -100495,6 +100364,8 @@ function parseMetadata (metadata) {
   // 2. Let empty be equal to true.
   let empty = true
 
+  const supportedHashes = crypto.getHashes()
+
   // 3. For each token returned by splitting metadata on spaces:
   for (const token of metadata.split(' ')) {
     // 1. Set empty to false.
@@ -100504,11 +100375,7 @@ function parseMetadata (metadata) {
     const parsedToken = parseHashWithOptions.exec(token)
 
     // 3. If token does not parse, continue to the next token.
-    if (
+    if (parsedToken === null || parsedToken.groups === undefined) {
-      parsedToken === null ||
-      parsedToken.groups === undefined ||
-      parsedToken.groups.algo === undefined
-    ) {
       // Note: Chromium blocks the request at this point, but Firefox
       // gives a warning that an invalid integrity was given. The
       // correct behavior is to ignore these, and subsequently not
@@ -100517,11 +100384,11 @@ function parseMetadata (metadata) {
     }
 
     // 4. Let algorithm be the hash-algo component of token.
-    const algorithm = parsedToken.groups.algo.toLowerCase()
+    const algorithm = parsedToken.groups.algo
 
     // 5. If algorithm is a hash function recognized by the user
     //    agent, add the parsed token to result.
-    if (supportedHashes.includes(algorithm)) {
+    if (supportedHashes.includes(algorithm.toLowerCase())) {
       result.push(parsedToken.groups)
     }
   }
@@ -100534,82 +100401,6 @@ function parseMetadata (metadata) {
   return result
 }
 
-/**
- * @param {{ algo: 'sha256' | 'sha384' | 'sha512' }[]} metadataList
- */
-function getStrongestMetadata (metadataList) {
-  // Let algorithm be the algo component of the first item in metadataList.
-  // Can be sha256
-  let algorithm = metadataList[0].algo
-  // If the algorithm is sha512, then it is the strongest
-  // and we can return immediately
-  if (algorithm[3] === '5') {
-    return algorithm
-  }
-
-  for (let i = 1; i < metadataList.length; ++i) {
-    const metadata = metadataList[i]
-    // If the algorithm is sha512, then it is the strongest
-    // and we can break the loop immediately
-    if (metadata.algo[3] === '5') {
-      algorithm = 'sha512'
-      break
-    // If the algorithm is sha384, then a potential sha256 or sha384 is ignored
-    } else if (algorithm[3] === '3') {
-      continue
-    // algorithm is sha256, check if algorithm is sha384 and if so, set it as
-    // the strongest
-    } else if (metadata.algo[3] === '3') {
-      algorithm = 'sha384'
-    }
-  }
-  return algorithm
-}
-
-function filterMetadataListByAlgorithm (metadataList, algorithm) {
-  if (metadataList.length === 1) {
-    return metadataList
-  }
-
-  let pos = 0
-  for (let i = 0; i < metadataList.length; ++i) {
-    if (metadataList[i].algo === algorithm) {
-      metadataList[pos++] = metadataList[i]
-    }
-  }
-
-  metadataList.length = pos
-
-  return metadataList
-}
-
-/**
- * Compares two base64 strings, allowing for base64url
- * in the second string.
- *
-* @param {string} actualValue always base64
- * @param {string} expectedValue base64 or base64url
- * @returns {boolean}
- */
-function compareBase64Mixed (actualValue, expectedValue) {
-  if (actualValue.length !== expectedValue.length) {
-    return false
-  }
-  for (let i = 0; i < actualValue.length; ++i) {
-    if (actualValue[i] !== expectedValue[i]) {
-      if (
-        (actualValue[i] === '+' && expectedValue[i] === '-') ||
-        (actualValue[i] === '/' && expectedValue[i] === '_')
-      ) {
-        continue
-      }
-      return false
-    }
-  }
-
-  return true
-}
-
 // https://w3c.github.io/webappsec-upgrade-insecure-requests/#upgrade-request
 function tryUpgradeRequestToAPotentiallyTrustworthyURL (request) {
   // TODO
@@ -101025,8 +100816,7 @@ module.exports = {
   urlHasHttpsScheme,
   urlIsHttpHttpsScheme,
   readAllBytes,
-  normalizeMethodRecord,
+  normalizeMethodRecord
-  parseMetadata
 }
 
 
@@ -103113,17 +102903,12 @@ function parseLocation (statusCode, headers) {
 
 // https://tools.ietf.org/html/rfc7231#section-6.4.4
 function shouldRemoveHeader (header, removeContent, unknownOrigin) {
-  if (header.length === 4) {
+  return (
-    return util.headerNameToString(header) === 'host'
+    (header.length === 4 && header.toString().toLowerCase() === 'host') ||
-  }
+    (removeContent && header.toString().toLowerCase().indexOf('content-') === 0) ||
-  if (removeContent && util.headerNameToString(header).startsWith('content-')) {
+    (unknownOrigin && header.length === 13 && header.toString().toLowerCase() === 'authorization') ||
-    return true
+    (unknownOrigin && header.length === 6 && header.toString().toLowerCase() === 'cookie')
-  }
+  )
-  if (unknownOrigin && (header.length === 13 || header.length === 6 || header.length === 19)) {
-    const name = util.headerNameToString(header)
-    return name === 'authorization' || name === 'cookie' || name === 'proxy-authorization'
-  }
-  return false
 }
 
 // https://tools.ietf.org/html/rfc7231#section-6.4
@@ -123365,7 +123150,7 @@ function computeCacheKey(packageManager, cacheDependencyPath) {
         if (!fileHash) {
             throw new Error(`No file in ${process.cwd()} matched to [${pattern}], make sure you have checked out the target repository`);
         }
-        return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${process.arch}-${packageManager.id}-${fileHash}`;
+        return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${fileHash}`;
     });
 }
 /**
@@ -123961,7 +123746,7 @@ class CorrettoDistribution extends base_installer_1.JavaBase {
             const arch = this.distributionArchitecture();
             const imageType = this.packageType;
             if (core.isDebug()) {
-                console.time('Retrieving available versions for Corretto took'); // eslint-disable-line no-console
+                console.time('Retrieving available versions for Coretto took'); // eslint-disable-line no-console
             }
             const availableVersionsUrl = 'https://corretto.github.io/corretto-downloads/latest_links/indexmap_with_checksum.json';
             const fetchCurrentVersions = yield this.http.getJson(availableVersionsUrl);
@@ -123973,7 +123758,7 @@ class CorrettoDistribution extends base_installer_1.JavaBase {
             const availableVersions = this.getAvailableVersionsForPlatform(eligibleVersions);
             if (core.isDebug()) {
                 core.startGroup('Print information about available versions');
-                console.timeEnd('Retrieving available versions for Corretto took'); // eslint-disable-line no-console
+                console.timeEnd('Retrieving available versions for Coretto took'); // eslint-disable-line no-console
                 core.debug(`Available versions: [${availableVersions.length}]`);
                 core.debug(availableVersions
                     .map(item => `${item.version}: ${item.correttoVersion}`)
@@ -124049,8 +123834,6 @@ const installer_7 = __nccwpck_require__(41121);
 const installer_8 = __nccwpck_require__(34750);
 const installer_9 = __nccwpck_require__(64298);
 const installer_10 = __nccwpck_require__(16132);
-const installer_11 = __nccwpck_require__(52869);
-const installer_12 = __nccwpck_require__(55644);
 var JavaDistribution;
 (function (JavaDistribution) {
     JavaDistribution["Adopt"] = "adopt";
@@ -124065,8 +123848,6 @@ var JavaDistribution;
     JavaDistribution["Corretto"] = "corretto";
     JavaDistribution["Oracle"] = "oracle";
     JavaDistribution["Dragonwell"] = "dragonwell";
-    JavaDistribution["SapMachine"] = "sapmachine";
-    JavaDistribution["GraalVM"] = "graalvm";
 })(JavaDistribution || (JavaDistribution = {}));
 function getJavaDistribution(distributionName, installerOptions, jdkFile) {
     switch (distributionName) {
@@ -124093,10 +123874,6 @@ function getJavaDistribution(distributionName, installerOptions, jdkFile) {
             return new installer_9.OracleDistribution(installerOptions);
         case JavaDistribution.Dragonwell:
             return new installer_10.DragonwellDistribution(installerOptions);
-        case JavaDistribution.SapMachine:
-            return new installer_11.SapMachineDistribution(installerOptions);
-        case JavaDistribution.GraalVM:
-            return new installer_12.GraalVMDistribution(installerOptions);
         default:
             return null;
     }
@@ -124239,10 +124016,9 @@ class DragonwellDistribution extends base_installer_1.JavaBase {
                 }
                 // Some version of Dragonwell JDK are numerated with help of non-semver notation (more then 3 digits).
                 // Common practice is to transform excess digits to the so-called semver build part, which is prefixed with the plus sign, to be able to operate with them using semver tools.
-                const jdkVersionNums = jdkVersion
+                if (jdkVersion.split('.').length > 3) {
-                    .replace('+', '.')
+                    jdkVersion = (0, util_1.convertVersionToSemver)(jdkVersion);
-                    .split('.');
+                }
-                jdkVersion = (0, util_1.convertVersionToSemver)(`${jdkVersionNums.slice(0, 3).join('.')}.${jdkVersionNums[jdkVersionNums.length - 1]}`);
                 for (const edition in archMap) {
                     eligibleVersions.push({
                         os: platform,
@@ -124314,172 +124090,6 @@ class DragonwellDistribution extends base_installer_1.JavaBase {
 exports.DragonwellDistribution = DragonwellDistribution;
 
 
-/***/ }),
-
-/***/ 55644:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.GraalVMDistribution = void 0;
-const core = __importStar(__nccwpck_require__(42186));
-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 GRAALVM_DL_BASE = 'https://download.oracle.com/graalvm';
-const IS_WINDOWS = process.platform === 'win32';
-const GRAALVM_PLATFORM = IS_WINDOWS ? 'windows' : process.platform;
-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} ...`);
-            const javaArchivePath = yield tc.downloadTool(javaRelease.url);
-            core.info(`Extracting Java archive...`);
-            const extension = (0, util_1.getDownloadArchiveExtension)();
-            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* () {
-            const arch = this.distributionArchitecture();
-            if (arch !== 'x64' && arch !== 'aarch64') {
-                throw new Error(`Unsupported architecture: ${this.architecture}`);
-            }
-            if (!this.stable) {
-                return this.findEABuildDownloadUrl(`${range}-ea`);
-            }
-            if (this.packageType !== 'jdk') {
-                throw new Error('GraalVM provides only the `jdk` package type');
-            }
-            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}`;
-            }
-            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');
-            }
-            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}`);
-            }
-            return { url: fileUrl, version: range };
-        });
-    }
-    findEABuildDownloadUrl(javaEaVersion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const versions = yield this.fetchEAJson(javaEaVersion);
-            const latestVersion = versions.find(v => v.latest);
-            if (!latestVersion) {
-                throw new Error(`Unable to find latest version for '${javaEaVersion}'`);
-            }
-            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}'`);
-            }
-            return {
-                url: `${latestVersion.download_base_url}${file.filename}`,
-                version: latestVersion.version
-            };
-        });
-    }
-    fetchEAJson(javaEaVersion) {
-        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 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;
-            }
-            catch (err) {
-                throw Error(`Fetching version info for GraalVM EA builds from '${url}' failed with the error: ${err.message}`);
-            }
-            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'`);
-        }
-    }
-}
-exports.GraalVMDistribution = GraalVMDistribution;
-
-
 /***/ }),
 
 /***/ 40883:
@@ -125048,219 +124658,6 @@ class OracleDistribution extends base_installer_1.JavaBase {
 exports.OracleDistribution = OracleDistribution;
 
 
-/***/ }),
-
-/***/ 52869:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.SapMachineDistribution = void 0;
-const core = __importStar(__nccwpck_require__(42186));
-const tc = __importStar(__nccwpck_require__(27784));
-const semver_1 = __importDefault(__nccwpck_require__(11383));
-const fs_1 = __importDefault(__nccwpck_require__(57147));
-const path_1 = __importDefault(__nccwpck_require__(71017));
-const util_1 = __nccwpck_require__(92629);
-const base_installer_1 = __nccwpck_require__(59741);
-class SapMachineDistribution extends base_installer_1.JavaBase {
-    constructor(installerOptions) {
-        super('SapMachine', installerOptions);
-    }
-    findPackageForDownload(version) {
-        return __awaiter(this, void 0, void 0, function* () {
-            core.debug(`Only stable versions: ${this.stable}`);
-            if (!['jdk', 'jre'].includes(this.packageType)) {
-                throw new Error('SapMachine provides only the `jdk` and `jre` package type');
-            }
-            const availableVersions = yield this.getAvailableVersions();
-            const matchedVersions = availableVersions
-                .filter(item => {
-                return (0, util_1.isVersionSatisfies)(version, item.version);
-            })
-                .map(item => {
-                return {
-                    version: item.version,
-                    url: item.downloadLink
-                };
-            });
-            if (!matchedVersions.length) {
-                throw new Error(`Couldn't find any satisfied version for the specified java-version: "${version}" and architecture: "${this.architecture}".`);
-            }
-            const resolvedVersion = matchedVersions[0];
-            return resolvedVersion;
-        });
-    }
-    getAvailableVersions() {
-        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');
-            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)());
-            }
-            if (!fetchedReleasesJson) {
-                throw new Error(`Couldn't fetch SapMachine versions information from both primary and backup urls`);
-            }
-            core.debug('Successfully fetched information about available SapMachine versions');
-            const availableVersions = this.parseVersions(platform, arch, fetchedReleasesJson);
-            if (core.isDebug()) {
-                core.startGroup('Print information about available versions');
-                core.debug(availableVersions.map(item => item.version).join(', '));
-                core.endGroup();
-            }
-            return availableVersions;
-        });
-    }
-    downloadTool(javaRelease) {
-        return __awaiter(this, void 0, void 0, function* () {
-            core.info(`Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`);
-            const javaArchivePath = yield tc.downloadTool(javaRelease.url);
-            core.info(`Extracting Java archive...`);
-            const extractedJavaPath = yield (0, util_1.extractJdkFile)(javaArchivePath, (0, util_1.getDownloadArchiveExtension)());
-            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 };
-        });
-    }
-    parseVersions(platform, arch, versions) {
-        const eligibleVersions = [];
-        for (const [, majorVersionMap] of Object.entries(versions)) {
-            for (const [, jdkVersionMap] of Object.entries(majorVersionMap.updates)) {
-                for (const [buildVersion, buildVersionMap] of Object.entries(jdkVersionMap)) {
-                    let buildVersionWithoutPrefix = buildVersion.replace('sapmachine-', '');
-                    if (!buildVersionWithoutPrefix.includes('.')) {
-                        // replace major version with major.minor.patch and keep the remaining build identifier after the + as is with regex
-                        buildVersionWithoutPrefix = buildVersionWithoutPrefix.replace(/(\d+)(\+.*)?/, '$1.0.0$2');
-                    }
-                    // replace + with . to convert to semver format if we have more than 3 version digits
-                    if (buildVersionWithoutPrefix.split('.').length > 3) {
-                        buildVersionWithoutPrefix = buildVersionWithoutPrefix.replace('+', '.');
-                    }
-                    buildVersionWithoutPrefix = (0, util_1.convertVersionToSemver)(buildVersionWithoutPrefix);
-                    // ignore invalid version
-                    if (!semver_1.default.valid(buildVersionWithoutPrefix)) {
-                        core.debug(`Invalid version: ${buildVersionWithoutPrefix}`);
-                        continue;
-                    }
-                    // skip earlyAccessVersions if stable version requested
-                    if (this.stable && buildVersionMap.ea === 'true') {
-                        continue;
-                    }
-                    for (const [edition, editionAssets] of Object.entries(buildVersionMap.assets)) {
-                        if (this.packageType !== edition) {
-                            continue;
-                        }
-                        for (const [archAndPlatForm, archAssets] of Object.entries(editionAssets)) {
-                            let expectedArchAndPlatform = `${platform}-${arch}`;
-                            if (platform === 'linux-musl') {
-                                expectedArchAndPlatform = `linux-${arch}-musl`;
-                            }
-                            if (archAndPlatForm !== expectedArchAndPlatform) {
-                                continue;
-                            }
-                            for (const [contentType, contentTypeAssets] of Object.entries(archAssets)) {
-                                // skip if not tar.gz and zip files
-                                if (contentType !== 'tar.gz' && contentType !== 'zip') {
-                                    continue;
-                                }
-                                eligibleVersions.push({
-                                    os: platform,
-                                    architecture: arch,
-                                    version: buildVersionWithoutPrefix,
-                                    checksum: contentTypeAssets.checksum,
-                                    downloadLink: contentTypeAssets.url,
-                                    packageType: edition
-                                });
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        const sortedVersions = this.sortParsedVersions(eligibleVersions);
-        return sortedVersions;
-    }
-    // Sorts versions in descending order as by default data in JSON isn't sorted
-    sortParsedVersions(eligibleVersions) {
-        const sortedVersions = eligibleVersions.sort((versionObj1, versionObj2) => {
-            const version1 = versionObj1.version;
-            const version2 = versionObj2.version;
-            return semver_1.default.compareBuild(version1, version2);
-        });
-        return sortedVersions.reverse();
-    }
-    getPlatformOption() {
-        switch (process.platform) {
-            case 'win32':
-                return 'windows';
-            case 'darwin':
-                return 'macos';
-            case 'linux':
-                // figure out if alpine/musl
-                if (fs_1.default.existsSync('/etc/alpine-release')) {
-                    return 'linux-musl';
-                }
-                return 'linux';
-            default:
-                return process.platform;
-        }
-    }
-    fetchReleasesFromUrl(url, headers = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                core.debug(`Trying to fetch available SapMachine versions info from the primary url: ${url}`);
-                const releases = (yield this.http.getJson(url, headers)).result;
-                return releases;
-            }
-            catch (err) {
-                core.debug(`Fetching SapMachine versions info from the link: ${url} ended up with the error: ${err.message}`);
-                return null;
-            }
-        });
-    }
-}
-exports.SapMachineDistribution = SapMachineDistribution;
-
-
 /***/ }),
 
 /***/ 41121:
@@ -125326,9 +124723,8 @@ class SemeruDistribution extends base_installer_1.JavaBase {
     }
     findPackageForDownload(version) {
         return __awaiter(this, void 0, void 0, function* () {
-            const arch = this.distributionArchitecture();
+            if (!supportedArchitectures.includes(this.architecture)) {
-            if (!supportedArchitectures.includes(arch)) {
+                throw new Error(`Unsupported architecture for IBM Semeru: ${this.architecture}, the following are supported: ${supportedArchitectures.join(', ')}`);
-                throw new Error(`Unsupported architecture for IBM Semeru: ${this.architecture} for your current OS version, the following are supported: ${supportedArchitectures.join(', ')}`);
             }
             if (!this.stable) {
                 throw new Error('IBM Semeru does not provide builds for early access versions');
@@ -125362,7 +124758,7 @@ class SemeruDistribution extends base_installer_1.JavaBase {
                 const availableOptionsMessage = availableOptions
                     ? `\nAvailable versions: ${availableOptions}`
                     : '';
-                throw new Error(`Could not find satisfied version for SemVer version '${version}' for your current OS version for ${this.architecture} architecture ${availableOptionsMessage}`);
+                throw new Error(`Could not find satisfied version for SemVer '${version}'. ${availableOptionsMessage}`);
             }
             return resolvedFullVersion;
         });
@@ -125387,7 +124783,7 @@ class SemeruDistribution extends base_installer_1.JavaBase {
     getAvailableVersions() {
         return __awaiter(this, void 0, void 0, function* () {
             const platform = this.getPlatformOption();
-            const arch = this.distributionArchitecture();
+            const arch = this.architecture;
             const imageType = this.packageType;
             const versionRange = encodeURI('[1.0,100.0]'); // retrieve all available versions
             const releaseType = this.stable ? 'ga' : 'ea';

docs/advanced-usage.md

@@ -8,8 +8,6 @@
   - [Amazon Corretto](#Amazon-Corretto)
   - [Oracle](#Oracle)
   - [Alibaba Dragonwell](#Alibaba-Dragonwell)
-  - [SapMachine](#SapMachine)
-  - [GraalVM](#GraalVM)
 - [Installing custom Java package type](#Installing-custom-Java-package-type)
 - [Installing custom Java architecture](#Installing-custom-Java-architecture)
 - [Installing custom Java distribution from local file](#Installing-Java-from-local-file)
@@ -144,33 +142,6 @@ steps:
 - run: java -cp java HelloWorldApp
 ```
 
-### SapMachine
-**NOTE:** An OpenJDK release maintained and supported by SAP
-```yaml
-steps:
-- uses: actions/checkout@v4
-- uses: actions/setup-java@v4
-  with:
-    distribution: 'sapmachine'
-    java-version: '21'
-- run: java -cp java HelloWorldApp
-```
-
-### GraalVM
-**NOTE:** Oracle GraalVM is only available for JDK 17 and later.
-
-```yaml
-steps:
-- uses: actions/checkout@v4
-- uses: actions/setup-java@v4
-  with:
-    distribution: 'graalvm'
-    java-version: '21'
-- run: |
-    java -cp java HelloWorldApp
-    native-image -cp java HelloWorldApp
-```
-
 ## Installing custom Java package type
 ```yaml
 steps:
@@ -560,7 +531,7 @@ steps:
   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/)).
+  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).
   
   If both java-version and java-version-file inputs are provided, the java-version input will be used.
 

package-lock.json

@@ -2249,12 +2249,12 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.3",
+      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
       "dev": true,
       "dependencies": {
-        "fill-range": "^7.1.1"
+        "fill-range": "^7.0.1"
       },
       "engines": {
         "node": ">=8"
@@ -3102,9 +3102,9 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.1.1",
+      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "dev": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
@@ -5338,9 +5338,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "5.28.4",
+      "version": "5.28.3",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.4.tgz",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.3.tgz",
-      "integrity": "sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==",
+      "integrity": "sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==",
       "dependencies": {
         "@fastify/busboy": "^2.0.0"
       },

src/cache.ts

@@ -98,7 +98,7 @@ async function computeCacheKey(
       `No file in ${process.cwd()} matched to [${pattern}], make sure you have checked out the target repository`
     );
   }
-  return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${process.arch}-${packageManager.id}-${fileHash}`;
+  return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${fileHash}`;
 }
 
 /**

src/distributions/corretto/installer.ts

@@ -93,7 +93,7 @@ export class CorrettoDistribution extends JavaBase {
     const imageType = this.packageType;
 
     if (core.isDebug()) {
-      console.time('Retrieving available versions for Corretto took'); // eslint-disable-line no-console
+      console.time('Retrieving available versions for Coretto took'); // eslint-disable-line no-console
     }
 
     const availableVersionsUrl =
@@ -116,7 +116,7 @@ export class CorrettoDistribution extends JavaBase {
 
     if (core.isDebug()) {
       core.startGroup('Print information about available versions');
-      console.timeEnd('Retrieving available versions for Corretto took'); // eslint-disable-line no-console
+      console.timeEnd('Retrieving available versions for Coretto took'); // eslint-disable-line no-console
       core.debug(`Available versions: [${availableVersions.length}]`);
       core.debug(
         availableVersions

src/distributions/distribution-factory.ts

@@ -10,8 +10,6 @@ import {SemeruDistribution} from './semeru/installer';
 import {CorrettoDistribution} from './corretto/installer';
 import {OracleDistribution} from './oracle/installer';
 import {DragonwellDistribution} from './dragonwell/installer';
-import {SapMachineDistribution} from './sapmachine/installer';
-import {GraalVMDistribution} from './graalvm/installer';
 
 enum JavaDistribution {
   Adopt = 'adopt',
@@ -25,9 +23,7 @@ enum JavaDistribution {
   Semeru = 'semeru',
   Corretto = 'corretto',
   Oracle = 'oracle',
-  Dragonwell = 'dragonwell',
+  Dragonwell = 'dragonwell'
-  SapMachine = 'sapmachine',
-  GraalVM = 'graalvm'
 }
 
 export function getJavaDistribution(
@@ -68,10 +64,6 @@ export function getJavaDistribution(
       return new OracleDistribution(installerOptions);
     case JavaDistribution.Dragonwell:
       return new DragonwellDistribution(installerOptions);
-    case JavaDistribution.SapMachine:
-      return new SapMachineDistribution(installerOptions);
-    case JavaDistribution.GraalVM:
-      return new GraalVMDistribution(installerOptions);
     default:
       return null;
   }

src/distributions/dragonwell/installer.ts

@@ -149,14 +149,9 @@ export class DragonwellDistribution extends JavaBase {
 
         // Some version of Dragonwell JDK are numerated with help of non-semver notation (more then 3 digits).
         // Common practice is to transform excess digits to the so-called semver build part, which is prefixed with the plus sign, to be able to operate with them using semver tools.
-        const jdkVersionNums: string[] = jdkVersion
+        if (jdkVersion.split('.').length > 3) {
-          .replace('+', '.')
+          jdkVersion = convertVersionToSemver(jdkVersion);
-          .split('.');
+        }
-        jdkVersion = convertVersionToSemver(
-          `${jdkVersionNums.slice(0, 3).join('.')}.${
-            jdkVersionNums[jdkVersionNums.length - 1]
-          }`
-        );
 
         for (const edition in archMap) {
           eligibleVersions.push({

src/distributions/graalvm/installer.ts

@@ -1,173 +0,0 @@
-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 {
-  JavaDownloadRelease,
-  JavaInstallerOptions,
-  JavaInstallerResults
-} from '../base-models';
-import {
-  extractJdkFile,
-  getDownloadArchiveExtension,
-  getGitHubHttpHeaders
-} 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;
-
-export class GraalVMDistribution extends JavaBase {
-  constructor(installerOptions: JavaInstallerOptions) {
-    super('GraalVM', installerOptions);
-  }
-
-  protected async downloadTool(
-    javaRelease: JavaDownloadRelease
-  ): Promise<JavaInstallerResults> {
-    core.info(
-      `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
-    );
-    const javaArchivePath = await tc.downloadTool(javaRelease.url);
-
-    core.info(`Extracting Java archive...`);
-    const extension = getDownloadArchiveExtension();
-
-    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> {
-    const arch = this.distributionArchitecture();
-    if (arch !== 'x64' && arch !== 'aarch64') {
-      throw new Error(`Unsupported architecture: ${this.architecture}`);
-    }
-
-    if (!this.stable) {
-      return this.findEABuildDownloadUrl(`${range}-ea`);
-    }
-
-    if (this.packageType !== 'jdk') {
-      throw new Error('GraalVM provides only the `jdk` package type');
-    }
-
-    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}`;
-    }
-
-    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) {
-      throw new Error(
-        `Http request for GraalVM failed with status code: ${response.message.statusCode}`
-      );
-    }
-
-    return {url: fileUrl, version: range};
-  }
-
-  private async findEABuildDownloadUrl(
-    javaEaVersion: string
-  ): Promise<JavaDownloadRelease> {
-    const versions = await this.fetchEAJson(javaEaVersion);
-    const latestVersion = versions.find(v => v.latest);
-    if (!latestVersion) {
-      throw new Error(`Unable to find latest version for '${javaEaVersion}'`);
-    }
-    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}'`);
-    }
-    return {
-      url: `${latestVersion.download_base_url}${file.filename}`,
-      version: latestVersion.version
-    };
-  }
-
-  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 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
-        }`
-      );
-    }
-    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'`
-        );
-    }
-  }
-}

src/distributions/graalvm/models.ts

@@ -1,14 +0,0 @@
-export type OsVersions = 'linux' | 'macos' | 'windows';
-
-export interface GraalVMEAFile {
-  filename: string;
-  arch: 'aarch64' | 'x64';
-  platform: 'darwin' | 'linux' | 'windows';
-}
-
-export interface GraalVMEAVersion {
-  version: string;
-  latest?: boolean;
-  download_base_url: string;
-  files: GraalVMEAFile[];
-}

src/distributions/sapmachine/installer.ts

@@ -1,268 +0,0 @@
-import * as core from '@actions/core';
-import * as tc from '@actions/tool-cache';
-import semver from 'semver';
-import fs from 'fs';
-import {OutgoingHttpHeaders} from 'http';
-import path from 'path';
-import {
-  convertVersionToSemver,
-  extractJdkFile,
-  getDownloadArchiveExtension,
-  getGitHubHttpHeaders,
-  isVersionSatisfies
-} from '../../util';
-import {JavaBase} from '../base-installer';
-import {
-  JavaDownloadRelease,
-  JavaInstallerOptions,
-  JavaInstallerResults
-} from '../base-models';
-import {ISapMachineAllVersions, ISapMachineVersions} from './models';
-
-export class SapMachineDistribution extends JavaBase {
-  constructor(installerOptions: JavaInstallerOptions) {
-    super('SapMachine', installerOptions);
-  }
-
-  protected async findPackageForDownload(
-    version: string
-  ): Promise<JavaDownloadRelease> {
-    core.debug(`Only stable versions: ${this.stable}`);
-
-    if (!['jdk', 'jre'].includes(this.packageType)) {
-      throw new Error(
-        'SapMachine provides only the `jdk` and `jre` package type'
-      );
-    }
-
-    const availableVersions = await this.getAvailableVersions();
-
-    const matchedVersions = availableVersions
-      .filter(item => {
-        return isVersionSatisfies(version, item.version);
-      })
-      .map(item => {
-        return {
-          version: item.version,
-          url: item.downloadLink
-        } as JavaDownloadRelease;
-      });
-
-    if (!matchedVersions.length) {
-      throw new Error(
-        `Couldn't find any satisfied version for the specified java-version: "${version}" and architecture: "${this.architecture}".`
-      );
-    }
-
-    const resolvedVersion = matchedVersions[0];
-    return resolvedVersion;
-  }
-
-  private async getAvailableVersions(): Promise<ISapMachineVersions[]> {
-    const platform = this.getPlatformOption();
-    const arch = this.distributionArchitecture();
-
-    let fetchedReleasesJson = await this.fetchReleasesFromUrl(
-      'https://sap.github.io/SapMachine/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()
-      );
-    }
-
-    if (!fetchedReleasesJson) {
-      throw new Error(
-        `Couldn't fetch SapMachine versions information from both primary and backup urls`
-      );
-    }
-
-    core.debug(
-      'Successfully fetched information about available SapMachine versions'
-    );
-
-    const availableVersions = this.parseVersions(
-      platform,
-      arch,
-      fetchedReleasesJson
-    );
-
-    if (core.isDebug()) {
-      core.startGroup('Print information about available versions');
-      core.debug(availableVersions.map(item => item.version).join(', '));
-      core.endGroup();
-    }
-
-    return availableVersions;
-  }
-
-  protected async downloadTool(
-    javaRelease: JavaDownloadRelease
-  ): Promise<JavaInstallerResults> {
-    core.info(
-      `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
-    );
-    const javaArchivePath = await tc.downloadTool(javaRelease.url);
-
-    core.info(`Extracting Java archive...`);
-
-    const extractedJavaPath = await extractJdkFile(
-      javaArchivePath,
-      getDownloadArchiveExtension()
-    );
-
-    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};
-  }
-
-  private parseVersions(
-    platform: string,
-    arch: string,
-    versions: ISapMachineAllVersions
-  ): ISapMachineVersions[] {
-    const eligibleVersions: ISapMachineVersions[] = [];
-
-    for (const [, majorVersionMap] of Object.entries(versions)) {
-      for (const [, jdkVersionMap] of Object.entries(majorVersionMap.updates)) {
-        for (const [buildVersion, buildVersionMap] of Object.entries(
-          jdkVersionMap
-        )) {
-          let buildVersionWithoutPrefix = buildVersion.replace(
-            'sapmachine-',
-            ''
-          );
-          if (!buildVersionWithoutPrefix.includes('.')) {
-            // replace major version with major.minor.patch and keep the remaining build identifier after the + as is with regex
-            buildVersionWithoutPrefix = buildVersionWithoutPrefix.replace(
-              /(\d+)(\+.*)?/,
-              '$1.0.0$2'
-            );
-          }
-          // replace + with . to convert to semver format if we have more than 3 version digits
-          if (buildVersionWithoutPrefix.split('.').length > 3) {
-            buildVersionWithoutPrefix = buildVersionWithoutPrefix.replace(
-              '+',
-              '.'
-            );
-          }
-          buildVersionWithoutPrefix = convertVersionToSemver(
-            buildVersionWithoutPrefix
-          );
-
-          // ignore invalid version
-          if (!semver.valid(buildVersionWithoutPrefix)) {
-            core.debug(`Invalid version: ${buildVersionWithoutPrefix}`);
-            continue;
-          }
-
-          // skip earlyAccessVersions if stable version requested
-          if (this.stable && buildVersionMap.ea === 'true') {
-            continue;
-          }
-
-          for (const [edition, editionAssets] of Object.entries(
-            buildVersionMap.assets
-          )) {
-            if (this.packageType !== edition) {
-              continue;
-            }
-            for (const [archAndPlatForm, archAssets] of Object.entries(
-              editionAssets
-            )) {
-              let expectedArchAndPlatform = `${platform}-${arch}`;
-              if (platform === 'linux-musl') {
-                expectedArchAndPlatform = `linux-${arch}-musl`;
-              }
-              if (archAndPlatForm !== expectedArchAndPlatform) {
-                continue;
-              }
-              for (const [contentType, contentTypeAssets] of Object.entries(
-                archAssets
-              )) {
-                // skip if not tar.gz and zip files
-                if (contentType !== 'tar.gz' && contentType !== 'zip') {
-                  continue;
-                }
-                eligibleVersions.push({
-                  os: platform,
-                  architecture: arch,
-                  version: buildVersionWithoutPrefix,
-                  checksum: contentTypeAssets.checksum,
-                  downloadLink: contentTypeAssets.url,
-                  packageType: edition
-                });
-              }
-            }
-          }
-        }
-      }
-    }
-
-    const sortedVersions = this.sortParsedVersions(eligibleVersions);
-
-    return sortedVersions;
-  }
-
-  // Sorts versions in descending order as by default data in JSON isn't sorted
-  private sortParsedVersions(
-    eligibleVersions: ISapMachineVersions[]
-  ): ISapMachineVersions[] {
-    const sortedVersions = eligibleVersions.sort((versionObj1, versionObj2) => {
-      const version1 = versionObj1.version;
-      const version2 = versionObj2.version;
-      return semver.compareBuild(version1, version2);
-    });
-    return sortedVersions.reverse();
-  }
-
-  private getPlatformOption(): string {
-    switch (process.platform) {
-      case 'win32':
-        return 'windows';
-      case 'darwin':
-        return 'macos';
-      case 'linux':
-        // figure out if alpine/musl
-        if (fs.existsSync('/etc/alpine-release')) {
-          return 'linux-musl';
-        }
-        return 'linux';
-      default:
-        return process.platform;
-    }
-  }
-
-  private async fetchReleasesFromUrl(
-    url: string,
-    headers: OutgoingHttpHeaders = {}
-  ): Promise<ISapMachineAllVersions | null> {
-    try {
-      core.debug(
-        `Trying to fetch available SapMachine versions info from the primary url: ${url}`
-      );
-      const releases = (
-        await this.http.getJson<ISapMachineAllVersions>(url, headers)
-      ).result;
-      return releases;
-    } catch (err) {
-      core.debug(
-        `Fetching SapMachine versions info from the link: ${url} ended up with the error: ${
-          (err as Error).message
-        }`
-      );
-      return null;
-    }
-  }
-}

src/distributions/sapmachine/models.ts

@@ -1,33 +0,0 @@
-export interface ISapMachineAllVersions {
-  [major: string]: {
-    lts: string;
-    updates: {
-      [full_version: string]: {
-        [sapmachineBuild: string]: {
-          release_url: string;
-          ea: string;
-          assets: {
-            [packageType: string]: {
-              [arch: string]: {
-                [content_type: string]: {
-                  name: string;
-                  checksum: string;
-                  url: string;
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}
-
-export interface ISapMachineVersions {
-  os: string;
-  architecture: string;
-  version: string;
-  checksum: string;
-  downloadLink: string;
-  packageType: string;
-}

src/distributions/semeru/installer.ts

@@ -33,15 +33,11 @@ export class SemeruDistribution extends JavaBase {
   protected async findPackageForDownload(
     version: string
   ): Promise<JavaDownloadRelease> {
-    const arch = this.distributionArchitecture();
+    if (!supportedArchitectures.includes(this.architecture)) {
-
-    if (!supportedArchitectures.includes(arch)) {
       throw new Error(
         `Unsupported architecture for IBM Semeru: ${
           this.architecture
-        } for your current OS version, the following are supported: ${supportedArchitectures.join(
+        }, the following are supported: ${supportedArchitectures.join(', ')}`
-          ', '
-        )}`
       );
     }
 
@@ -85,7 +81,7 @@ export class SemeruDistribution extends JavaBase {
         ? `\nAvailable versions: ${availableOptions}`
         : '';
       throw new Error(
-        `Could not find satisfied version for SemVer version '${version}' for your current OS version for ${this.architecture} architecture ${availableOptionsMessage}`
+        `Could not find satisfied version for SemVer '${version}'. ${availableOptionsMessage}`
       );
     }
 
@@ -128,7 +124,7 @@ export class SemeruDistribution extends JavaBase {
 
   public async getAvailableVersions(): Promise<ISemeruAvailableVersions[]> {
     const platform = this.getPlatformOption();
-    const arch = this.distributionArchitecture();
+    const arch = this.architecture;
     const imageType = this.packageType;
     const versionRange = encodeURI('[1.0,100.0]'); // retrieve all available versions
     const releaseType = this.stable ? 'ga' : 'ea';