[macOS] Install Java 21 on MacOS 13 arm64 (#8545)

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")

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
         }
     }
-}
+}

images/macos/toolsets/toolset-13.json

@@ -27,7 +27,7 @@
         },
         "arm64": {
             "default": "17",
-            "versions": [ "11", "17" ]
+            "versions": [ "11", "17", "21"]
         }
     },
     "android": {