adds microsoft openjdk25 builds (#927)

* adds microsoft java 25 build adds microsoft java 25 build * tests and formatting * Add Microsoft distribution for version 25 on multiple OS

Author: the-mod

.github/workflows/e2e-versions.yml

@@ -41,6 +41,15 @@ jobs:
  - distribution: dragonwell
  os: macos-13
  include:
+ - distribution: microsoft
+ os: windows-latest
+ version: 25
+ - distribution: microsoft
+ os: ubuntu-latest
+ version: 25
+ - distribution: microsoft
+ os: macos-latest
+ version: 25
  - distribution: oracle
  os: macos-13
  version: 17

__tests__/data/microsoft.json

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

__tests__/distributors/microsoft-installer.test.ts

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

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

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