From 060ad1383a7231762cbd2d61a04116a2dc7905e0 Mon Sep 17 00:00:00 2001
From: Vasilii Polikarpov
 <126792224+vpolikarpov-akvelon@users.noreply.github.com>
Date: Fri, 13 Oct 2023 16:00:45 +0200
Subject: [PATCH] [macOS] Install Java 21 on MacOS 13 arm64 (#8545)

---
 .../macos/software-report/SoftwareReport.Generator.ps1 |  8 ++++----
 images/macos/software-report/SoftwareReport.Java.psm1  | 10 ++++++++--
 images/macos/toolsets/toolset-13.json                  |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1
index 428f9be7..7b6631d5 100644
--- a/images/macos/software-report/SoftwareReport.Generator.ps1
+++ b/images/macos/software-report/SoftwareReport.Generator.ps1
@@ -207,11 +207,11 @@ if (-not $os.IsVenturaArm64) {
     $browsers = $installedSoftware.AddHeader("Browsers")
     $browsers.AddNodes($(Build-BrowserSection))
     $browsers.AddNode($(Build-BrowserWebdriversEnvironmentTable))
-
-    # Java
-    $java = $installedSoftware.AddHeader("Java")
-    $java.AddTable($(Get-JavaVersions))
 }
+# Java
+$java = $installedSoftware.AddHeader("Java")
+$java.AddTable($(Get-JavaVersions))
+
 if (-not $os.IsVenturaArm64) {
     # Toolcache
     $toolcache = $installedSoftware.AddHeader("Cached Tools")
diff --git a/images/macos/software-report/SoftwareReport.Java.psm1 b/images/macos/software-report/SoftwareReport.Java.psm1
index 6b034d2a..c3f5020c 100644
--- a/images/macos/software-report/SoftwareReport.Java.psm1
+++ b/images/macos/software-report/SoftwareReport.Java.psm1
@@ -1,6 +1,12 @@
 function Get-JavaVersions {
     $defaultJavaPath = (Get-Item env:JAVA_HOME).value
-    $javaVersions = Get-Item env:JAVA_HOME_*_X64
+    
+    $os = Get-OSVersion
+    if ($os.IsVenturaArm64) {
+        $javaVersions = Get-Item env:JAVA_HOME_*_arm64
+    } else {
+        $javaVersions = Get-Item env:JAVA_HOME_*_X64
+    }
     $sortRules = @{
         Expression = { [Int32]$_.Name.Split("_")[2] }  
         Descending = $false
@@ -18,4 +24,4 @@ function Get-JavaVersions {
             "Environment Variable" = $_.Name
         }
     }
-}
\ No newline at end of file
+}
diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json
index 435aa8bc..0919ed58 100644
--- a/images/macos/toolsets/toolset-13.json
+++ b/images/macos/toolsets/toolset-13.json
@@ -27,7 +27,7 @@
         },
         "arm64": {
             "default": "17",
-            "versions": [ "11", "17" ]
+            "versions": [ "11", "17", "21"]
         }
     },
     "android": {