[macOS] Remove Java 7 (#2631)

* remove java 7

* remove unused function

images/macos/provision/core/openjdk.sh

@@ -1,26 +1,10 @@
 #!/bin/bash -e -o pipefail
 source ~/utils/utils.sh
 
-installAzulJDK() {
-    local URL=$1
-    local TMP_FILE=/tmp/openjdk.dmg
-    local TMP_MOUNT=`/usr/bin/mktemp -d /tmp/zulu.XXXX`
-    # Download dmg
-    download_with_retries $URL "/tmp" "openjdk.dmg"
-    # Attach dmg
-    hdiutil attach "${TMP_FILE}" -mountpoint "${TMP_MOUNT}"
-    # Install pkg
-    sudo installer -pkg "${TMP_MOUNT}/"*.pkg -target /
-    # Detach dmg
-    hdiutil detach "${TMP_MOUNT}"
-    # Remove dmg
-    rm -rf "${TMP_FILE}"
-}
-
 createEnvironmentVariable() {
     local VARIABLE_NAME=$1
     local JAVA_VERSION=$2
-    if [[ $JAVA_VERSION == "7" || $JAVA_VERSION == "8" ]]; then
+    if [[ $JAVA_VERSION == "8" ]]; then
         JAVA_VERSION="1.${JAVA_VERSION}"
     fi
     local JAVA_PATH=$(/usr/libexec/java_home -v${JAVA_VERSION})
@@ -33,11 +17,7 @@ JAVA_VERSIONS_LIST=($(get_toolset_value '.java.versions | .[]'))
 JAVA_DEFAULT=$(get_toolset_value '.java.default')
 for JAVA_VERSION in "${JAVA_VERSIONS_LIST[@]}"
 do
-    if [[ $JAVA_VERSION == "7" ]]; then
-        installAzulJDK "https://cdn.azul.com/zulu/bin/zulu7.44.0.11-ca-jdk7.0.292-macosx_x64.dmg"
-    else
-        brew install --cask "adoptopenjdk${JAVA_VERSION}"
-    fi
+    brew install --cask "adoptopenjdk${JAVA_VERSION}"
     createEnvironmentVariable "JAVA_HOME_${JAVA_VERSION}_X64" $JAVA_VERSION
 done
 

images/macos/software-report/SoftwareReport.Java.psm1

@@ -18,12 +18,11 @@ function Get-JavaVersions {
     return $javaVersions | Sort-Object $sortRules | ForEach-Object {
         $javaPath = $_.Value
         $version = Get-JavaFullVersion $javaPath
-        $vendor = $version.StartsWith("1.7") ? "Zulu" : "AdoptOpenJDK"
         $defaultPostfix = ($javaPath -eq $defaultJavaPath) ? " (default)" : ""
 
         [PSCustomObject] @{
             "Version" = $version + $defaultPostfix
-            "Vendor" = $vendor
+            "Vendor" = "AdoptOpenJDK"
             "Environment Variable" = $_.Name
         }
     }

images/macos/tests/Java.Tests.ps1

@@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
 
 function Get-NativeVersionFormat {
     param($Version)
-    if ($Version -in "7", "8") {
+    if ($Version -in "8") {
         return "1.${Version}"
     }
     return $Version
@@ -38,7 +38,6 @@ Describe "Java" {
             if ($_.Title -ne "Default") {
                 It "Version is valid" -TestCases $_ {
                     $javaRootPath = "/Library/Java/JavaVirtualMachines/adoptopenjdk-${Title}.jdk/Contents/Home"
-                    if ($Title -eq "7") { $javaRootPath = "/Library/Java/JavaVirtualMachines/zulu-7.jdk/Contents/Home" }
                     $javaBinPath = Join-Path $javaRootPath "/bin/java"
                     Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version
                 }

images/macos/toolsets/toolset-10.13.json

@@ -178,7 +178,7 @@
     "java": {
         "default": "8",
         "versions": [
-            "7", "8", "11", "12", "13", "14"
+            "8", "11", "12", "13", "14"
         ]
     },
     "android": {

images/macos/toolsets/toolset-10.14.json

@@ -198,7 +198,7 @@
     "java": {
         "default": "8",
         "versions": [
-            "7", "8", "11", "12", "13", "14"
+            "8", "11", "12", "13", "14"
         ]
     },
     "android": {

images/macos/toolsets/toolset-10.15.json

@@ -136,7 +136,7 @@
     "java": {
         "default": "8",
         "versions": [
-            "7", "8", "11", "12", "13", "14"
+            "8", "11", "12", "13", "14"
         ]
     },
     "android": {