[GR-66866] Mark shadowed dependencies as generated, so that inspection warnings in those sources are disabled.

PullRequest: mx/1954

Author: jchalou

ci/common.jsonnet

@@ -57,6 +57,9 @@ local common_json = import "../common.json";
     for name in ["oraclejdk21"] + variants("labsjdk-ce-21") + variants("labsjdk-ee-21")
   } + {
     'oraclejdk24': jdk_base + common_json.jdks["oraclejdk24"] + { jdk_version:: 24 },
+  } + {
+    [name]: jdk_base + common_json.jdks[name] + { jdk_version:: 25 }
+    for name in ["oraclejdk25"] + variants("labsjdk-ce-25") + variants("labsjdk-ee-25")
   } + {
     [name]: jdk_base + common_json.jdks[name] + { jdk_version:: parse_labsjdk_version(self), jdk_name:: "jdk-latest"}
     for name in ["oraclejdk-latest"] + variants("labsjdk-ce-latest") + variants("labsjdk-ee-latest")

common.json

@@ -4,11 +4,11 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.57.1",
+  "mx_version": "7.58.1",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
-    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-26+4-323", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-26+5-361", "platformspecific": true, "extrabundles": ["static-libs"]},
 
     "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.7",  "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -45,13 +45,21 @@
 
     "oraclejdk24":       {"name": "jpg-jdk",   "version": "24", "build_id": "jdk-24.0.1+9", "platformspecific": true, "extrabundles": ["static-libs"]},
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "26",      "build_id": "jdk-26+4", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-26+4-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-26+4-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-26+4-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-26+4-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-26+4-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-26+4-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk25":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+26", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-25":      {"name": "labsjdk",   "version": "ce-25+26-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-25Debug": {"name": "labsjdk",   "version": "ce-25+26-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-25-llvm": {"name": "labsjdk",   "version": "ce-25+26-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-25":      {"name": "labsjdk",   "version": "ee-25+26-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-25Debug": {"name": "labsjdk",   "version": "ee-25+26-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-25-llvm": {"name": "labsjdk",   "version": "ee-25+26-jvmci-b01-sulong", "platformspecific": true },
+
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "26",      "build_id": "jdk-26+5", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-26+5-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-26+5-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-26+5-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-26+5-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-26+5-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-26+5-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

src/mx/_impl/mx_ide_intellij.py

@@ -493,13 +493,15 @@ def create_intellij_module(resource_path, module_type):
 
             moduleXml.open('content', attributes={'url': 'file://$MODULE_DIR$'})
             for src in p.srcDirs:
+                if hasattr(p, 'shadedDeps') and src == p.source_gen_dir():
+                    continue
                 srcDir = mx_util.ensure_dir_exists(join(p.dir, src))
                 moduleXml.element('sourceFolder', attributes={'url':'file://$MODULE_DIR$/' + os.path.relpath(srcDir, module_dir), 'isTestSource': str(p.is_test_project())})
             for name in ['.externalToolBuilders', '.settings', 'nbproject']:
                 _intellij_exclude_if_exists(moduleXml, p, name)
             moduleXml.close('content')
 
-            if processors:
+            if processors or hasattr(p, 'shadedDeps'):
                 moduleXml.open('content', attributes={'url': 'file://' + p.get_output_root()})
                 genDir = p.source_gen_dir()
                 mx_util.ensure_dir_exists(genDir)

src/mx/mx_version.py

@@ -1,2 +1,2 @@
 # The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue
-version = "7.58.4"  # GR-66372: gc-jdks should ignore symlinks
+version = "7.58.5"  # GR-66866: Suppress compile warnings in shaded jar projects in Truffle for Intellij.