From bcfbd6480a8f3e6084792ad1ed1c92327cca3b6e Mon Sep 17 00:00:00 2001 From: Cody Cutrer Date: Mon, 23 Sep 2024 08:57:21 -0600 Subject: [PATCH] [mqtt.homeassistant] Update Jinjava to 2.7.3 (#17412) * [mqtt.homeassistant] Update Jinjava to 2.7.3 Signed-off-by: Cody Cutrer --- .../pom.xml | 14 +++++++++++++- .../src/main/feature/feature.xml | 4 +++- bundles/org.openhab.transform.jinja/pom.xml | 18 +++++++++++++++--- .../src/main/feature/feature.xml | 4 +++- .../src/main/resources/footer.xml | 4 +++- .../itest.bndrun | 2 +- 6 files changed, 38 insertions(+), 8 deletions(-) diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml b/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml index 854983ad21f..849eeb0d3bf 100644 --- a/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml +++ b/bundles/org.openhab.binding.mqtt.homeassistant/pom.xml @@ -37,7 +37,7 @@ org.openhab.osgiify com.hubspot.jinjava.jinjava - 2.7.2_0 + 2.7.3 compile @@ -52,5 +52,17 @@ 2.3.2 compile + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + ${jackson.version} + compile + + + org.openhab.osgiify + com.hubspot.immutables.immutables-exceptions + 1.9 + compile + 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 853e170e1cf..770886a76ad 100644 --- 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 @@ openhab-runtime-base openhab-transport-mqtt openhab.tp-commons-net - mvn:org.openhab.osgiify/com.hubspot.jinjava.jinjava/2.7.2_0 + mvn:org.openhab.osgiify/com.hubspot.jinjava.jinjava/2.7.3 mvn:org.openhab.osgiify/com.google.re2j.re2j/1.2 mvn:ch.obermuhlner/big-math/2.3.2 + mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${jackson.version} + mvn:org.openhab.osgiify/com.hubspot.immutables.immutables-exceptions/1.9 mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt/${project.version} mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt.generic/${project.version} mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt.homeassistant/${project.version} diff --git a/bundles/org.openhab.transform.jinja/pom.xml b/bundles/org.openhab.transform.jinja/pom.xml index 0adfa3d09a6..f175a0d68c1 100644 --- a/bundles/org.openhab.transform.jinja/pom.xml +++ b/bundles/org.openhab.transform.jinja/pom.xml @@ -16,9 +16,9 @@ - com.hubspot.jinjava - jinjava - 2.7.2 + org.openhab.osgiify + com.hubspot.jinjava.jinjava + 2.7.3 compile @@ -75,6 +75,18 @@ ${commons.net.version} compile + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + ${jackson.version} + compile + + + org.openhab.osgiify + com.hubspot.immutables.immutables-exceptions + 1.9 + compile + 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 7276e97d274..1cb59b50380 100644 --- 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 @@ openhab-runtime-base openhab.tp-commons-net - mvn:org.openhab.osgiify/com.hubspot.jinjava.jinjava/2.7.2_0 + mvn:org.openhab.osgiify/com.hubspot.jinjava.jinjava/2.7.3 mvn:org.openhab.osgiify/com.google.re2j.re2j/1.2 mvn:ch.obermuhlner/big-math/2.3.2 + mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${jackson.version} + mvn:org.openhab.osgiify/com.hubspot.immutables.immutables-exceptions/1.9 mvn:org.openhab.addons.bundles/org.openhab.transform.jinja/${project.version} diff --git a/features/openhab-addons/src/main/resources/footer.xml b/features/openhab-addons/src/main/resources/footer.xml index 9b241a74a70..d3c262db631 100644 --- a/features/openhab-addons/src/main/resources/footer.xml +++ b/features/openhab-addons/src/main/resources/footer.xml @@ -23,9 +23,11 @@ openhab-runtime-base openhab-transport-mqtt openhab.tp-commons-net - mvn:org.openhab.osgiify/com.hubspot.jinjava.jinjava/2.7.2_0 + mvn:org.openhab.osgiify/com.hubspot.jinjava.jinjava/2.7.3 mvn:org.openhab.osgiify/com.google.re2j.re2j/1.2 mvn:ch.obermuhlner/big-math/2.3.2 + mvn:com.fasterxml.jackson.datatype/jackson-datatype-jdk8/${jackson.version} + mvn:org.openhab.osgiify/com.hubspot.immutables.immutables-exceptions/1.9 mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt/${project.version} mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt.espmilighthub/${project.version} mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt.fpp/${project.version} diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun index b6d41e1a2e8..0350e6fc18a 100644 --- 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)',\