diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1 index f84da8acd..3e6ab8d6d 100644 --- a/images/win/scripts/Installers/Install-JavaTools.ps1 +++ b/images/win/scripts/Installers/Install-JavaTools.ps1 @@ -10,11 +10,7 @@ function Set-JavaPath { [switch] $Default ) - if ($Version -eq 7) { - $matchedString = "azure-jdk_7" - } else { - $matchedString = "jdk-?$Version" - } + $matchedString = "jdk-?$Version" $javaPath = (Get-ChildItem -Path $JavaRootPath | Where-Object { $_ -match $matchedString}).FullName if ([string]::IsNullOrEmpty($javaPath)) { @@ -51,15 +47,6 @@ function Set-JavaPath { } } -function Install-Java7FromAzul { - param( - [string] $DestinationPath - ) - $azulJDK7URL = 'https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u232/zulu-7-azure-jdk_7.31.0.5-7.0.232-win_x64.zip' - $archivePath = Start-DownloadWithRetry -Url $azulJDK7URL -Name $([IO.Path]::GetFileName($azulJDK7URL)) - Extract-7Zip -Path $archivePath -DestinationPath $DestinationPath -} - function Install-JavaFromAdoptOpenJDK { param( [string] $JDKVersion, @@ -82,11 +69,7 @@ $defaultVersion = (Get-ToolsetContent).java.default $javaRootPath = "C:\Program Files\Java\" foreach ($jdkVersion in $jdkVersions) { - if ($jdkVersion -eq 7) { - Install-Java7FromAzul -DestinationPath $javaRootPath - } else { - Install-JavaFromAdoptOpenJDK -JDKVersion $jdkVersion -DestinationPath $javaRootPath - } + Install-JavaFromAdoptOpenJDK -JDKVersion $jdkVersion -DestinationPath $javaRootPath if ($jdkVersion -eq $defaultVersion) { Set-JavaPath -Version $jdkVersion -JavaRootPath $javaRootPath -Default diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 index bfab1e24d..c319c5bea 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Java.psm1 +++ b/images/win/scripts/SoftwareReport/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 } } diff --git a/images/win/scripts/Tests/Java.Tests.ps1 b/images/win/scripts/Tests/Java.Tests.ps1 index 63332d0f1..36f965896 100644 --- a/images/win/scripts/Tests/Java.Tests.ps1 +++ b/images/win/scripts/Tests/Java.Tests.ps1 @@ -28,7 +28,7 @@ Describe "Java" { $result = Get-CommandResult "`"$javaPath`" -version" $result.ExitCode | Should -Be 0 - if ($Version -eq 7 -or $Version -eq 8) { + if ($Version -eq 8) { $Version = "1.${Version}" } $result.Output[0] | Should -Match ([regex]::Escape("openjdk version `"${Version}.")) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index 77bcd6f1c..c3efc7439 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -138,7 +138,7 @@ "java": { "default": "8", "versions": [ - "7", "8", "11", "13" + "8", "11", "13" ] }, "android": { diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 0b3435a08..df7f05337 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -138,7 +138,7 @@ "java": { "default": "8", "versions": [ - "7", "8", "11", "13" + "8", "11", "13" ] }, "android": {