[GR-68212] [GR-68313] Add deps.maven and deps.windows_devkit in ci/common.jsonnet and add mx maven-deploy-public-repo-dir in sdk

PullRequest: graal/21765

Author: eregon

ci/ci_common/common.jsonnet

@@ -138,8 +138,8 @@ common + common.frequencies + {
   linux_amd64: common.linux_amd64 + graal_common_extras + linux_deps_extras,
   linux_amd64_ol9: common.linux_amd64_ol9 + graal_common_extras + linux_deps_extras,
   linux_amd64_ubuntu: common.linux_amd64_ubuntu + graal_common_extras,
-  linux_aarch64: linux_deps_extras + common.linux_aarch64 + graal_common_extras,
-  linux_aarch64_ol9: linux_deps_extras + common.linux_aarch64_ol9 + graal_common_extras,
+  linux_aarch64: common.linux_aarch64 + graal_common_extras + linux_deps_extras,
+  linux_aarch64_ol9: common.linux_aarch64_ol9 + graal_common_extras + linux_deps_extras,
   darwin_amd64: common.darwin_amd64 + graal_common_extras,
   darwin_aarch64: common.darwin_aarch64 + graal_common_extras,
   windows_amd64: common.windows_amd64 + graal_common_extras,

ci/common.jsonnet

@@ -110,7 +110,8 @@ local common_json = import "../common.json";
     oraclejdkLatest: self["oraclejdk-latest"],
   },
 
-  # The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)
+  # The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js).
+  # See deps.windows_devkit to add a devkit on windows conveniently.
   devkits: {
     "windows-jdk17": { packages+: { "devkit:VS2022-17.1.0+1": "==0" }},
     "windows-jdk19": { packages+: { "devkit:VS2022-17.1.0+1": "==0" }},
@@ -175,6 +176,12 @@ local common_json = import "../common.json";
 
     # These dependencies are not included by default in any platform object
 
+    # Not included by default in $.windows_amd64 and $.windows_server_2016_amd64 because it needs jdk_name.
+    # As a note, Native Image needs this to build.
+    windows_devkit:: {
+      packages+: if self.os == "windows" then $.devkits["windows-" + self.jdk_name].packages else {},
+    },
+
     eclipse: {
       downloads+: {
         ECLIPSE: {
@@ -240,6 +247,21 @@ local common_json = import "../common.json";
       } else {},
     },
 
+    maven:: {
+      local this = self,
+      packages+: (if self.os == "linux" && self.arch == "amd64" then {
+        maven: '==3.9.10',
+      } else {}),
+      # no maven package available on other platforms
+      downloads+: (if self.os != "linux" || self.arch != "amd64" then {
+        # GR-68921: 3.9.10 does not work on Windows
+        MAVEN_HOME: {name: 'maven', version: (if this.os == "windows" then '3.3.9' else '3.9.10'), platformspecific: false},
+      } else {}),
+      setup+: (if self.os != "linux" || self.arch != "amd64" then [
+        ['set-export', 'PATH', (if self.os == "windows" then '$MAVEN_HOME\\bin;$PATH' else '$MAVEN_HOME/bin:$PATH')],
+      ] else []),
+    },
+
     sulong:: self.cmake + {
       packages+: if self.os == "windows" then {
         msvc_source: "==14.0",
@@ -276,12 +298,11 @@ local common_json = import "../common.json";
       } else {},
     },
 
-    graalpy:: self.gradle + self.cmake + {
+    graalpy:: self.gradle + self.cmake + self.maven + {
       packages+: if (self.os == "linux") then {
         libffi: '==3.2.1',
         bzip2: '==1.0.6',
         zlib: '==1.2.11',
-        maven: "==3.6.3",
       } else {},
     },
 

sdk/mx.sdk/mx_sdk.py

@@ -341,6 +341,10 @@ def description(self):
 def maven_deploy_public_repo_dir():
     return os.path.join(_suite.get_mx_output_dir(), 'public-maven-repo')
 
+@mx.command(_suite.name, 'maven-deploy-public-repo-dir')
+def print_maven_deploy_public_repo_dir(args):
+    print(maven_deploy_public_repo_dir())
+
 @mx.command(_suite.name, 'maven-deploy-public')
 def maven_deploy_public(args, licenses=None, deploy_snapshots=True):
     """Helper to simplify deploying all public Maven dependendencies into the mxbuild directory"""
@@ -373,7 +377,6 @@ def maven_deploy_public(args, licenses=None, deploy_snapshots=True):
     mx.log(f'mx maven-deploy {" ".join(deploy_args)}')
     mx.maven_deploy(deploy_args)
     mx.log(f'Deployed Maven artefacts to {path}')
-    return path
 
 @mx.command(_suite.name, 'nativebridge-benchmark')
 def nativebridge_benchmark(args):

sulong/ci/ci_common/sulong-common.jsonnet

@@ -80,10 +80,7 @@ local sulong_deps = common.deps.sulong;
   linux_aarch64:: linux_aarch64 + sulong_deps,
   darwin_amd64:: darwin_amd64 + sulong_deps,
   darwin_aarch64:: darwin_aarch64 + sulong_deps,
-  windows_amd64:: windows_amd64 + sulong_deps + {
-    local jdk = if self.jdk_name == "jdk-latest" then "jdkLatest" else self.jdk_name,
-    packages+: common.devkits["windows-" + jdk].packages
-  },
+  windows_amd64:: windows_amd64 + sulong_deps + common.deps.windows_devkit,
 
   sulong_notifications:: {
     notify_groups:: ["sulong"],

tools/ci/ci.jsonnet

@@ -2,7 +2,6 @@
   local common = import '../../ci/ci_common/common.jsonnet',
   local utils = import '../../ci/ci_common/common-utils.libsonnet',
   local top_level_ci = utils.top_level_ci,
-  local devkits = common.devkits,
 
   local tools_common = {
     setup+: [
@@ -92,8 +91,8 @@
     common.linux_aarch64 + common.labsjdkLatest   + tools_weekly,
     common.linux_aarch64 + common.labsjdk21   + tools_weekly,
 
-    common.windows_amd64 + common.oraclejdkLatest + tools_weekly + devkits["windows-jdkLatest"],
-    common.windows_amd64 + common.oraclejdk21 + tools_weekly + devkits["windows-jdk21"],
+    common.windows_amd64 + common.oraclejdkLatest + tools_weekly + common.deps.windows_devkit,
+    common.windows_amd64 + common.oraclejdk21 + tools_weekly + common.deps.windows_devkit,
 
     common.darwin_amd64  + common.oraclejdkLatest + tools_weekly,
     common.darwin_amd64  + common.oraclejdk21 + tools_weekly,