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

[jinja] Use osgiified Jinjava (#17356)

Browse Source 
* [jinja] Use osgiified Jinjava

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
This commit is contained in:
jimtng 2024-09-01 20:51:05 +10:00 committed by GitHub
parent 09012cee8e
commit 03863feab4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,12 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.3.0-jre</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.openhab.addons.bundles</groupId> <groupId>org.openhab.addons.bundles</groupId>

10
bundles/org.openhab.transform.jinja/NOTICE
View File

@ -29,16 +29,6 @@ jinjava
* Project: https://github.com/HubSpot/jinjava * Project: https://github.com/HubSpot/jinjava
* Source: https://github.com/HubSpot/jinjava * Source: https://github.com/HubSpot/jinjava
jsoup
* License: MIT License
* Project: https://jsoup.org/
* Source: https://github.com/jhy/jsoup
re2j
* License: Go License
* Project: https://github.com/google/re2j
* Source: https://github.com/google/re2j
== Third-party license(s) == Third-party license(s)
=== Go License === Go License

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

@ -16,37 +16,30 @@
<properties> <properties>
<bnd.importpackage> <bnd.importpackage>
javax.annotation.*;resolution:=optional 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> </bnd.importpackage>
<dep.noembedding>jackson-annotations,jackson-databind,jackson-core,jackson-dataformat-yaml,commons-lang3,commons-net,jsoup</dep.noembedding> <dep.noembedding>jackson-annotations,jackson-databind,jackson-core,jackson-dataformat-yaml,commons-lang3,commons-net</dep.noembedding>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.hubspot.jinjava</groupId> <groupId>org.openhab.osgiify</groupId>
<artifactId>jinjava</artifactId> <artifactId>com.hubspot.jinjava.jinjava</artifactId>
<version>2.7.1</version> <version>2.7.2</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.re2j</groupId> <groupId>org.openhab.osgiify</groupId>
<artifactId>re2j</artifactId> <artifactId>com.google.re2j.re2j</artifactId>
<version>1.2</version> <version>1.2</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ch.obermuhlner</groupId> <groupId>com.google.guava</groupId>
<artifactId>big-math</artifactId> <artifactId>guava</artifactId>
<version>2.0.0</version> <version>33.3.0-jre</version>
<scope>compile</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.googlecode.java-ipv6</groupId>
<artifactId>java-ipv6</artifactId>
<version>0.17</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>

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

@ -5,7 +5,6 @@
<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.jsoup/jsoup/1.15.3</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.4</bundle> <bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.4</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>