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

[transform.jinja] Properly use jinjava OSGi (#17358)

Browse Source 
Depends on https://github.com/openhab/openhab-osgiify/pull/49

Signed-off-by: Jan N. Klug <github@klug.nrw>
This commit is contained in:
J-N-K 2024-09-04 23:07:21 +02:00 committed by GitHub
parent ffa59f8d8f
commit c1a63ff4c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bundles/org.openhab.binding.mqtt.homeassistant/pom.xml
View File

@ -40,5 +40,16 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.hubspot.jinjava</groupId>
<artifactId>jinjava</artifactId>
<version>2.7.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.re2j</groupId>
<artifactId>re2j</artifactId>
<version>1.2</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

0
bundles/org.openhab.transform.jinja/noEmbedDependencies.profile Normal file
View File

17
bundles/org.openhab.transform.jinja/pom.xml
View File

@ -14,23 +14,16 @@
<name>openHAB Add-ons :: Bundles :: Transformation Service :: Jinja</name> <name>openHAB Add-ons :: Bundles :: Transformation Service :: Jinja</name>
<properties>
<bnd.importpackage>
javax.annotation.*;resolution:=optional,com.googlecode.ipv6.*;resolution:=optional,ch.obermuhlner.math.big.*;resolution:=optional,com.google.common.*;resolution:=optional,com.fasterxml.jackson.*;resolution:=optional,org.jsoup.*;resolution:=optional,org.apache.commons.*;resolution:=optional,org.apache.commons.net.*;resolution:=optional
</bnd.importpackage>
<dep.noembedding>jackson-annotations,jackson-databind,jackson-core,jackson-dataformat-yaml,commons-lang3,commons-net</dep.noembedding>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.openhab.osgiify</groupId> <groupId>com.hubspot.jinjava</groupId>
<artifactId>com.hubspot.jinjava.jinjava</artifactId> <artifactId>jinjava</artifactId>
<version>2.7.2</version> <version>2.7.2</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.openhab.osgiify</groupId> <groupId>com.google.re2j</groupId>
<artifactId>com.google.re2j.re2j</artifactId> <artifactId>re2j</artifactId>
<version>1.2</version> <version>1.2</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@ -68,7 +61,7 @@
<groupId>org.jsoup</groupId> <groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId> <artifactId>jsoup</artifactId>
<version>1.15.3</version> <version>1.15.3</version>
<scope>provided</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>

4
bundles/org.openhab.transform.jinja/src/main/feature/feature.xml
View File

@ -5,7 +5,9 @@
<feature name="openhab-transformation-jinja" description="Jinja Transformation" version="${project.version}"> <feature name="openhab-transformation-jinja" description="Jinja Transformation" version="${project.version}">
<feature>openhab-runtime-base</feature> <feature>openhab-runtime-base</feature>
<feature dependency="true">openhab.tp-commons-net</feature> <feature dependency="true">openhab.tp-commons-net</feature>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.4</bundle> <bundle dependency="true">mvn:org.openhab.osgiify/com.hubspot.jinjava.jinjava/2.7.2_0</bundle>
<bundle dependency="true">mvn:org.openhab.osgiify/com.google.re2j.re2j/1.2</bundle>
<bundle dependency="true">mvn:ch.obermuhlner/big-math/2.3.2</bundle>
<bundle start-level="75">mvn:org.openhab.addons.bundles/org.openhab.transform.jinja/${project.version}</bundle> <bundle start-level="75">mvn:org.openhab.addons.bundles/org.openhab.transform.jinja/${project.version}</bundle>
</feature> </feature>
</features> </features>