Skip to content

Commit 6230926

Browse files
authored
Add java jdk 17.0.9 and 21.0.1 (#195)
1 parent 434a418 commit 6230926

File tree

9 files changed

+28
-12
lines changed

9 files changed

+28
-12
lines changed

src/VirtualClient/VirtualClient.Actions.FunctionalTests/SpecJvmProfileTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public async Task SpecJvmWorkloadProfileInstallsTheExpectedDependenciesOnLinuxPl
4444
this.mockFixture.Setup(PlatformID.Unix);
4545

4646
// The location of the Java (Java SDK) executable
47-
string expectedJavaExecutablePath = this.mockFixture.GetPackagePath("microsoft-jdk-17.0.5/linux-x64/bin/java");
47+
string expectedJavaExecutablePath = this.mockFixture.GetPackagePath("microsoft-jdk-17.0.9/linux-x64/bin/java");
4848
this.mockFixture.SetupFile(expectedJavaExecutablePath);
4949

5050
using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true))
@@ -68,7 +68,7 @@ public async Task SpecJvmWorkloadProfileInstallsTheExpectedDependenciesOnWindows
6868
this.mockFixture.Setup(PlatformID.Win32NT);
6969

7070
// The location of the Java (Java SDK) executable
71-
string expectedJavaExecutablePath = this.mockFixture.GetPackagePath(@"microsoft-jdk-17.0.5\win-x64\bin\java.exe");
71+
string expectedJavaExecutablePath = this.mockFixture.GetPackagePath(@"microsoft-jdk-17.0.9\win-x64\bin\java.exe");
7272
this.mockFixture.SetupFile(expectedJavaExecutablePath);
7373

7474
using (ProfileExecutor executor = TestDependencies.CreateProfileExecutor(profile, this.mockFixture.Dependencies, dependenciesOnly: true))

src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECJBB.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"Parameters": {
3939
"Scenario": "InstallJDKPackage",
4040
"BlobContainer": "packages",
41-
"BlobName": "microsoft-jdk-17.0.5.zip",
41+
"BlobName": "microsoft-jdk-17.0.9.zip",
4242
"PackageName": "javadevelopmentkit",
4343
"Extract": true
4444
}

src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECJVM.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"Parameters": {
4444
"Scenario": "InstallJDKPackage",
4545
"BlobContainer": "packages",
46-
"BlobName": "microsoft-jdk-17.0.5.zip",
46+
"BlobName": "microsoft-jdk-17.0.9.zip",
4747
"PackageName": "javadevelopmentkit",
4848
"Extract": true
4949
}

src/VirtualClient/VirtualClient.Main/profiles/POWER-SPEC100.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"Parameters": {
4040
"Scenario": "InstallJDKPackage",
4141
"BlobContainer": "packages",
42-
"BlobName": "microsoft-jdk-17.0.5.zip",
42+
"BlobName": "microsoft-jdk-17.0.9.zip",
4343
"PackageName": "javadevelopmentkit",
4444
"Extract": true
4545
}

src/VirtualClient/VirtualClient.Main/profiles/POWER-SPEC30.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"Parameters": {
3939
"Scenario": "InstallJDKPackage",
4040
"BlobContainer": "packages",
41-
"BlobName": "microsoft-jdk-17.0.5.zip",
41+
"BlobName": "microsoft-jdk-17.0.9.zip",
4242
"PackageName": "javadevelopmentkit",
4343
"Extract": true
4444
}

src/VirtualClient/VirtualClient.Main/profiles/POWER-SPEC50.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"Parameters": {
3939
"Scenario": "InstallJDKPackage",
4040
"BlobContainer": "packages",
41-
"BlobName": "microsoft-jdk-17.0.5.zip",
41+
"BlobName": "microsoft-jdk-17.0.9.zip",
4242
"PackageName": "javadevelopmentkit",
4343
"Extract": true
4444
}

src/VirtualClient/VirtualClient.Main/profiles/POWER-SPEC70.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"Parameters": {
3939
"Scenario": "InstallJDKPackage",
4040
"BlobContainer": "packages",
41-
"BlobName": "microsoft-jdk-17.0.5.zip",
41+
"BlobName": "microsoft-jdk-17.0.9.zip",
4242
"PackageName": "javadevelopmentkit",
4343
"Extract": true
4444
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "javadevelopmentkit",
3+
"description": "Microsoft Java Development Kit (JDK) and runtime.",
4+
"version": "21.0.1",
5+
"metadata": {
6+
}
7+
}

website/docs/dependencies/0050-install-java-jdk.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ The Java JDK Virtual Client uses is [Microsoft Build of OpenJDK](https://docs.mi
33
versions of OpenJDK, you need to use your own package store.
44

55
:::info
6-
This dependency does not download the JDK itself. The JDK package can be installed using the basic [`dependency package installation`](./0001-install-vc-packages.md).
6+
This dependency does not download the JDK itself. The JDK package can be installed using the basic [`dependency package installation`](./0001-install-vc-packages.md). Check example below.
77
:::
88

99
- [MSFT OpenJDK Installation Guide](https://docs.microsoft.com/en-us/java/openjdk/install)
@@ -16,6 +16,17 @@ This dependency does not download the JDK itself. The JDK package can be install
1616
* win-x64
1717
* win-arm64
1818

19+
## JDK version supported
20+
* microsoft-jdk-21.0.1
21+
* microsoft-jdk-17.0.9
22+
* microsoft-jdk-17.0.5
23+
* microsoft-jdk-17.0.3
24+
* microsoft-jdk-17.0.2
25+
* microsoft-jdk-16.0.2
26+
* microsoft-jdk-11.0.19
27+
28+
The JDK packaging process is currently manual. Please reachout to `[email protected]`, or raise a GitHub issue, to request a particular JDK build.
29+
1930
## Profile Component Parameters
2031
The following section describes the parameters used by the individual component in the profile.
2132

@@ -29,7 +40,6 @@ The following section describes the parameters used by the individual component
2940

3041
* [Profile Example](https://github.com/microsoft/VirtualClient/blob/main/src/VirtualClient/VirtualClient.Main/profiles/PERF-SPECJVM.json)
3142

32-
<div class="code-section">
3343

3444
```json
3545
{
@@ -49,5 +59,4 @@ The following section describes the parameters used by the individual component
4959
"PackageName": "javadevelopmentkit"
5060
}
5161
}
52-
```
53-
</div>
62+
```

0 commit comments

Comments
 (0)