[GR-47526] Excluded LayoutDirDistribution from a maven deployment 2.

PullRequest: mx/1643

ci/common.jsonnet

@@ -121,7 +121,7 @@ local common_json = import "../common.json";
 
     graalnodejs:: {
       packages+: if self.os == "linux" then {
-        "00:devtoolset": "==7",
+        "00:devtoolset": "==11",
         cmake: "==3.22.2",
       } else {},
     },
@@ -141,11 +141,8 @@ local common_json = import "../common.json";
         "*.log",
       ],
 
-      packages+: if self.os == "linux" && self.arch == "amd64" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
-        "00:devtoolset": "==7",
-        "01:binutils": ">=2.34",
-      } else if self.os == "linux" && self.arch == "aarch64" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
-        "00:devtoolset": "==7",
+      packages+: if self.os == "linux" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
+        "00:devtoolset": "==11",
       } else {},
     },
   },

common.json

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

mx.py

@@ -6637,6 +6637,8 @@ def __init__(self, *args, **kw_args):
         # than breaking compatibility with the mis-behaving suites
         kw_args['archive_factory'] = NullArchiver
         super(LayoutDirDistribution, self).__init__(*args, **kw_args)
+        if getattr(self, 'maven', False):
+            self.abort("LayoutDirDistribution must not be a maven distribution.")
 
     def classpath_repr(self, resolve=True):
         return self.get_output()
@@ -11306,15 +11308,11 @@ def _addDevAttr(name, default=None):
         if dist.suite.getMxCompatibility().supportsLicenses() or validateMetadata == 'full':
             dist.abort("Distribution is missing 'license' attribute")
         dist.warn("Distribution's suite version is too old to have the 'license' attribute")
-    directDistDeps = [d for d in dist.deps if d.isDistribution()]
+    directDistDeps = [d for d in dist.deps if d.isDistribution() and not d.isLayoutDirDistribution()]
     directLibDeps = dist.excludedLibs
     if directDistDeps or directLibDeps:
         pom.open('dependencies')
         for dep in directDistDeps:
-            if dep.isLayoutDirDistribution():
-                # LayoutDirDistribution is always embedded in the dependent distribution.
-                logv(f"_genPom({dist}): ignoring layout dir dependency {dep} because it's embedded")
-                continue
             if dep.suite.internal:
                 warn(f"_genPom({dist}): ignoring internal dependency {dep}")
                 continue
@@ -18525,7 +18523,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.34.0")  # Excluded LayoutDirDistribution from a maven deployment as it's always embedded
+version = VersionSpec("6.35.0")  # LayoutDirDistribution forbids maven deployment.
 
 _mx_start_datetime = datetime.utcnow()
 _last_timestamp = _mx_start_datetime