demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[not working] [jsscripting] Use OSGI-ified GraalVM dependencies

Browse Source 
Signed-off-by: Florian Hotze <dev@florianhotze.com>
This commit is contained in:
Florian Hotze 2025-01-06 14:48:37 +01:00
parent b4bcf802f4
commit a64e72aff4
No known key found for this signature in database
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.automation.jsscripting/bnd.bnd
View File

@ -1,6 +1,6 @@
Bundle-SymbolicName: ${project.artifactId} Bundle-SymbolicName: ${project.artifactId}
DynamicImport-Package: * DynamicImport-Package: *
Import-Package: org.openhab.core.automation.module.script,org.openhab.core.items,org.openhab.core.library.types,javax.management,javax.script,javax.xml.datatype,javax.xml.stream;version="[1.0,2)",org.osgi.framework;version="[1.8,2)",org.slf4j;version="[1.7,2)" Import-Package: org.graalvm.home,org.graalvm.options,org.graalvm.polyglot,org.openhab.core.automation.module.script,org.openhab.core.items,org.openhab.core.library.types,javax.management,javax.script,javax.xml.datatype,javax.xml.stream;version="[1.0,2)",org.osgi.framework;version="[1.8,2)",org.slf4j;version="[1.7,2)"
Require-Capability: Require-Capability:
osgi.extender:= osgi.extender:=
filter:="(osgi.extender=osgi.serviceloader.processor)", filter:="(osgi.extender=osgi.serviceloader.processor)",

12
bundles/org.openhab.automation.jsscripting/pom.xml
View File

@ -46,6 +46,12 @@
<excludes> <excludes>
<exclude>org.lastnpe.eea:eea-all</exclude> <exclude>org.lastnpe.eea:eea-all</exclude>
<exclude>org.apache.karaf.features:framework</exclude> <exclude>org.apache.karaf.features:framework</exclude>
<!-- we use OSGI-ified version, so we don't need the following -->
<exclude>org.graalvm.polyglot:polyglot</exclude>
<exclude>org.graalvm.sdk:collections</exclude>
<exclude>org.graalvm.sdk:jniutils</exclude>
<exclude>org.graalvm.sdk:nativeimage</exclude>
<exclude>org.graalvm.sdk:word</exclude>
</excludes> </excludes>
</artifactSet> </artifactSet>
<createDependencyReducedPom>false</createDependencyReducedPom> <createDependencyReducedPom>false</createDependencyReducedPom>
@ -141,11 +147,7 @@
</build> </build>
<dependencies> <dependencies>
<dependency> <!-- org.graalvm.polyglot:polyglot is provided through OSGi bundles -->
<groupId>org.graalvm.polyglot</groupId>
<artifactId>polyglot</artifactId>
<version>${graaljs.version}</version>
</dependency>
<!-- Graal JavaScript ScriptEngine JSR 223 support --> <!-- Graal JavaScript ScriptEngine JSR 223 support -->
<dependency> <dependency>
<groupId>org.graalvm.js</groupId> <groupId>org.graalvm.js</groupId>

1
bundles/org.openhab.automation.jsscripting/src/main/feature/feature.xml
View File

@ -5,6 +5,7 @@
<feature name="openhab-automation-jsscripting" description="JavaScript Scripting" version="${project.version}"> <feature name="openhab-automation-jsscripting" description="JavaScript Scripting" version="${project.version}">
<feature>openhab-runtime-base</feature> <feature>openhab-runtime-base</feature>
<bundle dependency="true">mvn:org.openhab.osgiify/org.graalvm.polyglot.polyglot/24.1.1</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.automation.jsscripting/${project.version}</bundle> <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.automation.jsscripting/${project.version}</bundle>
</feature> </feature>
</features> </features>