From 11556068a266475a8b36fcaadd13ecafc87175e2 Mon Sep 17 00:00:00 2001
From: George Adams <georgeadams1995@gmail.com>
Date: Thu, 9 Jun 2022 09:37:39 +0100
Subject: [PATCH 1/2] 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;
From 4fba8311187ef837f9dd26c8d6d6e8c52cd0a202 Mon Sep 17 00:00:00 2001
From: George Adams <georgeadams1995@gmail.com>
Date: Thu, 9 Jun 2022 17:53:21 +0100
Subject: [PATCH 2/2] fix test
---
__tests__/distributors/microsoft-installer.test.ts | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/__tests__/distributors/microsoft-installer.test.ts b/__tests__/distributors/microsoft-installer.test.ts
index 40868bba..9be0f50e 100644
--- a/__tests__/distributors/microsoft-installer.test.ts
+++ b/__tests__/distributors/microsoft-installer.test.ts
@@ -14,10 +14,15 @@ describe('findPackageForDownload', () => {
it.each([
[
- '17.x',
+ '17.0.1',
'17.0.1',
'https://aka.ms/download-jdk/microsoft-jdk-17.0.1.12.1-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
],
+ [
+ '17.x',
+ '17.0.3',
+ 'https://aka.ms/download-jdk/microsoft-jdk-17.0.3-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
+ ],
[
'16.0.x',
'16.0.2',