From eabc37ce4159ffdf96eb0032190b27aa67e8336d Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com>
Date: Thu, 26 May 2022 00:11:06 +0400
Subject: [PATCH] Add java tools installation to Ubuntu22 (#5612)

---
 .../scripts/SoftwareReport/SoftwareReport.Generator.ps1   | 8 +++-----
 images/linux/scripts/tests/Java.Tests.ps1                 | 4 ++--
 images/linux/ubuntu2204.pkr.hcl                           | 1 +
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index 4671f90b..030bfec0 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -183,11 +183,9 @@ $markdown += New-MDList -Style Unordered -Lines (@(
     ) | Sort-Object
 )
 
-if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) {
-    $markdown += New-MDHeader "Java" -Level 3
-    $markdown += Get-JavaVersions | New-MDTable
-    $markdown += New-MDNewLine
-}
+$markdown += New-MDHeader "Java" -Level 3
+$markdown += Get-JavaVersions | New-MDTable
+$markdown += New-MDNewLine
 
 if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
     $markdown += New-MDHeader "GraalVM" -Level 3
diff --git a/images/linux/scripts/tests/Java.Tests.ps1 b/images/linux/scripts/tests/Java.Tests.ps1
index 2621a584..9a16b566 100644
--- a/images/linux/scripts/tests/Java.Tests.ps1
+++ b/images/linux/scripts/tests/Java.Tests.ps1
@@ -1,6 +1,6 @@
 Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -DisableNameChecking
 
-Describe "Java" -Skip:(Test-IsUbuntu22) {
+Describe "Java" {
     $toolsetJava = (Get-ToolsetContent).java
     $defaultVersion = $toolsetJava.default
     $defaultVendor = $toolsetJava.default_vendor
@@ -50,7 +50,7 @@ Describe "Java" -Skip:(Test-IsUbuntu22) {
       "`"$javaPath`" -version" | Should -MatchCommandOutput ([regex]::Escape("openjdk version `"${Version}."))
     }
 
-    It "Java Adopt <Version>" -TestCases $adoptJdkVersions {
+    It "Java Adopt <Version>" -TestCases $adoptJdkVersions -Skip:(Test-IsUbuntu22) {
         $javaPath = Join-Path (Get-ChildItem ${env:AGENT_TOOLSDIRECTORY}\Java_Adopt_jdk\${Version}*) "x64\bin\java"
         "`"$javaPath`" -version" | Should -ReturnZeroExitCode
 
diff --git a/images/linux/ubuntu2204.pkr.hcl b/images/linux/ubuntu2204.pkr.hcl
index b82227ec..dffb9c3f 100644
--- a/images/linux/ubuntu2204.pkr.hcl
+++ b/images/linux/ubuntu2204.pkr.hcl
@@ -287,6 +287,7 @@ build {
                         "${path.root}/scripts/installers/google-cloud-sdk.sh",
                         "${path.root}/scripts/installers/haskell.sh",
                         "${path.root}/scripts/installers/heroku.sh",
+                        "${path.root}/scripts/installers/java-tools.sh",
                         "${path.root}/scripts/installers/kubernetes-tools.sh",
                         "${path.root}/scripts/installers/oc.sh",
                         "${path.root}/scripts/installers/miniconda.sh",