Set EXTRA_ESPRESSO_(LLVM_)?JAVA_HOMES when building maven distributions

Author: gilles-duboscq

vm/ci/ci_common/common.jsonnet

@@ -161,7 +161,7 @@ local devkits = graal_common.devkits;
 
   full_vm_build: graal_common.deps.svm + graal_common.deps.sulong + graal_common.deps.truffleruby + graal_common.deps.graalpy + graal_common.deps.fastr + vm.custom_vm,
 
-  graalvm_complete_build_deps(edition, os, arch, java_version, espresso_java_version=25):
+  graalvm_complete_build_deps(edition, os, arch, java_version, espresso_java_version=25, espresso_extra_java_version=[21]):
       local java_deps(edition) = {
         downloads+: {
           JAVA_HOME: graal_common.jdks_data['labsjdk-' + edition + '-' + java_version],
@@ -176,6 +176,16 @@ local devkits = graal_common.devkits;
             TOOLS_JAVA_HOME: graal_common.jdks_data['oraclejdk21'],
           } else {
           }
+        ) + (
+          if (std.length(espresso_extra_java_version) > 0) then ({
+            EXTRA_ESPRESSO_JAVA_HOMES: {pathlist: [graal_common.jdks_data['labsjdk-ee-' + v] for v in espresso_extra_java_version]},
+          } + (
+            if (os == 'linux' || os == 'darwin') && (arch == 'amd64') then {
+              EXTRA_ESPRESSO_LLVM_JAVA_HOMEs:  {pathlist: [graal_common.jdks_data['labsjdk-ee-' + v + '-llvm'] for v in espresso_extra_java_version]},
+            } else {
+            }
+          )) else {
+          }
         )
       };