[GR-53335] Fix arguments parsing in mx intellijinit.

PullRequest: mx/1780
graalvm · Apr 8, 2024 · 1505791 · 1505791
2 parents f5073d0 + 002d68c
commit 1505791
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git 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.19.2",
+  "mx_version": "7.19.3",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
-    "galahad-jdk":        {"name": "jpg-jdk",   "version": "23",      "build_id": "jdk-23+14-1010", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "galahad-jdk":        {"name": "jpg-jdk",   "version": "23",      "build_id": "jdk-23+16-1220", "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"] },
 
@@ -44,13 +44,13 @@
     "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21.0.2+13-jvmci-23.1-b33-debug", "platformspecific": true },
     "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21.0.2+13-jvmci-23.1-b33-sulong", "platformspecific": true },
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "23",      "build_id": "jdk-23+14", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-23+14-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-23+14-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-23+14-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-23+14-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-23+14-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-23+14-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "23",      "build_id": "jdk-23+17", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-23+17-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-23+17-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-23+17-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-23+17-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-23+17-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-23+17-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

diff --git a/src/mx/_impl/mx.py b/src/mx/_impl/mx.py
@@ -18146,7 +18146,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.20.0")  # [GR-50111] Code owners: show missing owners
+version = VersionSpec("7.21.0")  # [GR-53335] Fix arguments parsing in mx intellijinit
 
 _mx_start_datetime = datetime.utcnow()
 

diff --git a/src/mx/_impl/mx_ide_intellij.py b/src/mx/_impl/mx_ide_intellij.py
@@ -81,7 +81,7 @@ def intellijinit_cli(args):
     parser.add_argument('--on-save-actions', action='store_true', dest='on_save_actions', help='Generate On Save Actions: checkstyle format and optimize imports.')
     parser.add_argument('args', nargs=REMAINDER, metavar='...')
 
-    extra_args = os.environ.get('MX_INTELLIJINIT_DEFAULTS', '').strip().split(' ')
+    extra_args = os.environ.get('MX_INTELLIJINIT_DEFAULTS', '').split()
     if extra_args:
         mx.log("Applying extra arguments from MX_INTELLIJINIT_DEFAULTS environment variable")
     config = parser.parse_args(extra_args + args, namespace=IntellijConfig())