Skip to content

Commit 5866e12

Browse files
al-kaual-kau
authored
feat: add microsoft openjdk 17.0.18 (#1002)
* feat: add microsoft openjdk 17.0.18 * fix: correct url microsoft-jdk-17.0.10-macos-x64
1 parent 2872526 commit 5866e12

3 files changed

Lines changed: 99 additions & 8 deletions

File tree

‎__tests__/data/microsoft.json‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,49 @@
7979
}
8080
]
8181
},
82+
{
83+
"version": "17.0.18",
84+
"stable": true,
85+
"release_url": "https://aka.ms/download-jdk",
86+
"files": [
87+
{
88+
"filename": "microsoft-jdk-17.0.18-macos-x64.tar.gz",
89+
"arch": "x64",
90+
"platform": "darwin",
91+
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.18-macos-x64.tar.gz"
92+
},
93+
{
94+
"filename": "microsoft-jdk-17.0.18-linux-x64.tar.gz",
95+
"arch": "x64",
96+
"platform": "linux",
97+
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.18-linux-x64.tar.gz"
98+
},
99+
{
100+
"filename": "microsoft-jdk-17.0.18-windows-x64.zip",
101+
"arch": "x64",
102+
"platform": "win32",
103+
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.18-windows-x64.zip"
104+
},
105+
{
106+
"filename": "microsoft-jdk-17.0.18-macos-aarch64.tar.gz",
107+
"arch": "aarch64",
108+
"platform": "darwin",
109+
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.18-macos-aarch64.tar.gz"
110+
},
111+
{
112+
"filename": "microsoft-jdk-17.0.18-linux-aarch64.tar.gz",
113+
"arch": "aarch64",
114+
"platform": "linux",
115+
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.18-linux-aarch64.tar.gz"
116+
},
117+
{
118+
"filename": "microsoft-jdk-17.0.18-windows-aarch64.zip",
119+
"arch": "aarch64",
120+
"platform": "win32",
121+
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.18-windows-aarch64.zip"
122+
}
123+
]
124+
},
82125
{
83126
"version": "17.0.7",
84127
"stable": true,

‎__tests__/distributors/microsoft-installer.test.ts‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,20 @@ describe('findPackageForDownload', () => {
4545
'https://aka.ms/download-jdk/microsoft-jdk-21.0.0-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
4646
],
4747
[
48-
'17.0.1',
49-
'17.0.1+12.1',
50-
'https://aka.ms/download-jdk/microsoft-jdk-17.0.1.12.1-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
48+
'17.x',
49+
'17.0.18',
50+
'https://aka.ms/download-jdk/microsoft-jdk-17.0.18-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
5151
],
5252
[
53-
'17.x',
53+
'17.0.7',
5454
'17.0.7',
5555
'https://aka.ms/download-jdk/microsoft-jdk-17.0.7-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
5656
],
57+
[
58+
'17.0.1',
59+
'17.0.1+12.1',
60+
'https://aka.ms/download-jdk/microsoft-jdk-17.0.1.12.1-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
61+
],
5762
[
5863
'16.0.x',
5964
'16.0.2+7.1',
@@ -119,7 +124,7 @@ describe('findPackageForDownload', () => {
119124
});
120125

121126
const result = await distro['findPackageForDownload'](version);
122-
const expectedUrl = `https://aka.ms/download-jdk/microsoft-jdk-17.0.7-macos-${distroArch}.tar.gz`;
127+
const expectedUrl = `https://aka.ms/download-jdk/microsoft-jdk-17.0.18-macos-${distroArch}.tar.gz`;
123128

124129
expect(result.url).toBe(expectedUrl);
125130
}
@@ -145,7 +150,7 @@ describe('findPackageForDownload', () => {
145150
});
146151

147152
const result = await distro['findPackageForDownload'](version);
148-
const expectedUrl = `https://aka.ms/download-jdk/microsoft-jdk-17.0.7-linux-${distroArch}.tar.gz`;
153+
const expectedUrl = `https://aka.ms/download-jdk/microsoft-jdk-17.0.18-linux-${distroArch}.tar.gz`;
149154

150155
expect(result.url).toBe(expectedUrl);
151156
}
@@ -171,7 +176,7 @@ describe('findPackageForDownload', () => {
171176
});
172177

173178
const result = await distro['findPackageForDownload'](version);
174-
const expectedUrl = `https://aka.ms/download-jdk/microsoft-jdk-17.0.7-windows-${distroArch}.zip`;
179+
const expectedUrl = `https://aka.ms/download-jdk/microsoft-jdk-17.0.18-windows-${distroArch}.zip`;
175180

176181
expect(result.url).toBe(expectedUrl);
177182
}

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

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,49 @@
171171
}
172172
]
173173
},
174+
{
175+
"version": "17.0.18",
176+
"stable": true,
177+
"release_url": "https://aka.ms/download-jdk",
178+
"files": [
179+
{
180+
"filename": "microsoft-jdk-17.0.18-macos-x64.tar.gz",
181+
"arch": "x64",
182+
"platform": "darwin",
183+
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.18-macos-x64.tar.gz"
184+
},
185+
{
186+
"filename": "microsoft-jdk-17.0.18-linux-x64.tar.gz",
187+
"arch": "x64",
188+
"platform": "linux",
189+
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.18-linux-x64.tar.gz"
190+
},
191+
{
192+
"filename": "microsoft-jdk-17.0.18-windows-x64.zip",
193+
"arch": "x64",
194+
"platform": "win32",
195+
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.18-windows-x64.zip"
196+
},
197+
{
198+
"filename": "microsoft-jdk-17.0.18-macos-aarch64.tar.gz",
199+
"arch": "aarch64",
200+
"platform": "darwin",
201+
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.18-macos-aarch64.tar.gz"
202+
},
203+
{
204+
"filename": "microsoft-jdk-17.0.18-linux-aarch64.tar.gz",
205+
"arch": "aarch64",
206+
"platform": "linux",
207+
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.18-linux-aarch64.tar.gz"
208+
},
209+
{
210+
"filename": "microsoft-jdk-17.0.18-windows-aarch64.zip",
211+
"arch": "aarch64",
212+
"platform": "win32",
213+
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.18-windows-aarch64.zip"
214+
}
215+
]
216+
},
174217
{
175218
"version": "17.0.10",
176219
"stable": true,
@@ -180,7 +223,7 @@
180223
"filename": "microsoft-jdk-17.0.10-macos-x64.tar.gz",
181224
"arch": "x64",
182225
"platform": "darwin",
183-
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.7-macos-x64.tar.gz"
226+
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.10-macos-x64.tar.gz"
184227
},
185228
{
186229
"filename": "microsoft-jdk-17.0.10-linux-x64.tar.gz",

0 commit comments

Comments
 (0)