From 85fd0a2b9844164a9859366922785e4d82d0907d Mon Sep 17 00:00:00 2001 From: Tomas Zezula Date: Mon, 24 Jul 2023 10:51:01 +0200 Subject: [PATCH] Excluded LayoutDirDistribution from a maven deployment as it's always embedded. --- mx.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mx.py b/mx.py index e6b6a3ca..9ad408c5 100755 --- a/mx.py +++ b/mx.py @@ -11311,6 +11311,9 @@ def _addDevAttr(name, default=None): if directDistDeps or directLibDeps: pom.open('dependencies') for dep in directDistDeps: + if dep.isLayoutDirDistribution(): + # LayoutDirDistribution is always embedded in the dependent distribution. + continue if dep.suite.internal: warn(f"_genPom({dist}): ignoring internal dependency {dep}") continue @@ -18521,7 +18524,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.33.0") # Extend layout distribution file list entry by POSIX permissions. +version = VersionSpec("6.34.0") # Excluded LayoutDirDistribution from a maven deployment as it's always embedded _mx_start_datetime = datetime.utcnow() _last_timestamp = _mx_start_datetime