diff --git a/bundles/org.openhab.automation.jsscripting/pom.xml b/bundles/org.openhab.automation.jsscripting/pom.xml index 02d1894448b34..c8a59c89e16c7 100644 --- a/bundles/org.openhab.automation.jsscripting/pom.xml +++ b/bundles/org.openhab.automation.jsscripting/pom.xml @@ -23,25 +23,37 @@ !jdk.vm.ci.services - 22.0.0.2 + 24.1.1 ${project.version} openhab@5.8.1 - + org.apache.maven.plugins - maven-dependency-plugin + maven-shade-plugin + 3.6.0 - embed-dependencies + package - unpack-dependencies + shade - META-INF/services/com.oracle.truffle.api.TruffleLanguage$Provider + + + org.lastnpe.eea:eea-all + org.apache.karaf.features:framework + + + false + + + + @@ -130,32 +142,29 @@ - org.graalvm.sdk - graal-sdk - ${graal.version} - - - org.graalvm.truffle - truffle-api - ${graal.version} + org.graalvm.polyglot + polyglot + ${graaljs.version} org.graalvm.js js-scriptengine - ${graal.version} + ${graaljs.version} org.graalvm.regex regex - ${graal.version} + ${graaljs.version} - org.graalvm.js - js - ${graal.version} + org.graalvm.polyglot + js-community + ${graaljs.version} + pom + runtime diff --git a/bundles/org.openhab.automation.jsscripting/src/main/java/org/openhab/automation/jsscripting/internal/OpenhabGraalJSScriptEngine.java b/bundles/org.openhab.automation.jsscripting/src/main/java/org/openhab/automation/jsscripting/internal/OpenhabGraalJSScriptEngine.java index b842b3bb0ce41..d3dfb643fd3dc 100644 --- a/bundles/org.openhab.automation.jsscripting/src/main/java/org/openhab/automation/jsscripting/internal/OpenhabGraalJSScriptEngine.java +++ b/bundles/org.openhab.automation.jsscripting/src/main/java/org/openhab/automation/jsscripting/internal/OpenhabGraalJSScriptEngine.java @@ -163,8 +163,8 @@ public OpenhabGraalJSScriptEngine(boolean injectionEnabled, boolean injectionCac .option("js.nashorn-compat", "true") // Enable Nashorn compat mode as openhab-js relies on // accessors, see // https://github.com/oracle/graaljs/blob/master/docs/user/NashornMigrationGuide.md#accessors - .option("js.ecmascript-version", "2022") // If Nashorn compat is enabled, it will enforce ES5 - // compatibility, we want ECMA2022 + .option("js.ecmascript-version", "2024") // If Nashorn compat is enabled, it will enforce ES5 + // compatibility, we want ECMA2024 .option("js.commonjs-require", "true") // Enable CommonJS module support .hostClassLoader(getClass().getClassLoader()) .fileSystem(new DelegatingFileSystem(FileSystems.getDefault().provider()) { diff --git a/bundles/org.openhab.automation.jsscripting/src/main/resources/META-INF/services/com.oracle.truffle.api.TruffleLanguage$Provider b/bundles/org.openhab.automation.jsscripting/src/main/resources/META-INF/services/com.oracle.truffle.api.TruffleLanguage$Provider deleted file mode 100644 index 1fb86e4d04bc2..0000000000000 --- a/bundles/org.openhab.automation.jsscripting/src/main/resources/META-INF/services/com.oracle.truffle.api.TruffleLanguage$Provider +++ /dev/null @@ -1,2 +0,0 @@ -com.oracle.truffle.regex.RegexLanguageProvider -com.oracle.truffle.js.lang.JavaScriptLanguageProvider