[mqtt.homeassistant] Update Jinjava to 2.7.3 (#17412)

* [mqtt.homeassistant] Update Jinjava to 2.7.3

Signed-off-by: Cody Cutrer <cody@cutrer.us>

diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml b/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml
index 854983ad21f14630877811217fdc551c2c83cfc0..849eeb0d3bf57f799a17049df52aa4da39e682b9 100644 (file)
--- a/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml
+++ b/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.openhab.osgiify</groupId>
       <artifactId>com.hubspot.jinjava.jinjava</artifactId>
-      <version>2.7.2_0</version>
+      <version>2.7.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -52,5 +52,17 @@
       <version>2.3.2</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jdk8</artifactId>
+      <version>${jackson.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.openhab.osgiify</groupId>
+      <artifactId>com.hubspot.immutables.immutables-exceptions</artifactId>
+      <version>1.9</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>

diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/feature/feature.xml b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/feature/feature.xml
index 853e170e1cfd7dc142971a69ceeaa9aa1361d1ea..770886a76adbc1bc73c2baf7db9c8e466795c327 100644 (file)
--- a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/feature/feature.xml
@@ -6,9 +6,11 @@
                <feature>openhab-runtime-base</feature>
                <feature>openhab-transport-mqtt</feature>
                <feature dependency="true">openhab.tp-commons-net</feature>
-               <bundle dependency="true">mvn:org.openhab.osgiify/com.hubspot.jinjava.jinjava/2.7.2_0</bundle>
+               <bundle dependency="true">mvn:org.openhab.osgiify/com.hubspot.jinjava.jinjava/2.7.3</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 dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${jackson.version}</bundle>
+               <bundle dependency="true">mvn:org.openhab.osgiify/com.hubspot.immutables.immutables-exceptions/1.9</bundle>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt/${project.version}</bundle>
                <bundle start-level="81">mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt.generic/${project.version}</bundle>
                <bundle start-level="82">mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt.homeassistant/${project.version}</bundle>

diff --git a/bundles/org.openhab.transform.jinja/pom.xml b/bundles/org.openhab.transform.jinja/pom.xml
index 0adfa3d09a6850de2ee231133726576e626abdb2..f175a0d68c10e26d1ad8f5ae906b006b2cfd7e30 100644 (file)
--- a/bundles/org.openhab.transform.jinja/pom.xml
+++ b/bundles/org.openhab.transform.jinja/pom.xml
@@ -16,9 +16,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.hubspot.jinjava</groupId>
-      <artifactId>jinjava</artifactId>
-      <version>2.7.2</version>
+      <groupId>org.openhab.osgiify</groupId>
+      <artifactId>com.hubspot.jinjava.jinjava</artifactId>
+      <version>2.7.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -75,6 +75,18 @@
       <version>${commons.net.version}</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jdk8</artifactId>
+      <version>${jackson.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.openhab.osgiify</groupId>
+      <artifactId>com.hubspot.immutables.immutables-exceptions</artifactId>
+      <version>1.9</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 7276e97d27433509afd00029fb3bf278ac0d5338..1cb59b50380f7461905b73b75badf746ca93bb04 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,9 +5,11 @@
        <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.openhab.osgiify/com.hubspot.jinjava.jinjava/2.7.2_0</bundle>
+               <bundle dependency="true">mvn:org.openhab.osgiify/com.hubspot.jinjava.jinjava/2.7.3</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 dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${jackson.version}</bundle>
+               <bundle dependency="true">mvn:org.openhab.osgiify/com.hubspot.immutables.immutables-exceptions/1.9</bundle>
                <bundle start-level="75">mvn:org.openhab.addons.bundles/org.openhab.transform.jinja/${project.version}</bundle>
        </feature>
 </features>

diff --git a/features/openhab-addons/src/main/resources/footer.xml b/features/openhab-addons/src/main/resources/footer.xml
index 9b241a74a7056a95b444f63f0b98568aa0d3abf6..d3c262db6316f2373f8f74e45868d674d80c7510 100644 (file)
--- a/features/openhab-addons/src/main/resources/footer.xml
+++ b/features/openhab-addons/src/main/resources/footer.xml
@@ -23,9 +23,11 @@
                <feature>openhab-runtime-base</feature>
                <feature>openhab-transport-mqtt</feature>
                <feature dependency="true">openhab.tp-commons-net</feature>
-               <bundle dependency="true">mvn:org.openhab.osgiify/com.hubspot.jinjava.jinjava/2.7.2_0</bundle>
+               <bundle dependency="true">mvn:org.openhab.osgiify/com.hubspot.jinjava.jinjava/2.7.3</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 dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${jackson.version}</bundle>
+               <bundle dependency="true">mvn:org.openhab.osgiify/com.hubspot.immutables.immutables-exceptions/1.9</bundle>
                <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt/${project.version}</bundle>
                <bundle start-level="81">mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt.espmilighthub/${project.version}</bundle>
                <bundle start-level="81">mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt.fpp/${project.version}</bundle>

diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
index b6d41e1a2e85b2d186eeaa1e78ee28eee17f17b8..0350e6fc18aebb33e7499f3a83c7afd9a17f4100 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@@ -125,7 +125,7 @@ Import-Package: \
        com.google.guava;version='[33.2.0,33.2.1)',\
        com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
        com.google.re2j.re2j;version='[1.2.0,1.2.1)',\
-       com.hubspot.jinjava.jinjava;version='[2.7.2,2.7.3)',\
+       com.hubspot.jinjava.jinjava;version='[2.7.3,2.7.4)',\
        javassist;version='[3.29.2,3.29.3)',\
        org.apache.commons.commons-net;version='[3.9.0,3.9.1)',\
        org.apache.commons.lang3;version='[3.14.0,3.14.1)',\