engine-runner and language-server are separate JPMS modules

build/build/src/engine/context.rs

@@ -330,7 +330,6 @@ impl RunContext {
         // === Build project-manager distribution and native image ===
         let mut tasks = vec![];
         if self.config.build_engine_package() {
-            tasks.push("engine-runner/assembly");
             tasks.push("buildEngineDistribution");
         }
         if self.config.build_native_runner {

distribution/bin/enso

@@ -1,5 +1,5 @@
 COMP_PATH=$(dirname "$0")/../component
 
 JAVA_OPTS="--add-opens=java.base/java.nio=ALL-UNNAMED $JAVA_OPTS"
-exec java --module-path $COMP_PATH $JAVA_OPTS -m org.enso.runtime/org.enso.EngineRunnerBootLoader "$@"
+exec java --module-path $COMP_PATH $JAVA_OPTS -m org.enso.runner/org.enso.runner.Main "$@"
 exit

distribution/bin/enso.bat

@@ -1,5 +1,5 @@
 @echo off
 set comp-dir=%~dp0\..\component
 set JAVA_OPTS=%JAVA_OPTS% --add-opens=java.base/java.nio=ALL-UNNAMED
-java --module-path %comp-dir% -Dpolyglot.compiler.IterativePartialEscape=true %JAVA_OPTS% -m org.enso.runtime/org.enso.EngineRunnerBootLoader %*
+java --module-path %comp-dir% -Dpolyglot.compiler.IterativePartialEscape=true %JAVA_OPTS% -m org.enso.runner/org.enso.runner.Main %*
 exit /B %errorlevel%

distribution/engine/THIRD-PARTY/NOTICE

@@ -201,6 +201,11 @@ The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `io.circe.circe-parser_2.13-0.14.7`.
 
 
+'java-diff-utils', licensed under the The Apache Software License, Version 2.0, is distributed with the engine.
+The license file can be found at `licenses/APACHE2.0`.
+Copyright notices related to this dependency can be found in the directory `io.github.java-diff-utils.java-diff-utils-4.12`.
+
+
 'helidon-builder-api', licensed under the Apache 2.0, is distributed with the engine.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `io.helidon.builder.helidon-builder-api-4.0.8`.
@@ -383,7 +388,7 @@ Copyright notices related to this dependency can be found in the directory `jaka
 
 'jna', licensed under the Apache-2.0, is distributed with the engine.
 The license file can be found at `licenses/APACHE2.0`.
-Copyright notices related to this dependency can be found in the directory `net.java.dev.jna.jna-5.12.1`.
+Copyright notices related to this dependency can be found in the directory `net.java.dev.jna.jna-5.14.0`.
 
 
 'commons-compress', licensed under the Apache-2.0, is distributed with the engine.
@@ -456,6 +461,11 @@ The license file can be found at `licenses/Universal_Permissive_License__Version
 Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.collections-24.0.0`.
 
 
+'jniutils', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
+The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.jniutils-24.0.0`.
+
+
 'nativeimage', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
 Copyright notices related to this dependency can be found in the directory `org.graalvm.sdk.nativeimage-24.0.0`.
@@ -481,6 +491,11 @@ The license file can be found at `licenses/Universal_Permissive_License__Version
 Copyright notices related to this dependency can be found in the directory `org.graalvm.shadowed.xz-24.0.0`.
 
 
+'chromeinspector-tool', licensed under the GNU General Public License, version 2, with the Classpath Exception, is distributed with the engine.
+The license file can be found at `licenses/GNU_General_Public_License__version_2__with_the_Classpath_Exception`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.tools.chromeinspector-tool-24.0.0`.
+
+
 'profiler-tool', licensed under the GNU General Public License, version 2, with the Classpath Exception, is distributed with the engine.
 The license file can be found at `licenses/GNU_General_Public_License__version_2__with_the_Classpath_Exception`.
 Copyright notices related to this dependency can be found in the directory `org.graalvm.tools.profiler-tool-24.0.0`.
@@ -491,6 +506,11 @@ The license file can be found at `licenses/Universal_Permissive_License__Version
 Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-api-24.0.0`.
 
 
+'truffle-compiler', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
+The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-compiler-24.0.0`.
+
+
 'truffle-nfi', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
 The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
 Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-nfi-24.0.0`.
@@ -501,6 +521,11 @@ The license file can be found at `licenses/Universal_Permissive_License__Version
 Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-nfi-libffi-24.0.0`.
 
 
+'truffle-runtime', licensed under the Universal Permissive License, Version 1.0, is distributed with the engine.
+The license file can be found at `licenses/Universal_Permissive_License__Version_1.0`.
+Copyright notices related to this dependency can be found in the directory `org.graalvm.truffle.truffle-runtime-24.0.0`.
+
+
 'jline', licensed under the The BSD License, is distributed with the engine.
 The license file can be found at `licenses/BSD-3-Clause`.
 Copyright notices related to this dependency can be found in the directory `org.jline.jline-3.23.0`.
@@ -536,6 +561,11 @@ The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `org.scala-lang.modules.scala-parser-combinators_2.13-1.1.2`.
 
 
+'scala-compiler', licensed under the Apache-2.0, is distributed with the engine.
+The license file can be found at `licenses/APACHE2.0`.
+Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-compiler-2.13.11`.
+
+
 'scala-library', licensed under the Apache-2.0, is distributed with the engine.
 The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `org.scala-lang.scala-library-2.13.11`.

distribution/engine/THIRD-PARTY/io.github.java-diff-utils.java-diff-utils-4.12/NOTICES

@@ -0,0 +1,13 @@
+Copyright (C) 2009 - 2017 java-diff-utils
+
+Copyright 2009-2017 java-diff-utils.
+
+Copyright 2017 java-diff-utils.
+
+Copyright 2018 java-diff-utils.
+
+Copyright 2019 java-diff-utils.
+
+Copyright 2020 java-diff-utils.
+
+Copyright 2021 java-diff-utils.

distribution/engine/THIRD-PARTY/net.java.dev.jna.jna-5.14.0/NOTICES

@@ -0,0 +1,29 @@
+Copyright (c) 2007 Timothy Wall, All Rights Reserved
+
+Copyright (c) 2007 Wayne Meissner, All Rights Reserved
+
+Copyright (c) 2007-2008 Timothy Wall, All Rights Reserved
+
+Copyright (c) 2007-2012 Timothy Wall, All Rights Reserved
+
+Copyright (c) 2007-2013 Timothy Wall, All Rights Reserved
+
+Copyright (c) 2007-2015 Timothy Wall, All Rights Reserved
+
+Copyright (c) 2009 Timothy Wall, All Rights Reserved
+
+Copyright (c) 2011 Timothy Wall, All Rights Reserved
+
+Copyright (c) 2012 Timothy Wall, All Rights Reserved
+
+Copyright (c) 2017 Matthias Bläsing, All Rights Reserved
+
+Copyright (c) 2018 Matthias Bläsing
+
+Copyright (c) 2019 Matthias Bläsing, All Rights Reserved
+
+Copyright (c) 2021, Matthias Bläsing, All Rights Reserved
+
+Copyright (c) 2022 Carlos Ballesteros, All Rights Reserved
+
+Copyright 2007 Timothy Wall

distribution/engine/THIRD-PARTY/org.graalvm.sdk.jniutils-24.0.0/NOTICES

@@ -0,0 +1,13 @@
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+
+Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+The above copyright notice and either this complete permission notice or at a
+
+copyright rights in the Software, and any and all patent rights owned or

distribution/engine/THIRD-PARTY/org.graalvm.tools.chromeinspector-tool-24.0.0/NOTICES

@@ -0,0 +1,43 @@
+Copyright (c) 2010-2020 Nathan Rajlich
+
+Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+
+The above copyright notice and this permission notice shall be

distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-compiler-24.0.0/NOTICES

@@ -0,0 +1,17 @@
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+
+Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
+
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+The above copyright notice and either this complete permission notice or at a
+
+copyright rights in the Software, and any and all patent rights owned or

distribution/engine/THIRD-PARTY/org.graalvm.truffle.truffle-runtime-24.0.0/NOTICES

@@ -0,0 +1,31 @@
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+
+Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
+
+Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+The above copyright notice and either this complete permission notice or at a
+
+copyright rights in the Software, and any and all patent rights owned or