From 24a830de3cc053ce96b8bbce43aa4453db5a50b0 Mon Sep 17 00:00:00 2001
From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com>
Date: Thu, 9 May 2024 13:16:00 +0200
Subject: [PATCH] [Ubuntu] Add missing Java SDKs to Ubuntu 24.04 (#9808)

---
 .../scripts/build/install-java-tools.sh       | 24 +++++++++----------
 .../docs-gen/Generate-SoftwareReport.ps1      |  4 +---
 images/ubuntu/scripts/tests/Java.Tests.ps1    |  2 +-
 images/ubuntu/toolsets/toolset-2404.json      |  2 ++
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/images/ubuntu/scripts/build/install-java-tools.sh b/images/ubuntu/scripts/build/install-java-tools.sh
index 6f09c4c2b..aecc19e63 100644
--- a/images/ubuntu/scripts/build/install-java-tools.sh
+++ b/images/ubuntu/scripts/build/install-java-tools.sh
@@ -70,21 +70,19 @@ echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium
 apt-get update
 
 # While Ubuntu 24.04 binaries are not released in the Adoptium repo, we will not install Java
-if ! is_ubuntu24; then
-    defaultVersion=$(get_toolset_value '.java.default')
-    jdkVersionsToInstall=($(get_toolset_value ".java.versions[]"))
+defaultVersion=$(get_toolset_value '.java.default')
+jdkVersionsToInstall=($(get_toolset_value ".java.versions[]"))
 
-    for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do
-        install_open_jdk ${jdkVersionToInstall}
+for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do
+    install_open_jdk ${jdkVersionToInstall}
 
-        if [[ ${jdkVersionToInstall} == ${defaultVersion} ]]
-        then
-            create_java_environment_variable ${jdkVersionToInstall} True
-        else
-            create_java_environment_variable ${jdkVersionToInstall} False
-        fi
-    done
-fi
+    if [[ ${jdkVersionToInstall} == ${defaultVersion} ]]
+    then
+        create_java_environment_variable ${jdkVersionToInstall} True
+    else
+        create_java_environment_variable ${jdkVersionToInstall} False
+    fi
+done
 
 # Install Ant
 apt-get install -y --no-install-recommends ant ant-optional
diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
index bb3569940..6531c1d29 100644
--- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
+++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
@@ -191,9 +191,7 @@ if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
 }
 
 # Java
-if (-not $(Test-IsUbuntu24)) {
-    $installedSoftware.AddHeader("Java").AddTable($(Get-JavaVersionsTable))
-}
+$installedSoftware.AddHeader("Java").AddTable($(Get-JavaVersionsTable))
 
 # PHP Tools
 $phpTools = $installedSoftware.AddHeader("PHP Tools")
diff --git a/images/ubuntu/scripts/tests/Java.Tests.ps1 b/images/ubuntu/scripts/tests/Java.Tests.ps1
index c0a98d387..548031309 100644
--- a/images/ubuntu/scripts/tests/Java.Tests.ps1
+++ b/images/ubuntu/scripts/tests/Java.Tests.ps1
@@ -1,6 +1,6 @@
 Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -DisableNameChecking
 
-Describe "Java" -Skip:(Test-IsUbuntu24) {
+Describe "Java" {
     $toolsetJava = (Get-ToolsetContent).java
     $defaultVersion = $toolsetJava.default
     $jdkVersions = $toolsetJava.versions
diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json
index 33faa204e..5891fff51 100644
--- a/images/ubuntu/toolsets/toolset-2404.json
+++ b/images/ubuntu/toolsets/toolset-2404.json
@@ -56,6 +56,8 @@
         }
     ],
     "java": {
+        "default": "17",
+        "versions": [ "8", "11", "17", "21"],
         "maven": "3.8.8"
     },
     "android": {