[GR-46205] Duplicated com.oracle.truffle.tools.utils.json.

Author: tzezula

espresso/mx.espresso/mx_espresso.py

@@ -323,7 +323,7 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
 def register_espresso_envs(suite):
     # pylint: disable=bad-whitespace
     # pylint: disable=line-too-long
-    tools = ['cov', 'dap', 'ins', 'insight', 'insightheap', 'lsp', 'pro']
+    tools = ['cov', 'dap', 'ins', 'insight', 'insightheap', 'lsp', 'pro', 'truffle-json']
     _llvm_toolchain_wrappers = ['bgraalvm-native-clang', 'bgraalvm-native-clang-cl', 'bgraalvm-native-clang++', 'bgraalvm-native-flang', 'bgraalvm-native-ld', 'bgraalvm-native-binutil']
     if LLVM_JAVA_HOME:
         mx_sdk_vm.register_vm_config('espresso-jvm',       ['java', 'ejvm', 'ellvm', 'libpoly', 'nfi-libffi', 'nfi', 'sdk', 'sdkl', 'tfl', 'tfla', 'cmp', 'antlr4', 'llrc', 'llrn'                                                    , 'elau'                                                                                                                                                ] + tools, suite, env_file='jvm-llvm')

tools/mx.tools/mx_tools.py

@@ -212,6 +212,7 @@ def _tools_gate_runner(args, tasks):
     dir_name='lsp',
     license_files=[],
     third_party_license_files=[],
+    dependencies=['Truffle', 'Truffle JSON Library'],
     truffle_jars=['tools:LSP_API', 'tools:LSP'],
     support_distributions=['tools:LSP_GRAALVM_SUPPORT'],
     include_by_default=True,
@@ -224,7 +225,7 @@ def _tools_gate_runner(args, tasks):
     dir_name='dap',
     license_files=[],
     third_party_license_files=[],
-    dependencies=['Truffle'],
+    dependencies=['Truffle', 'Truffle JSON Library'],
     truffle_jars=['tools:DAP'],
     support_distributions=['tools:DAP_GRAALVM_SUPPORT'],
     include_by_default=True,
@@ -237,7 +238,7 @@ def _tools_gate_runner(args, tasks):
     dir_name='chromeinspector',
     license_files=[],
     third_party_license_files=[],
-    dependencies=['Truffle'],
+    dependencies=['Truffle', 'Truffle JSON Library'],
     truffle_jars=['tools:CHROMEINSPECTOR'],
     support_distributions=['tools:CHROMEINSPECTOR_GRAALVM_SUPPORT'],
     include_by_default=True,
@@ -278,7 +279,7 @@ def _tools_gate_runner(args, tasks):
     dir_name='profiler',
     license_files=[],
     third_party_license_files=[],
-    dependencies=['Truffle'],
+    dependencies=['Truffle', 'Truffle JSON Library'],
     truffle_jars=['tools:TRUFFLE_PROFILER'],
     support_distributions=['tools:TRUFFLE_PROFILER_GRAALVM_SUPPORT'],
     include_by_default=True,
@@ -291,7 +292,7 @@ def _tools_gate_runner(args, tasks):
     dir_name='coverage',
     license_files=[],
     third_party_license_files=[],
-    dependencies=['Truffle'],
+    dependencies=['Truffle', 'Truffle JSON Library'],
     truffle_jars=['tools:TRUFFLE_COVERAGE'],
     support_distributions=['tools:TRUFFLE_COVERAGE_GRAALVM_SUPPORT'],
     include_by_default=True,

tools/mx.tools/suite.py

@@ -370,6 +370,9 @@
                 "truffle:TRUFFLE_API",
                 "TRUFFLE_PROFILER",
             ],
+            "exclude" : [
+                "truffle:TruffleJSON",
+            ],
             "maven" : {
               "artifactId" : "chromeinspector",
             },
@@ -479,6 +482,9 @@
             "distDependencies" : [
                 "truffle:TRUFFLE_API",
             ],
+            "exclude" : [
+                "truffle:TruffleJSON",
+            ],
             "maven" : {
               "artifactId" : "profiler",
             },
@@ -516,6 +522,9 @@
             "distDependencies" : [
                 "truffle:TRUFFLE_API",
             ],
+            "exclude" : [
+                "truffle:TruffleJSON",
+            ],
             "maven" : {
               "artifactId" : "coverage",
             },
@@ -553,6 +562,9 @@
             "distDependencies" : [
                 "truffle:TRUFFLE_API",
             ],
+            "exclude" : [
+                "truffle:TruffleJSON",
+            ],
             "maven" : {
               "artifactId" : "dap",
             },
@@ -616,6 +628,9 @@
             "distDependencies" : [
                 "LSP_API",
             ],
+            "exclude" : [
+                "truffle:TruffleJSON",
+            ],
             "maven" : {
               "artifactId" : "lsp",
             },

tools/mx.tools/tools-chromeinspector.properties

@@ -1,3 +1,3 @@
-Requires = tool:profiler
+Requires = tool:profiler language:truffle-json
 Args = -H:MaxRuntimeCompileMethods=300 \
        --initialize-at-build-time=com.oracle.truffle.tools.chromeinspector

tools/mx.tools/tools-coverage.properties

@@ -1,3 +1,3 @@
-Requires = macro:truffle
+Requires = macro:truffle language:truffle-json
 Args = -H:MaxRuntimeCompileMethods=100 \
        --initialize-at-build-time=com.oracle.truffle.tools.coverage

tools/mx.tools/tools-dap.properties

@@ -1,3 +1,3 @@
-Requires = macro:truffle
+Requires = macro:truffle language:truffle-json
 Args = -H:MaxRuntimeCompileMethods=100 \
        --initialize-at-build-time=com.oracle.truffle.tools.dap

tools/mx.tools/tools-lsp.properties

@@ -1,3 +1,3 @@
-Requires = macro:truffle
+Requires = macro:truffle language:truffle-json
 Args = -H:MaxRuntimeCompileMethods=100 \
        --initialize-at-build-time=org.graalvm.tools.lsp,org.graalvm.tools.api.lsp

tools/mx.tools/tools-profiler.properties

@@ -1,4 +1,4 @@
-Requires = macro:truffle
+Requires = macro:truffle language:truffle-json
 Args = -H:MaxRuntimeCompileMethods=100 \
        -H:IncludeResources=com/oracle/truffle/tools/profiler/impl/resources/.+js \ 
        --initialize-at-build-time=com.oracle.truffle.tools.profiler 

truffle/mx.truffle/language-json.properties

@@ -0,0 +1,4 @@
+# This file contains support for building native images with icu4j dependency.
+
+ImageClasspath = ${.}/trufflejson.jar
+

truffle/mx.truffle/mx_truffle.py

@@ -1269,6 +1269,21 @@ def glob_match(path, pattern):
     stability="supported",
 ))
 
+mx_sdk_vm.register_graalvm_component(mx_sdk_vm.GraalVmLanguage(
+    suite=_suite,
+    name='Truffle JSON Library',
+    short_name='truffle-json',
+    dir_name='truffle-json',
+    license_files=[],
+    third_party_license_files=[],
+    dependencies=['Truffle'],
+    truffle_jars=['truffle:TruffleJSON'],
+    support_distributions=['truffle:TRUFFLE_JSON_GRAALVM_SUPPORT'],
+    installable=False,
+    standalone=False,
+    stability="supported",
+))
+
 
 mx.update_commands(_suite, {
     'check-filename-length' : [check_filename_length, ""],

truffle/mx.truffle/suite.py

@@ -1713,6 +1713,15 @@
       "maven" : False,
     },
 
+    "TRUFFLE_JSON_GRAALVM_SUPPORT" : {
+      "native" : True,
+      "description" : "Truffle support distribution for Truffle JSON",
+      "layout" : {
+        "native-image.properties" : "file:mx.truffle/language-json.properties",
+      },
+      "maven" : False,
+    },
+
     "LOCATOR": {
       "subDir": "src",
       "moduleInfo" : {

vm/mx.vm/ce

@@ -1,5 +1,5 @@
 DYNAMIC_IMPORTS=/compiler,/graal-js,/sdk,/substratevm,/tools,/truffle
-COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,ni,nic,nil,poly,polynative,pro,sdk,sdkl,svm,svmnfi,svmsl,tfl,tfla,tflm
+COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,ni,nic,nil,poly,polynative,pro,sdk,sdkl,svm,svmnfi,svmsl,tfl,tfla,tflm,truffle-json
 NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-flang,graalvm-native-ld,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image
 NON_REBUILDABLE_IMAGES=lib:jvmcicompiler
 DISABLE_INSTALLABLES=False

vm/mx.vm/ce-aarch64

@@ -1,5 +1,5 @@
 DYNAMIC_IMPORTS=/compiler,/graal-js,/sdk,/substratevm,/tools,/truffle
-COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,ni,nic,nil,poly,polynative,pro,sdk,sdkl,svm,svmnfi,svmsl,tfl,tfla,tflm
+COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,ni,nic,nil,poly,polynative,pro,sdk,sdkl,svm,svmnfi,svmsl,tfl,tfla,tflm,truffle-json
 NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-flang,graalvm-native-ld,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image
 NON_REBUILDABLE_IMAGES=lib:jvmcicompiler
 DISABLE_INSTALLABLES=False

vm/mx.vm/ce-aarch64-complete

@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,graalpython,truffleruby
-COMPONENTS=antlr4,cmp,cov,dap,ejvm,gu,gvm,gwa,icu4j,ins,insight,insightheap,java,js,jsl,jss,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,ni,nic,nil,njs,njsl,poly,polynative,pro,pyn,pynl,rby,rbyl,rgx,sdk,sdkl,svm,svml,svmnfi,svmsl,tfl,tfla,tflm,vvm
+COMPONENTS=antlr4,cmp,cov,dap,ejvm,gu,gvm,gwa,icu4j,ins,insight,insightheap,java,js,jsl,jss,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,ni,nic,nil,njs,njsl,poly,polynative,pro,pyn,pynl,rby,rbyl,rgx,sdk,sdkl,svm,svml,svmnfi,svmsl,tfl,tfla,tflm,truffle-json,vvm
 NATIVE_IMAGES=lib:pythonvm,graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-flang,graalvm-native-ld,lib:jsvm,lib:javavm,lib:graal-nodejs,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,lib:llvmvm,native-image,lib:rubyvm,wasm
 DISABLE_INSTALLABLES=False

vm/mx.vm/ce-complete

@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,fastr,graalpython,truffleruby
-COMPONENTS=antlr4,cmp,cov,dap,ellvm,ejvm,gu,gvm,gwa,icu4j,ins,insight,insightheap,java,js,jsl,jss,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,nfi,ni,nic,nil,njs,njsl,poly,polynative,pro,pyn,pynl,R,rby,rbyl,rgx,sdk,sdkl,svm,svml,svmnfi,svmsl,tfl,tfla,tflm,vvm
+COMPONENTS=antlr4,cmp,cov,dap,ellvm,ejvm,gu,gvm,gwa,icu4j,ins,insight,insightheap,java,js,jsl,jss,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,nfi,ni,nic,nil,njs,njsl,poly,polynative,pro,pyn,pynl,R,rby,rbyl,rgx,sdk,sdkl,svm,svml,svmnfi,svmsl,tfl,tfla,tflm,truffle-json,vvm
 NATIVE_IMAGES=lib:pythonvm,graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-flang,graalvm-native-ld,lib:jsvm,lib:javavm,lib:graal-nodejs,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,lib:llvmvm,native-image,lib:rubyvm,wasm
 DISABLE_INSTALLABLES=false

vm/mx.vm/ce-darwin

@@ -1,5 +1,5 @@
 DYNAMIC_IMPORTS=/compiler,/graal-js,/sdk,/substratevm,/tools,/truffle
-COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,ni,nic,nil,poly,polynative,pro,sdk,sdkl,svm,svmnfi,svmsl,tfl,tfla,tflm
+COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,ni,nic,nil,poly,polynative,pro,sdk,sdkl,svm,svmnfi,svmsl,tfl,tfla,tflm,truffle-json
 NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-flang,graalvm-native-ld,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image
 NON_REBUILDABLE_IMAGES=lib:jvmcicompiler
 DISABLE_INSTALLABLES=False

vm/mx.vm/ce-darwin-aarch64

@@ -1,5 +1,5 @@
 DYNAMIC_IMPORTS=/compiler,/graal-js,/sdk,/substratevm,/tools,/truffle
-COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,ni,nic,nil,poly,polynative,pro,sdk,sdkl,svm,svmnfi,svmsl,tfl,tfla,tflm
+COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,ni,nic,nil,poly,polynative,pro,sdk,sdkl,svm,svmnfi,svmsl,tfl,tfla,tflm,,truffle-json
 NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-flang,graalvm-native-ld,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image
 NON_REBUILDABLE_IMAGES=lib:jvmcicompiler
 DISABLE_INSTALLABLES=False

vm/mx.vm/ce-darwin-aarch64-complete

@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,graalpython,truffleruby
-COMPONENTS=antlr4,cmp,cov,dap,ejvm,gu,gvm,gwa,icu4j,ins,insight,insightheap,java,js,jsl,jss,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,nfi,ni,nic,nil,njs,njsl,poly,polynative,pro,pyn,pynl,rby,rbyl,rgx,sdk,sdkl,svm,svmnfi,svmsl,tfl,tfla,tflm,vvm
+COMPONENTS=antlr4,cmp,cov,dap,ejvm,gu,gvm,gwa,icu4j,ins,insight,insightheap,java,js,jsl,jss,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,nfi,ni,nic,nil,njs,njsl,poly,polynative,pro,pyn,pynl,rby,rbyl,rgx,sdk,sdkl,svm,svmnfi,svmsl,tfl,tfla,tflm,truffle-json,vvm
 NATIVE_IMAGES=lib:pythonvm,graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-flang,graalvm-native-ld,lib:jsvm,lib:javavm,lib:graal-nodejs,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,lib:llvmvm,native-image,lib:rubyvm,wasm
 DISABLE_INSTALLABLES=false

vm/mx.vm/ce-darwin-complete

@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,fastr,graalpython,truffleruby
-COMPONENTS=antlr4,cmp,cov,dap,ellvm,ejvm,gu,gvm,gwa,icu4j,ins,insight,insightheap,java,js,jsl,jss,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,nfi,ni,nic,nil,njs,njsl,poly,polynative,pro,pyn,pynl,R,rby,rbyl,rgx,sdk,sdkl,svm,svml,svmnfi,svmsl,tfl,tfla,tflm,vvm
+COMPONENTS=antlr4,cmp,cov,dap,ellvm,ejvm,gu,gvm,gwa,icu4j,ins,insight,insightheap,java,js,jsl,jss,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,nfi,ni,nic,nil,njs,njsl,poly,polynative,pro,pyn,pynl,R,rby,rbyl,rgx,sdk,sdkl,svm,svml,svmnfi,svmsl,tfl,tfla,tflm,truffle-json,vvm
 NATIVE_IMAGES=lib:pythonvm,graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-flang,graalvm-native-ld,lib:jsvm,lib:javavm,lib:graal-nodejs,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,lib:llvmvm,native-image,lib:rubyvm,wasm
 DISABLE_INSTALLABLES=false

vm/mx.vm/ce-fastr

@@ -1,5 +1,5 @@
 DYNAMIC_IMPORTS=/compiler,/graal-js,/sdk,/substratevm,/sulong,/tools,/truffle,fastr
-COMPONENTS=antlr4,R,cmp,cov,dap,gu,gvm,ins,insight,insightheap,jss,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,ni,nic,poly,polynative,pro,sdk,sdkl,svmnfi,tfl,tfla,tflm
+COMPONENTS=antlr4,R,cmp,cov,dap,gu,gvm,ins,insight,insightheap,jss,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,ni,nic,poly,polynative,pro,sdk,sdkl,svmnfi,tfl,tfla,tflm,truffle-json
 NATIVE_IMAGES=lib:jvmcicompiler
 NON_REBUILDABLE_IMAGES=lib:jvmcicompiler
 DISABLE_INSTALLABLES=False

vm/mx.vm/ce-js

@@ -1,5 +1,5 @@
 DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/tools,/truffle
-COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,js,jsl,jss,lg,lsp,nfi,nfi-libffi,ni,nic,nil,poly,polynative,pro,rgx,sdk,sdkl,svm,svmnfi,svmsl,tfl,tfla,tflm
+COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,js,jsl,jss,lg,lsp,nfi,nfi-libffi,ni,nic,nil,poly,polynative,pro,rgx,sdk,sdkl,svm,svmnfi,svmsl,tfl,tfla,tflm,truffle-json
 NATIVE_IMAGES=lib:jsvm,lib:jvmcicompiler
 NON_REBUILDABLE_IMAGES=lib:jvmcicompiler
 DISABLE_INSTALLABLES=False

vm/mx.vm/ce-llvm

@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/compiler,/graal-js,/sdk,/substratevm,/sulong,/tools,/truffle
-COMPONENTS=antlr4,cmp,cov,dap,gu,gvm,ins,insight,insightheap,jss,lg,llp,llrc,llrl,llrn,lsp,nfi,nfi-libffi,poly,polynative,pro,sdk,sdkl,tfl,tfla,tflm
+COMPONENTS=antlr4,cmp,cov,dap,gu,gvm,ins,insight,insightheap,jss,lg,llp,llrc,llrl,llrn,lsp,nfi,nfi-libffi,poly,polynative,pro,sdk,sdkl,tfl,tfla,tflm,truffle-json
 NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-flang,graalvm-native-ld,lib:jvmcicompiler,lib:llvmvm
 DISABLE_INSTALLABLES=False

vm/mx.vm/ce-no_native

@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/compiler,/graal-js,/sdk,/substratevm,/tools,/truffle
-COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,jss,lsp,nfi-libffi,poly,polynative,pro,sdk,sdkl,tfl,tfla,tflm
+COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,jss,lsp,nfi-libffi,poly,polynative,pro,sdk,sdkl,tfl,tfla,tflm,truffle-json
 NATIVE_IMAGES=false
 DISABLE_INSTALLABLES=ni,nil

vm/mx.vm/ce-nodejs

@@ -1,5 +1,5 @@
 DYNAMIC_IMPORTS=/compiler,/graal-js,/graal-nodejs,/sdk,/substratevm,/tools,/truffle
-COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,jsl,jss,lg,lsp,nfi-libffi,njs,njsl,ni,nic,nil,poly,polynative,pro,sdk,sdkl,sjvm,svm,svmnfi,svmsl,tfl,tfla,tflm
+COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,jsl,jss,lg,lsp,nfi-libffi,njs,njsl,ni,nic,nil,poly,polynative,pro,sdk,sdkl,sjvm,svm,svmnfi,svmsl,tfl,tfla,tflm,truffle-json
 NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-flang,graalvm-native-ld,lib:graal-nodejs,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image
 NON_REBUILDABLE_IMAGES=lib:jvmcicompiler
 DISABLE_INSTALLABLES=False

vm/mx.vm/ce-python

@@ -1,5 +1,5 @@
 # Do not modify this env file without updating the Graal.Python benchmark builders
 DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,graalpython
-COMPONENTS=antlr4,cmp,cov,dap,dis,gu,gvm,icu4j,ins,insight,insightheap,jss,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,pbm,pmh,poly,polynative,pro,pyn,pynl,rgx,sdk,sdkl,tfl,tfla,tflm
+COMPONENTS=antlr4,cmp,cov,dap,dis,gu,gvm,icu4j,ins,insight,insightheap,jss,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,pbm,pmh,poly,polynative,pro,pyn,pynl,rgx,sdk,sdkl,tfl,tfla,tflm,truffle-json
 NATIVE_IMAGES=lib:pythonvm,lib:jvmcicompiler
 DISABLE_INSTALLABLES=False

vm/mx.vm/ce-ruby

@@ -1,5 +1,5 @@
 DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,truffleruby
-COMPONENTS=antlr4,cmp,cov,dap,gvm,icu4j,ins,insight,insightheap,lg,llp,llrc,llrn,lsp,nfi-libffi,pro,rby,rbyl,rgx,sdk,sdkl,tfl,tfla,tflm
+COMPONENTS=antlr4,cmp,cov,dap,gvm,icu4j,ins,insight,insightheap,lg,llp,llrc,llrn,lsp,nfi-libffi,pro,rby,rbyl,rgx,sdk,sdkl,tfl,tfla,tflm,truffle-json
 EXCLUDE_COMPONENTS=libpoly
 NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-flang,graalvm-native-ld,lib:jvmcicompiler,lib:rubyvm
 DISABLE_INSTALLABLES=False

vm/mx.vm/ce-test

@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/tools,/truffle
-COMPONENTS=cmp,cov,dap,dis,gu,gvm,icu4j,ins,insight,insightheap,jss,lg,llp,lsp,nfi-libffi,ni,nic,nil,nju,njucp,poly,polynative,pro,rgx,sdk,sdkl,tfl,tfla,tflm
+COMPONENTS=cmp,cov,dap,dis,gu,gvm,icu4j,ins,insight,insightheap,jss,lg,llp,lsp,nfi-libffi,ni,nic,nil,nju,njucp,poly,polynative,pro,rgx,sdk,sdkl,tfl,tfla,tflm,truffle-json
 NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-flang,graalvm-native-ld,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image
 DISABLE_INSTALLABLES=llp

vm/mx.vm/ce-win

@@ -1,5 +1,5 @@
 DYNAMIC_IMPORTS=/compiler,/graal-js,/sdk,/substratevm,/tools,/truffle
-COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,ni,nic,nil,poly,polynative,pro,sdk,sdkl,svm,svmnfi,svmsl,tfl,tfla,tflm
+COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,ni,nic,nil,poly,polynative,pro,sdk,sdkl,svm,svmnfi,svmsl,tfl,tfla,tflm,truffle-json
 NATIVE_IMAGES=lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image
 NON_REBUILDABLE_IMAGES=lib:jvmcicompiler
 DISABLE_INSTALLABLES=False

vm/mx.vm/ce-win-complete

@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,graalpython
-COMPONENTS=antlr4,cmp,cov,dap,ejvm,gu,gvm,gwa,icu4j,ins,insight,insightheap,java,js,jsl,jss,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,nfi,ni,nic,nil,njs,njsl,poly,polynative,pro,pyn,pynl,rgx,sdk,sdkl,svm,svmnfi,svmsl,tfl,tfla,tflm,vvm
+COMPONENTS=antlr4,cmp,cov,dap,ejvm,gu,gvm,gwa,icu4j,ins,insight,insightheap,java,js,jsl,jss,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,nfi,ni,nic,nil,njs,njsl,poly,polynative,pro,pyn,pynl,rgx,sdk,sdkl,svm,svmnfi,svmsl,tfl,tfla,tflm,truffle-json,vvm
 NATIVE_IMAGES=lib:pythonvm,graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-flang,graalvm-native-ld,lib:jsvm,lib:javavm,lib:graal-nodejs,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,lib:llvmvm,native-image,wasm
 DISABLE_INSTALLABLES=False