[GR-47568] Implement new Maven dependency structure for Truffle Uncha…

…ined. PullRequest: truffleruby/3945
oracle · Aug 17, 2023 · 0315d12 · 0315d12
2 parents b2cec7c + 1fa4226
commit 0315d12
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/common.json b/common.json
@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "6.40.1",
+  "mx_version": "6.41.0",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
@@ -35,12 +35,12 @@
     "labsjdk-ee-20-llvm": {"name": "labsjdk",   "version": "ee-20.0.2+2-jvmci-23.1-b02-sulong", "platformspecific": true },
 
     "oraclejdk21":        {"name": "jpg-jdk",   "version": "21",      "build_id": "33", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-21":      {"name": "labsjdk",   "version": "ce-21+34-jvmci-23.1-b12", "platformspecific": true },
-    "labsjdk-ce-21Debug": {"name": "labsjdk",   "version": "ce-21+34-jvmci-23.1-b12-debug", "platformspecific": true },
-    "labsjdk-ce-21-llvm": {"name": "labsjdk",   "version": "ce-21+34-jvmci-23.1-b12-sulong", "platformspecific": true },
-    "labsjdk-ee-21":      {"name": "labsjdk",   "version": "ee-21+34-jvmci-23.1-b12", "platformspecific": true },
-    "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21+34-jvmci-23.1-b12-debug", "platformspecific": true },
-    "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21+34-jvmci-23.1-b12-sulong", "platformspecific": true },
+    "labsjdk-ce-21":      {"name": "labsjdk",   "version": "ce-21+35-jvmci-23.1-b13", "platformspecific": true },
+    "labsjdk-ce-21Debug": {"name": "labsjdk",   "version": "ce-21+35-jvmci-23.1-b13-debug", "platformspecific": true },
+    "labsjdk-ce-21-llvm": {"name": "labsjdk",   "version": "ce-21+35-jvmci-23.1-b13-sulong", "platformspecific": true },
+    "labsjdk-ee-21":      {"name": "labsjdk",   "version": "ee-21+35-jvmci-23.1-b13", "platformspecific": true },
+    "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21+35-jvmci-23.1-b13-debug", "platformspecific": true },
+    "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21+35-jvmci-23.1-b13-sulong", "platformspecific": true },
 
     "oraclejdk22":        {"name": "jpg-jdk",   "version": "22",      "build_id": "2", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}
   },

diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
@@ -1,5 +1,5 @@
 suite = {
-    "mxversion": "6.37.0",
+    "mxversion": "6.41.0",
     "name": "truffleruby",
     "groupId": "org.graalvm.ruby",
     "url": "https://www.graalvm.org/ruby/",
@@ -20,7 +20,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "5d3f38217ee7bc80f1287640bf1e7499db37ae98",
+                "version": "97a02e74911e7446dbf53098f885bc2fceba6770",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -29,7 +29,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "5d3f38217ee7bc80f1287640bf1e7499db37ae98",
+                "version": "97a02e74911e7446dbf53098f885bc2fceba6770",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -412,6 +412,7 @@
             "license": ["EPL-2.0"],
             "maven": {
                 "artifactId": "ruby-annotations",
+                "tag": ["default", "public"],
             },
             "noMavenJavadoc": True,
         },
@@ -438,6 +439,7 @@
             "license": ["EPL-2.0"],
             "maven": {
                 "artifactId": "ruby-shared",
+                "tag": ["default", "public"],
             },
             "noMavenJavadoc": True,
         },
@@ -504,19 +506,22 @@
             ],
             "maven": {
                 "artifactId": "ruby-language",
+                "tag": ["default", "public"],
             },
             "noMavenJavadoc": True,
         },
 
-        "TRUFFLERUBY_COMMUNITY": {
+        "RUBY_COMMUNITY": {
             "type": "pom",
             "runtimeDependencies": [
                 "TRUFFLERUBY",
                 "truffle:TRUFFLE_RUNTIME",
             ],
             "description": "TruffleRuby (GraalVM Ruby)",
             "maven": {
+                "groupId": "org.graalvm.polyglot",
                 "artifactId": "ruby-community",
+                "tag": ["default", "public"],
             },
             "license": [
                 "EPL-2.0",          # JRuby (we're choosing EPL out of EPL,GPL,LGPL)