[jinja] Use osgiified Jinjava (#17356)

* [jinja] Use osgiified Jinjava

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>

diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml b/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml
index 6fe10af50a392911fb8aca5048db6ebc52a7de42..b6b0a0c118dec0509ddd09c86dac48482b3a8eee 100644 (file)
--- a/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml
+++ b/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml
@@ -27,6 +27,12 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>33.3.0-jre</version>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>

diff --git a/bundles/org.openhab.transform.jinja/NOTICE b/bundles/org.openhab.transform.jinja/NOTICE
index d917b14cfa37e8c0b4770eacd1b0afc58cc0ddeb..b8d06cbfa41db10641ad1978d6a7c94383fc1cf7 100644 (file)
--- a/bundles/org.openhab.transform.jinja/NOTICE
+++ b/bundles/org.openhab.transform.jinja/NOTICE
@@ -29,16 +29,6 @@ jinjava
 * Project: 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)
 
 === Go License

diff --git a/bundles/org.openhab.transform.jinja/pom.xml b/bundles/org.openhab.transform.jinja/pom.xml
index 7e5b096b01886c7da66a827a920f86d6b47ed376..acf4a15b95ef87354880a4d85a9596fc570c2594 100644 (file)
--- a/bundles/org.openhab.transform.jinja/pom.xml
+++ b/bundles/org.openhab.transform.jinja/pom.xml
@@ -16,37 +16,30 @@
 
   <properties>
     <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>
-    <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>
 
   <dependencies>
     <dependency>
-      <groupId>com.hubspot.jinjava</groupId>
-      <artifactId>jinjava</artifactId>
-      <version>2.7.1</version>
+      <groupId>org.openhab.osgiify</groupId>
+      <artifactId>com.hubspot.jinjava.jinjava</artifactId>
+      <version>2.7.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.re2j</groupId>
-      <artifactId>re2j</artifactId>
+      <groupId>org.openhab.osgiify</groupId>
+      <artifactId>com.google.re2j.re2j</artifactId>
       <version>1.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>ch.obermuhlner</groupId>
-      <artifactId>big-math</artifactId>
-      <version>2.0.0</version>
-      <scope>compile</scope>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>33.3.0-jre</version>
+      <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.googlecode.java-ipv6</groupId>
-      <artifactId>java-ipv6</artifactId>
-      <version>0.17</version>
-      <scope>compile</scope>
-    </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>

diff --git a/bundles/org.openhab.transform.jinja/src/main/feature/feature.xml b/bundles/org.openhab.transform.jinja/src/main/feature/feature.xml
index 291be49f666b9a25387afdf70b8f512ebb241dfc..9181d56bff287e32c868e31be84180641f3c3f5b 100644 (file)
--- a/bundles/org.openhab.transform.jinja/src/main/feature/feature.xml
+++ b/bundles/org.openhab.transform.jinja/src/main/feature/feature.xml
@@ -5,7 +5,6 @@
        <feature name="openhab-transformation-jinja" description="Jinja Transformation" version="${project.version}">
                <feature>openhab-runtime-base</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 start-level="75">mvn:org.openhab.addons.bundles/org.openhab.transform.jinja/${project.version}</bundle>
        </feature>