From 11556068a266475a8b36fcaadd13ecafc87175e2 Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 9 Jun 2022 09:37:39 +0100 Subject: [PATCH] msft: bump jdk17 to 17.0.3 and add aarch64 support to jdk11 --- dist/setup/index.js | 9 ++++++--- src/distributions/microsoft/installer.ts | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index 302ac277..29bb6cd0 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -101717,11 +101717,17 @@ class MicrosoftDistributions extends base_installer_1.JavaBase { // TODO get these dynamically! // We will need Microsoft to add an endpoint where we can query for versions. const jdkVersions = [ + { + version: [17, 0, 3] + }, { version: [17, 0, 1, 12, 1] }, { version: [16, 0, 2, 7, 1] + }, + { + version: [11, 0, 15] } ]; // M1 is only supported for Java 16 & 17 @@ -101729,9 +101735,6 @@ class MicrosoftDistributions extends base_installer_1.JavaBase { jdkVersions.push({ version: [11, 0, 13, 8, 1] }); - jdkVersions.push({ - version: [11, 0, 15] - }); } return jdkVersions; }); diff --git a/src/distributions/microsoft/installer.ts b/src/distributions/microsoft/installer.ts index 672b9679..4ceb4285 100644 --- a/src/distributions/microsoft/installer.ts +++ b/src/distributions/microsoft/installer.ts @@ -80,11 +80,17 @@ export class MicrosoftDistributions extends JavaBase { // TODO get these dynamically! // We will need Microsoft to add an endpoint where we can query for versions. const jdkVersions = [ + { + version: [17, 0, 3] + }, { version: [17, 0, 1, 12, 1] }, { version: [16, 0, 2, 7, 1] + }, + { + version: [11, 0, 15] } ]; @@ -93,9 +99,6 @@ export class MicrosoftDistributions extends JavaBase { jdkVersions.push({ version: [11, 0, 13, 8, 1] }); - jdkVersions.push({ - version: [11, 0, 15] - }); } return jdkVersions;