[GR-47141] Allow specification of explicit requires in suite module i…

…nfo specifications to allows distributions to explicitly override require modifiers like transient.

PullRequest: mx/1635

common.json

@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "6.27.6",
+  "mx_version": "6.29.0",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {

mx.py

@@ -18423,7 +18423,7 @@ def alarm_handler(signum, frame):
         abort(1, killsig=signal.SIGINT)
 
 # The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue
-version = VersionSpec("6.29.0")  # Run SpotBugs and ProGuard on compatible JDK versions
+version = VersionSpec("6.30.0")  # Support explicit requires in suite module infos.
 
 _mx_start_datetime = datetime.utcnow()
 _last_timestamp = _mx_start_datetime

mx_javamodules.py

@@ -698,7 +698,9 @@ def replicate(src, dst):
                 parts = entry.split()
                 qualifiers = parts[0:-1]
                 name = parts[-1]
-                requires.setdefault(name, set()).update(qualifiers)
+                # override automatic qualifiers like transitive if they are explicitly specified in the module info
+                # this allows to customize the default behavior.
+                requires[name] = qualifiers
             base_uses.update(module_info.get('uses', []))
             _process_exports((alt_module_info or module_info).get('exports', []), module_packages)