[GR-21590] Update imports

PullRequest: graalpython/3181

Author: msimacek

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "af0d52eb5dfe7fd02ca5ec0d61fb6b8979944714" }
+{ "overlay": "9a8c4eb0e43244257b545c73d64913f13dd9967d" }

graalpython/com.oracle.graal.python.test/src/tests/standalone/test_standalone.py

@@ -48,7 +48,7 @@
 is_enabled = 'ENABLE_STANDALONE_UNITTESTS' in os.environ and os.environ['ENABLE_STANDALONE_UNITTESTS'] == "true"
 skip_purge = 'SKIP_STANDALONE_UNITTESTS_PURGE' in os.environ and os.environ['SKIP_STANDALONE_UNITTESTS_PURGE'] == "true"
 
-MVN_CMD = [shutil.which('mvn')]
+MVN_CMD = [shutil.which('mvn'), "--batch-mode"]
 
 def run_cmd(cmd, env, cwd=None):
     print(f"Executing:\n    {cmd=}\n")
@@ -87,7 +87,6 @@ def get_gp():
             "native-image exists: " + str(os.path.exists(ni)),
             "javac exists: " + str(os.path.exists(jc)),
             "graalpy exits: " + str(os.path.exists(graalpy)),
-            "java exists: " + str(os.path.exists(java)),
             sep="\n",
         )
         assert False

graalpython/lib-graalpython/modules/standalone/__main__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -395,7 +395,7 @@ def download_maven_artifact(modules_path, artifact, parsed_args):
     cmd += ["-v", MVN_GRAALPY_VERSION]
     cmd += ["-o", modules_path]
     if parsed_args.verbose:
-        print(f"downloading graalpython maven artefacts: {' '.join(cmd)}")
+        print(f"downloading graalpython maven artifacts: {' '.join(cmd)}")
 
     if parsed_args.verbose:
         p = subprocess.run(cmd)

mx.graalpython/suite.py

@@ -45,31 +45,31 @@
             },
             {
                 "name": "sdk",
-                "version": "f9b06626162a843360d00e71193821e42d7a9f06",
+                "version": "21e21a8f00f6333b91bcd3b1a25eaa5616f008a1",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "tools",
-                "version": "f9b06626162a843360d00e71193821e42d7a9f06",
+                "version": "21e21a8f00f6333b91bcd3b1a25eaa5616f008a1",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "f9b06626162a843360d00e71193821e42d7a9f06",
+                "version": "21e21a8f00f6333b91bcd3b1a25eaa5616f008a1",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "f9b06626162a843360d00e71193821e42d7a9f06",
+                "version": "21e21a8f00f6333b91bcd3b1a25eaa5616f008a1",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},