From bafad626087bccdc7cb1032cca68a5bcddff1ff2 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Wed, 12 Jun 2024 20:09:39 +0200 Subject: [PATCH 1/3] Add default manifest entries to maven jars. --- src/mx/_impl/mx.py | 2 +- src/mx/_impl/mx_jardistribution.py | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/mx/_impl/mx.py b/src/mx/_impl/mx.py index 60f7ad99..b7e32dd3 100755 --- a/src/mx/_impl/mx.py +++ b/src/mx/_impl/mx.py @@ -18173,7 +18173,7 @@ def alarm_handler(signum, frame): _CACHE_DIR = get_env('MX_CACHE_DIR', join(dot_mx_dir(), 'cache')) # The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue -version = VersionSpec("7.25.14") # mergetool-suite-import conflict marker +version = VersionSpec("7.26.0") # GR-54502 _mx_start_datetime = datetime.utcnow() diff --git a/src/mx/_impl/mx_jardistribution.py b/src/mx/_impl/mx_jardistribution.py index e151c5ce..ea30f702 100644 --- a/src/mx/_impl/mx_jardistribution.py +++ b/src/mx/_impl/mx_jardistribution.py @@ -779,6 +779,19 @@ def stage_archive(self): + self.manifest['Main-Class'] + " of the " + dist.name + " distribution. There should be only one definition.") self.manifest['Main-Class'] = mainClass + if self.dist.maven: + developer = self.dist.suite.developer + release_version = self.dist.suite.release_version() + + self.manifest.setdefault('Name', self.dist.maven_artifact_id()) + + for group in 'Specification', 'Implementation': + if hasattr(dist, 'description'): + self.manifest.setdefault(f'{group}-Title', dist.description) + self.manifest.setdefault(f'{group}-Version', release_version) + if 'organization' in developer: + self.manifest.setdefault(f'{group}-Vendor', developer['organization']) + for dep in head + tail: self.stage_dep(dep) From 292d734c97ef29518b7a1eb7e6f7679c9ea8b6b0 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Wed, 12 Jun 2024 20:53:58 +0200 Subject: [PATCH 2/3] Do not attempt to infer a Title. For example, `TRUFFLE_API` has a new line in the module description, which makes the Title illegal. --- src/mx/_impl/mx_jardistribution.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/mx/_impl/mx_jardistribution.py b/src/mx/_impl/mx_jardistribution.py index ea30f702..6c3b5d57 100644 --- a/src/mx/_impl/mx_jardistribution.py +++ b/src/mx/_impl/mx_jardistribution.py @@ -786,8 +786,6 @@ def stage_archive(self): self.manifest.setdefault('Name', self.dist.maven_artifact_id()) for group in 'Specification', 'Implementation': - if hasattr(dist, 'description'): - self.manifest.setdefault(f'{group}-Title', dist.description) self.manifest.setdefault(f'{group}-Version', release_version) if 'organization' in developer: self.manifest.setdefault(f'{group}-Vendor', developer['organization']) From e79ec6b9d74697337e721807634c7bbaae668bf6 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Mon, 17 Jun 2024 13:29:26 +0200 Subject: [PATCH 3/3] Sync common.json. --- common.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/common.json b/common.json index 482ad596..02233e65 100644 --- a/common.json +++ b/common.json @@ -4,11 +4,11 @@ "Jsonnet files should not include this file directly but use ci/common.jsonnet instead." ], - "mx_version": "7.25.5", + "mx_version": "7.25.14", "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet", "jdks": { - "galahad-jdk": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+1-1", "platformspecific": true, "extrabundles": ["static-libs"]}, + "galahad-jdk": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+2-53", "platformspecific": true, "extrabundles": ["static-libs"]}, "oraclejdk11": {"name": "jpg-jdk", "version": "11.0.11", "build_id": "jdk-11.0.11+9", "platformspecific": true, "extrabundles": ["static-libs"] }, @@ -45,13 +45,13 @@ "labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21.0.2+13-jvmci-23.1-b33-sulong", "platformspecific": true }, "graalvm-ee-21": {"name": "graalvm-java21", "version": "23.1.3", "platformspecific": true }, - "oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+1", "platformspecific": true, "extrabundles": ["static-libs"]}, - "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+1-jvmci-b01", "platformspecific": true }, - "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+1-jvmci-b01-debug", "platformspecific": true }, - "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+1-jvmci-b01-sulong", "platformspecific": true }, - "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+1-jvmci-b01", "platformspecific": true }, - "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+1-jvmci-b01-debug", "platformspecific": true }, - "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+1-jvmci-b01-sulong", "platformspecific": true } + "oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+2", "platformspecific": true, "extrabundles": ["static-libs"]}, + "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+2-jvmci-b01", "platformspecific": true }, + "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+2-jvmci-b01-debug", "platformspecific": true }, + "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+2-jvmci-b01-sulong", "platformspecific": true }, + "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+2-jvmci-b01", "platformspecific": true }, + "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+2-jvmci-b01-debug", "platformspecific": true }, + "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+2-jvmci-b01-sulong", "platformspecific": true } }, "eclipse": {