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

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

Signed-off-by: Jan N. Klug <github@klug.nrw>

diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml b/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml
index b6b0a0c118dec0509ddd09c86dac48482b3a8eee..79773a7dc24a0fa88f9f4ba551c807468c33d9bf 100644 (file)
--- a/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml
+++ b/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml
@@ -40,5 +40,16 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </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>
 </project>

diff --git a/bundles/org.openhab.transform.jinja/noEmbedDependencies.profile b/bundles/org.openhab.transform.jinja/noEmbedDependencies.profile
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/bundles/org.openhab.transform.jinja/pom.xml b/bundles/org.openhab.transform.jinja/pom.xml
index acf4a15b95ef87354880a4d85a9596fc570c2594..0adfa3d09a6850de2ee231133726576e626abdb2 100644 (file)
--- a/bundles/org.openhab.transform.jinja/pom.xml
+++ b/bundles/org.openhab.transform.jinja/pom.xml
@@ -14,23 +14,16 @@
 
   <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>
     <dependency>
-      <groupId>org.openhab.osgiify</groupId>
-      <artifactId>com.hubspot.jinjava.jinjava</artifactId>
+      <groupId>com.hubspot.jinjava</groupId>
+      <artifactId>jinjava</artifactId>
       <version>2.7.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.openhab.osgiify</groupId>
-      <artifactId>com.google.re2j.re2j</artifactId>
+      <groupId>com.google.re2j</groupId>
+      <artifactId>re2j</artifactId>
       <version>1.2</version>
       <scope>compile</scope>
     </dependency>
@@ -68,7 +61,7 @@
       <groupId>org.jsoup</groupId>
       <artifactId>jsoup</artifactId>
       <version>1.15.3</version>
-      <scope>provided</scope>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

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 9181d56bff287e32c868e31be84180641f3c3f5b..7276e97d27433509afd00029fb3bf278ac0d5338 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,9 @@
        <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.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>
        </feature>
 </features>