Skip to content

Commit 63cf344

Browse files
committed
[GR-47568] Implement new Maven dependency structure for Truffle Unchained.
PullRequest: js/2895
2 parents 8d8fecf + ff12aba commit 63cf344

File tree

4 files changed

+37
-11
lines changed

4 files changed

+37
-11
lines changed

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,25 @@ See [release calendar](https://www.graalvm.org/release-calendar/) for release da
1717
* Deprecated option `js.disable-eval`, superseded by `js.allow-eval`.
1818
* Implemented the [String.dedent](https://github.com/tc39/proposal-string-dedent) proposal. It is available in ECMAScript staging mode (`--js.ecmascript-version=staging`).
1919
* Duplicate named capture groups are now supported in regular expressions, as per the [duplicate named capturing groups](https://github.com/tc39/proposal-duplicate-named-capturing-groups) proposal.
20+
* The Maven coordinates for embedding the GraalVM JavaScript have been updated.
21+
For consuming the enterprise GraalVM JavaScript, use:
22+
```xml
23+
<dependency>
24+
<groupId>org.graalvm.polyglot</groupId>
25+
<artifactId>js</artifactId>
26+
<version>${graalvm.version}</version>
27+
<type>pom</type>
28+
</dependency>
29+
```
30+
For consuming the community GraalVM JavaScript, use:
31+
```xml
32+
<dependency>
33+
<groupId>org.graalvm.polyglot</groupId>
34+
<artifactId>js-community</artifactId>
35+
<version>${graalvm.version}</version>
36+
<type>pom</type>
37+
</dependency>
38+
```
2039

2140
## Version 23.0.0
2241
* Implemented the [WebAssembly reference types](https://github.com/WebAssembly/reference-types) proposal.

common.json

Lines changed: 1 addition & 1 deletion
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": {

graal-js/mx.graal-js/suite.py

Lines changed: 8 additions & 3 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

44
"name" : "graal-js",
55

@@ -24,7 +24,7 @@
2424
{
2525
"name" : "regex",
2626
"subdir" : True,
27-
"version" : "5097b1dabf01fd6d2ea1ea3b470060a138d49fa2",
27+
"version" : "91267e34e4f58b6484736be6a5e83ebe97c6b44d",
2828
"urls" : [
2929
{"url" : "https://github.com/oracle/graal.git", "kind" : "git"},
3030
]
@@ -447,6 +447,7 @@
447447
"description" : "Graal JavaScript implementation",
448448
"maven" : {
449449
"artifactId" : "js-language",
450+
"tag": ["default", "public"],
450451
},
451452
"license": [
452453
"UPL", # Main code
@@ -455,15 +456,17 @@
455456
"allowsJavadocWarnings": True,
456457
},
457458

458-
"GRAALJS_COMMUNITY" : {
459+
"JS_COMMUNITY" : {
459460
"type":"pom",
460461
"runtimeDependencies" : [
461462
"GRAALJS",
462463
"truffle:TRUFFLE_RUNTIME",
463464
],
464465
"description" : "Graal JavaScript engine.",
465466
"maven" : {
467+
"groupId": "org.graalvm.polyglot",
466468
"artifactId" : "js-community",
469+
"tag": ["default", "public"],
467470
},
468471
"license": [
469472
"UPL", # Main code
@@ -488,6 +491,7 @@
488491
"description" : "Graal JavaScript Launcher",
489492
"maven" : {
490493
"artifactId" : "js-launcher",
494+
"tag": ["default", "public"],
491495
},
492496
"allowsJavadocWarnings": True,
493497
},
@@ -508,6 +512,7 @@
508512
"description" : "Graal JavaScript ScriptEngine",
509513
"maven" : {
510514
"artifactId" : "js-scriptengine",
515+
"tag": ["default", "public"],
511516
},
512517
"allowsJavadocWarnings": True,
513518
},

graal-js/test/maven-demo/pom.xml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454

5555
<dependencies>
5656
<dependency>
57-
<groupId>org.graalvm.sdk</groupId>
58-
<artifactId>graal-sdk</artifactId>
57+
<groupId>org.graalvm.polyglot</groupId>
58+
<artifactId>polyglot</artifactId>
5959
<version>${graalvm.version}</version>
6060
</dependency>
6161
<dependency>
@@ -65,22 +65,24 @@
6565
</dependency>
6666
<!-- runtime -->
6767
<dependency>
68-
<groupId>org.graalvm.js</groupId>
68+
<groupId>org.graalvm.polyglot</groupId>
6969
<artifactId>js-community</artifactId>
7070
<version>${graalvm.version}</version>
7171
<type>pom</type>
7272
<scope>runtime</scope>
7373
</dependency>
7474
<dependency>
75-
<groupId>org.graalvm.tools</groupId>
76-
<artifactId>profiler</artifactId>
75+
<groupId>org.graalvm.polyglot</groupId>
76+
<artifactId>profiler-community</artifactId>
7777
<version>${graalvm.version}</version>
78+
<type>pom</type>
7879
<scope>runtime</scope>
7980
</dependency>
8081
<dependency>
81-
<groupId>org.graalvm.tools</groupId>
82-
<artifactId>chromeinspector</artifactId>
82+
<groupId>org.graalvm.polyglot</groupId>
83+
<artifactId>inspect-community</artifactId>
8384
<version>${graalvm.version}</version>
85+
<type>pom</type>
8486
<scope>runtime</scope>
8587
</dependency>
8688
<!-- test -->

0 commit comments

Comments
 (0)