From c0f70749d9fd63dda096fec7667c05a28ef3badb Mon Sep 17 00:00:00 2001
From: antroids <36043354+antroids@users.noreply.github.com>
Date: Sun, 25 Apr 2021 23:03:12 +0300
Subject: [PATCH] [Jinja] Update JinJava version and embed dependencies #10496
 (#10578)

Signed-off-by: Anton Kharuzhy <antroids@gmail.com>
---
 .../noEmbedDependencies.profile               |  0
 bundles/org.openhab.transform.jinja/pom.xml   | 68 ++++++++++++++-----
 .../src/main/feature/feature.xml              |  8 +--
 3 files changed, 51 insertions(+), 25 deletions(-)
 delete mode 100644 bundles/org.openhab.transform.jinja/noEmbedDependencies.profile

diff --git a/bundles/org.openhab.transform.jinja/noEmbedDependencies.profile b/bundles/org.openhab.transform.jinja/noEmbedDependencies.profile
deleted file mode 100644
index e69de29bb..000000000
diff --git a/bundles/org.openhab.transform.jinja/pom.xml b/bundles/org.openhab.transform.jinja/pom.xml
index 2c1832976..e5187bca5 100644
--- a/bundles/org.openhab.transform.jinja/pom.xml
+++ b/bundles/org.openhab.transform.jinja/pom.xml
@@ -14,7 +14,45 @@
 
   <name>openHAB Add-ons :: Bundles :: Transformation Service :: Jinja</name>
 
+  <properties>
+    <bnd.importpackage>
+      javax.annotation;resolution:=optional
+    </bnd.importpackage>
+    <dep.noembedding>jackson-annotations,jackson-databind,jackson-core,jackson-dataformat-yaml,commons-lang3,commons-net,jsoup</dep.noembedding>
+  </properties>
+
   <dependencies>
+    <dependency>
+      <groupId>com.hubspot.jinjava</groupId>
+      <artifactId>jinjava</artifactId>
+      <version>2.5.7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.re2j</groupId>
+      <artifactId>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>
+    </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>
+      <version>${jackson.version}</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
@@ -22,15 +60,15 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.javassist</groupId>
-      <artifactId>javassist</artifactId>
-      <version>3.22.0-GA</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>${jackson.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.openhab.osgiify</groupId>
-      <artifactId>com.hubspot.jinjava.jinjava</artifactId>
-      <version>2.5.0</version>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-yaml</artifactId>
+      <version>${jackson.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -39,24 +77,18 @@
       <version>1.8.3</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>21.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.openhab.osgiify</groupId>
-      <artifactId>com.google.re2j.re2j</artifactId>
-      <version>1.2</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
       <version>3.4</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>3.3</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 
 </project>
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 3072b94c7..1a33c8df1 100644
--- a/bundles/org.openhab.transform.jinja/src/main/feature/feature.xml
+++ b/bundles/org.openhab.transform.jinja/src/main/feature/feature.xml
@@ -5,15 +5,9 @@
 	<feature name="openhab-transformation-jinja" description="Jinja Transformation" version="${project.version}">
 		<feature>openhab-runtime-base</feature>
 		<feature dependency="true">openhab.tp-jackson</feature>
-		<bundle dependency="true">mvn:com.google.guava/guava/21.0</bundle>
-		<bundle dependency="true">mvn:ch.obermuhlner/big-math/2.1.0</bundle>
 		<bundle dependency="true">mvn:org.jsoup/jsoup/1.8.3</bundle>
-		<bundle dependency="true">mvn:org.openhab.osgiify/com.google.re2j.re2j/1.2</bundle>
-		<bundle dependency="true">mvn:de.odysseus.juel/juel-api/2.2.7</bundle>
-		<bundle dependency="true">mvn:de.odysseus.juel/juel-impl/2.2.7</bundle>
 		<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.4</bundle>
-		<bundle dependency="true">mvn:org.javassist/javassist/3.22.0-GA</bundle>
-		<bundle dependency="true">mvn:org.openhab.osgiify/com.hubspot.jinjava.jinjava/2.5.0</bundle>
+		<bundle dependency="true">mvn:commons-net/commons-net/3.6</bundle>
 		<bundle start-level="75">mvn:org.openhab.addons.bundles/org.openhab.transform.jinja/${project.version}</bundle>
 	</feature>
 </features>