upgrade testing environment for windows

Author: Gubaer

testing/windows/config.ps1

@@ -3,29 +3,28 @@
 # Parameters for two JDKs used in testing
 #
 $JDK_PARAMS = @{
-    jdk17 = @{
-        uri = "https://download.oracle.com/java/17/latest/jdk-17_windows-x64_bin.zip"
-        directory = "jdk17"
+    jdk11 = @{
+        uri = "https://aka.ms/download-jdk/microsoft-jdk-11.0.19-windows-x64.zip"
+        directory = "jdk-11.0.19+7"
     }
-    jdk20 = @{
-        uri = "https://download.oracle.com/java/20/latest/jdk-20_windows-x64_bin.zip"
-        directory = "jdk20"
+    jdk17 = @{
+        uri = "https://aka.ms/download-jdk/microsoft-jdk-17.0.7-windows-x64.zip"
+        directory = "jdk-17.0.7+7"
     }
 }
 
 #
 # Parameters for two GraalVM versions used in testing
 #
 $GRAALVM_PARAMS = @{
-
-    jdk17 = @{
-        uri = "https://download.oracle.com/graalvm/17/latest/graalvm-jdk-17_windows-x64_bin.zip"
-        directory = "graalvm-jdk17"
+    jdk11 = @{
+        uri = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.2/graalvm-ce-java11-windows-amd64-22.3.2.zip"
+        directory = "graalvm-ce-java11-22.3.2"
     }
 
-    jdk20 = @{
-        uri = "https://download.oracle.com/graalvm/20/latest/graalvm-jdk-20_windows-x64_bin.zip"
-        directory = "graalvm-jdk20"
+    jdk17 = @{
+        uri = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.2/graalvm-ce-java17-windows-amd64-22.3.2.zip"
+        directory = "graalvm-ce-java17-22.3.2"
     }
 }
 

testing/windows/josm.ps1

@@ -52,12 +52,12 @@ if (!$josm) {
 }
 
 if ($jdk) {
-    if (! ($jdk -eq "jdk17" -or $jdk -eq "jdk20")) {
-        Write-Error -Message "Unsupported JDK version '$jdk'. Use 'jdk17' or 'jdk20'." -Category InvalidArgument
+    if (! ($jdk -eq "jdk11" -or $jdk -eq "jdk17")) {
+        Write-Error -Message "Unsupported JDK version '$jdk'. Use 'jdk11' or 'jdk17'." -Category InvalidArgument
         Exit 1
     }
 } else {
-    $jdk = "jdk17"
+    $jdk = "jdk11"
 }
 
 if ($graalJs) {

testing/windows/manage.ps1

@@ -28,9 +28,9 @@ Usage: manage.ps1 action <args>
             create-josm-home
         download-josm latest|tested|<version>  
             download a JOSM version
-        download-jdk jdk17 | jdk20
+        download-jdk jdk11|jdk17
             downloads a portable OpenJDK and installs it in the current directory
-        download-graalvm jdk17 | jdk20
+        download-graalvm jdk11|jdk17
             downloads a GraalVM for Windows and installs it in the current directory
         download-graaljs 
             downloads a GraalJS for Windows and installs it in the current directory
@@ -181,19 +181,9 @@ function downloadJDK([string]$version) {
         Write-Warning "JDK with version '$version' already available in '$jdkDirectory'. Skipping download."
         return
     }
-    $localZipFile = $(Join-Path $(Get-Location) -ChildPath "$version.zip")
-    Invoke-WebRequest -Uri $downloadUrl -OutFile $localZipFile
-    Expand-Archive -Path $localZipFile -DestinationPath $(Get-Location)
-
-    Add-Type -assembly "system.io.compression.filesystem"
-    $zipFile = [io.compression.zipfile]::OpenRead($localZipFile)
-    $firstEntryName = $zipFile.Entries.FullName `
-        | Select-Object -first 1
-    $zipFile.Dispose()
-    $rootDirectory = $firstEntryName.Split("/")[0]
-    Rename-Item -Path $rootDirectory -NewName $jdkDirectory
-
-    Remove-Item -Path $localZipFile
+    Invoke-WebRequest -Uri $downloadUrl -OutFile "$version.zip"
+    Expand-Archive -Path $(Join-Path $(Get-Location) -ChildPath "$version.zip") -DestinationPath $(Get-Location)
+    Remove-Item -Path $(Join-Path $(Get-Location) -ChildPath "$version.zip")
 }
 
 function downloadGraalVM([string]$version) {
@@ -208,15 +198,7 @@ function downloadGraalVM([string]$version) {
     $localFile = "graalvm-for-$version.zip"
     Invoke-WebRequest -Uri $downloadUrl -OutFile $localFile
     Expand-Archive -Path $(Join-Path $(Get-Location) -ChildPath $localFile) -DestinationPath $(Get-Location)
-
-    Add-Type -assembly "system.io.compression.filesystem"
-    $zipFile = [io.compression.zipfile]::OpenRead($(Join-Path $(Get-Location) -ChildPath $localFile))
-    $firstEntryName = $zipFile.Entries.FullName `
-        | Select-Object -first 1
-    $zipFile.Dispose()
-    $rootDirectory = $firstEntryName.Split("/")[0]
     Remove-Item -Path $(Join-Path $(Get-Location) -ChildPath $localFile)
-    Rename-Item -Path $rootDirectory -NewName $graalVMDirectory
 
     # initiallize the JavaScript language
     . $graalVMDirectory\bin\gu.cmd install js
@@ -297,10 +279,10 @@ switch($action) {
     }
 
     "prepare" {
+        downloadJDK("jdk11")
         downloadJDK("jdk17")
-        downloadJDK("jdk20")
+        downloadGraalVM("jdk11")
         downloadGraalVM("jdk17")
-        downloadGraalVM("jdk20")
         downloadGraalJS($GRAALJS_PARAMS["latest"])
         downloadJosm("latest")
         downloadJosm("tested")
@@ -320,10 +302,11 @@ switch($action) {
     "download-jdk" {
         $version = $args[1]
         if (!$version) {
-            Write-Information "Using default version 'jdk17'"
-            $version = "jdk17"
+            Write-Error -Message "Missing command line argument for version" -Category InvalidArgument
+            Usage
+            Exit 1
         }
-        if (! ($version -eq "jdk17" -or $version -eq "jdk20")) {
+        if (! ($version -eq "jdk11" -or $version -eq "jdk17")) {
             Write-Error -Message "Unsupported JDK version '$version'" -Category InvalidArgument
             Usage
             Exit 1
@@ -334,10 +317,10 @@ switch($action) {
     "download-graalvm" {
         $version = $args[1]
         if (!$version) {
-            Write-Information "Using default version 'jdk17'"
-            $version = "jdk17"
+            Write-Information "Using default version 'jdk11'"
+            $version = "jdk11"
         }
-        if (!($version -eq "jdk17" -or $version -eq "jdk20")) {
+        if (!($version -eq "jdk11" -or $version -eq "jdk17")) {
             Write-Error -Message "Unsupported JDK version '$version'" -Category InvalidArgument
             Usage
             Exit 1