From c09c20cca725c530c3ff8ef08ad319184a0d7be2 Mon Sep 17 00:00:00 2001
From: "Jan N. Klug" <github@klug.nrw>
Date: Sun, 1 Sep 2024 14:57:48 +0200
Subject: [PATCH] [transform.jinja] Properly use jinjava OSGi

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

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 bundles/org.openhab.transform.jinja/pom.xml      | 16 ++++++++++------
 .../src/main/feature/feature.xml                 |  3 ++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/bundles/org.openhab.transform.jinja/pom.xml b/bundles/org.openhab.transform.jinja/pom.xml
index acf4a15b95ef8..247694d4c539c 100644
--- a/bundles/org.openhab.transform.jinja/pom.xml
+++ b/bundles/org.openhab.transform.jinja/pom.xml
@@ -15,9 +15,7 @@
   <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>
+    <bnd.exportpackage>com.googlecode.ipv6.*</bnd.exportpackage>
     <dep.noembedding>jackson-annotations,jackson-databind,jackson-core,jackson-dataformat-yaml,commons-lang3,commons-net</dep.noembedding>
   </properties>
 
@@ -26,14 +24,20 @@
       <groupId>org.openhab.osgiify</groupId>
       <artifactId>com.hubspot.jinjava.jinjava</artifactId>
       <version>2.7.2</version>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.openhab.osgiify</groupId>
       <artifactId>com.google.re2j.re2j</artifactId>
       <version>1.2</version>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
+    <!-- dependency>
+      <groupId>com.googlecode.java-ipv6</groupId>
+      <artifactId>java-ipv6</artifactId>
+      <version>0.17</version>
+      <scope>compile</scope>
+      </dependency -->
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -80,7 +84,7 @@
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
       <version>${commons.net.version}</version>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 
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 9181d56bff287..0798e8de3ef9b 100644
--- 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,8 @@
 	<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</bundle>
+		<bundle dependency="true">mvn:org.openhab.osgiify/com.google.re2j.re2j/1.2</bundle>
 		<bundle start-level="75">mvn:org.openhab.addons.bundles/org.openhab.transform.jinja/${project.version}</bundle>
 	</feature>
 </features>