From 38ec51131da95040b6b01c55026cdf605a014f2a Mon Sep 17 00:00:00 2001
From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com>
Date: Fri, 1 May 2020 08:58:16 -0700
Subject: [PATCH] Added java 13 package in VM (#795)

* Added java 13 package in VM

* Fixed var name

* Make changes from 11 to 13

* added java 13 for validate-javatool
---
 images/win/scripts/Installers/Install-JavaTools.ps1  |  8 ++++++++
 images/win/scripts/Installers/Validate-JavaTools.ps1 | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/images/win/scripts/Installers/Install-JavaTools.ps1 b/images/win/scripts/Installers/Install-JavaTools.ps1
index e88fc7453..96282371b 100644
--- a/images/win/scripts/Installers/Install-JavaTools.ps1
+++ b/images/win/scripts/Installers/Install-JavaTools.ps1
@@ -8,22 +8,26 @@
 $azulJDK7Uri = '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'
 $azulJDK8Uri = 'https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u222/zulu-8-azure-jdk_8.40.0.25-8.0.222-win_x64.zip'
 $azulJDK11Uri = 'https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.4/zulu-11-azure-jdk_11.33.15-11.0.4-win_x64.zip'
+$azulJDK13Uri = 'https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.3/zulu-13-azure-jdk_13.31.11-13.0.3-win_x64.zip'
 
 cd $env:TEMP
 
 Invoke-WebRequest -UseBasicParsing -Uri $azulJDK7Uri -OutFile azulJDK7.zip
 Invoke-WebRequest -UseBasicParsing -Uri $azulJDK8Uri -OutFile azulJDK8.zip
 Invoke-WebRequest -UseBasicParsing -Uri $azulJDK11Uri -OutFile azulJDK11.zip
+Invoke-WebRequest -UseBasicParsing -Uri $azulJDK13Uri -OutFile azulJDK13.zip
 
 # Expand the zips
 Expand-Archive -Path azulJDK7.zip -DestinationPath "C:\Program Files\Java\" -Force
 Expand-Archive -Path azulJDK8.zip -DestinationPath "C:\Program Files\Java\" -Force
 Expand-Archive -Path azulJDK11.zip -DestinationPath "C:\Program Files\Java\" -Force
+Expand-Archive -Path azulJDK13.zip -DestinationPath "C:\Program Files\Java\" -Force
 
 # Deleting zip folders
 Remove-Item -Recurse -Force azulJDK7.zip
 Remove-Item -Recurse -Force azulJDK8.zip
 Remove-Item -Recurse -Force azulJDK11.zip
+Remove-Item -Recurse -Force azulJDK13.zip
 
 Import-Module -Name ImageHelpers -Force
 
@@ -49,6 +53,9 @@ $latestJava8Install = $java8Installs.FullName;
 $java11Installs = Get-ChildItem -Path 'C:\Program Files\Java' -Filter '*azure-jdk*11*' | Sort-Object -Property Name -Descending | Select-Object -First 1
 $latestJava11Install = $java11Installs.FullName;
 
+$java13Installs = Get-ChildItem -Path 'C:\Program Files\Java' -Filter '*azure-jdk*13*' | Sort-Object -Property Name -Descending | Select-Object -First 1
+$latestJava13Install = $java13Installs.FullName;
+
 $newPath = [string]::Join(';', $newPathSegments)
 $newPath = $latestJava8Install + '\bin;' + $newPath
 
@@ -58,6 +65,7 @@ setx JAVA_HOME $latestJava8Install /M
 setx JAVA_HOME_7_X64 $latestJava7Install /M
 setx JAVA_HOME_8_X64 $latestJava8Install /M
 setx JAVA_HOME_11_X64 $latestJava11Install /M
+setx JAVA_HOME_13_X64 $latestJava13Install /M
 
 # Install Java tools
 # Force chocolatey to ignore dependencies on Ant and Maven or else they will download the Oracle JDK
diff --git a/images/win/scripts/Installers/Validate-JavaTools.ps1 b/images/win/scripts/Installers/Validate-JavaTools.ps1
index 714776890..33f906949 100644
--- a/images/win/scripts/Installers/Validate-JavaTools.ps1
+++ b/images/win/scripts/Installers/Validate-JavaTools.ps1
@@ -36,6 +36,12 @@ if( $( $(& $env:comspec "/s /c java -version 2>&1") | Out-String) -match  '^(?<v
    $java11Version = $Matches.version
 }
 
+$env:Path = $env:JAVA_HOME_13_X64 + "\bin;" + $env:Path
+
+if( $( $(& $env:comspec "/s /c java -version 2>&1") | Out-String) -match  '^(?<vendor>.+) version "(?<version>.+)".*' )
+{
+   $java13Version = $Matches.version
+}
 
 if( $(ant -version) -match  'Apache Ant\(TM\) version (?<version>.*) compiled.*' )
 {
@@ -69,6 +75,10 @@ _Location:_ $env:JAVA_HOME_7_X64
 #### $java11Version
 
 _Location:_ $env:JAVA_HOME_11_X64
+
+#### $java13Version
+
+_Location:_ $env:JAVA_HOME_13_X64
 "@
 
 Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description