Skip to content

Commit 0315d12

Browse files
committed
[GR-47568] Implement new Maven dependency structure for Truffle Unchained.
PullRequest: truffleruby/3945
2 parents b2cec7c + 1fa4226 commit 0315d12

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

common.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "6.40.1",
7+
"mx_version": "6.41.0",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
@@ -35,12 +35,12 @@
3535
"labsjdk-ee-20-llvm": {"name": "labsjdk", "version": "ee-20.0.2+2-jvmci-23.1-b02-sulong", "platformspecific": true },
3636

3737
"oraclejdk21": {"name": "jpg-jdk", "version": "21", "build_id": "33", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
38-
"labsjdk-ce-21": {"name": "labsjdk", "version": "ce-21+34-jvmci-23.1-b12", "platformspecific": true },
39-
"labsjdk-ce-21Debug": {"name": "labsjdk", "version": "ce-21+34-jvmci-23.1-b12-debug", "platformspecific": true },
40-
"labsjdk-ce-21-llvm": {"name": "labsjdk", "version": "ce-21+34-jvmci-23.1-b12-sulong", "platformspecific": true },
41-
"labsjdk-ee-21": {"name": "labsjdk", "version": "ee-21+34-jvmci-23.1-b12", "platformspecific": true },
42-
"labsjdk-ee-21Debug": {"name": "labsjdk", "version": "ee-21+34-jvmci-23.1-b12-debug", "platformspecific": true },
43-
"labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21+34-jvmci-23.1-b12-sulong", "platformspecific": true },
38+
"labsjdk-ce-21": {"name": "labsjdk", "version": "ce-21+35-jvmci-23.1-b13", "platformspecific": true },
39+
"labsjdk-ce-21Debug": {"name": "labsjdk", "version": "ce-21+35-jvmci-23.1-b13-debug", "platformspecific": true },
40+
"labsjdk-ce-21-llvm": {"name": "labsjdk", "version": "ce-21+35-jvmci-23.1-b13-sulong", "platformspecific": true },
41+
"labsjdk-ee-21": {"name": "labsjdk", "version": "ee-21+35-jvmci-23.1-b13", "platformspecific": true },
42+
"labsjdk-ee-21Debug": {"name": "labsjdk", "version": "ee-21+35-jvmci-23.1-b13-debug", "platformspecific": true },
43+
"labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21+35-jvmci-23.1-b13-sulong", "platformspecific": true },
4444

4545
"oraclejdk22": {"name": "jpg-jdk", "version": "22", "build_id": "2", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}
4646
},

mx.truffleruby/suite.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
suite = {
2-
"mxversion": "6.37.0",
2+
"mxversion": "6.41.0",
33
"name": "truffleruby",
44
"groupId": "org.graalvm.ruby",
55
"url": "https://www.graalvm.org/ruby/",
@@ -20,7 +20,7 @@
2020
{
2121
"name": "regex",
2222
"subdir": True,
23-
"version": "5d3f38217ee7bc80f1287640bf1e7499db37ae98",
23+
"version": "97a02e74911e7446dbf53098f885bc2fceba6770",
2424
"urls": [
2525
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
2626
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -29,7 +29,7 @@
2929
{
3030
"name": "sulong",
3131
"subdir": True,
32-
"version": "5d3f38217ee7bc80f1287640bf1e7499db37ae98",
32+
"version": "97a02e74911e7446dbf53098f885bc2fceba6770",
3333
"urls": [
3434
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
3535
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -412,6 +412,7 @@
412412
"license": ["EPL-2.0"],
413413
"maven": {
414414
"artifactId": "ruby-annotations",
415+
"tag": ["default", "public"],
415416
},
416417
"noMavenJavadoc": True,
417418
},
@@ -438,6 +439,7 @@
438439
"license": ["EPL-2.0"],
439440
"maven": {
440441
"artifactId": "ruby-shared",
442+
"tag": ["default", "public"],
441443
},
442444
"noMavenJavadoc": True,
443445
},
@@ -504,19 +506,22 @@
504506
],
505507
"maven": {
506508
"artifactId": "ruby-language",
509+
"tag": ["default", "public"],
507510
},
508511
"noMavenJavadoc": True,
509512
},
510513

511-
"TRUFFLERUBY_COMMUNITY": {
514+
"RUBY_COMMUNITY": {
512515
"type": "pom",
513516
"runtimeDependencies": [
514517
"TRUFFLERUBY",
515518
"truffle:TRUFFLE_RUNTIME",
516519
],
517520
"description": "TruffleRuby (GraalVM Ruby)",
518521
"maven": {
522+
"groupId": "org.graalvm.polyglot",
519523
"artifactId": "ruby-community",
524+
"tag": ["default", "public"],
520525
},
521526
"license": [
522527
"EPL-2.0", # JRuby (we're choosing EPL out of EPL,GPL,LGPL)

0 commit comments

Comments
 (0)