From: Dan Cunningham <dan@digitaldan.com>
Date: Tue, 14 Dec 2021 07:30:32 +0000 (-0800)
Subject: [jsscripting] Update library and change config PID  (#11777)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=22b9be1390a8e46c6bbbeed67a807d813e8e645e;p=openhab-addons.git

[jsscripting] Update library and change config PID  (#11777)

* Use OH standrard component pid naming, default injection to true.
* Bump openhab-js

Signed-off-by: Dan Cunningham <dan@digitaldan.com>
---

diff --git a/bundles/org.openhab.automation.jsscripting/pom.xml b/bundles/org.openhab.automation.jsscripting/pom.xml
index dde3319bf4..aad7fb28b6 100644
--- a/bundles/org.openhab.automation.jsscripting/pom.xml
+++ b/bundles/org.openhab.automation.jsscripting/pom.xml
@@ -25,7 +25,7 @@
     <graal.version>21.3.0</graal.version>
     <asm.version>6.2.1</asm.version>
     <oh.version>${project.version}</oh.version>
-    <ohjs.version>openhab@0.0.1-beta.3</ohjs.version>
+    <ohjs.version>openhab@1.2.0</ohjs.version>
   </properties>
 
   <build>
diff --git a/bundles/org.openhab.automation.jsscripting/src/main/java/org/openhab/automation/jsscripting/internal/GraalJSScriptEngineFactory.java b/bundles/org.openhab.automation.jsscripting/src/main/java/org/openhab/automation/jsscripting/internal/GraalJSScriptEngineFactory.java
index 4fa8ac8d98..e435da216d 100644
--- a/bundles/org.openhab.automation.jsscripting/src/main/java/org/openhab/automation/jsscripting/internal/GraalJSScriptEngineFactory.java
+++ b/bundles/org.openhab.automation.jsscripting/src/main/java/org/openhab/automation/jsscripting/internal/GraalJSScriptEngineFactory.java
@@ -33,13 +33,13 @@ import org.osgi.service.component.annotations.Modified;
  * @author Jonathan Gilbert - Initial contribution
  * @author Dan Cunningham - Script injections
  */
-@Component(service = ScriptEngineFactory.class, configurationPid = "org.openhab.automation.jsscripting", property = Constants.SERVICE_PID
-        + "=org.openhab.automation.jsscripting")
+@Component(service = ScriptEngineFactory.class, configurationPid = "org.openhab.jsscripting", property = Constants.SERVICE_PID
+        + "=org.openhab.jsscripting")
 @ConfigurableService(category = "automation", label = "JS Scripting", description_uri = "automation:jsscripting")
 public final class GraalJSScriptEngineFactory implements ScriptEngineFactory {
     private static final String CFG_INJECTION_ENABLED = "injectionEnabled";
     private static final String INJECTION_CODE = "Object.assign(this, require('openhab'));";
-    private boolean injectionEnabled;
+    private boolean injectionEnabled = true;
 
     public static final String MIME_TYPE = "application/javascript;version=ECMAScript-2021";