Upgrade hivemq-mqtt-client to 1.3.5, Netty to 4.1.118.Final (#18277)

* Upgrade hivemq-mqtt-client to 1.3.5, Netty to 4.1.118.Final * Upgrade hivemq-mqtt-client from 1.3.3 to 1.3.5 * Upgrade netty from 4.1.104 to 4.1.118 * Upgrade moquette-broker from 0.15 to 0.16, disable telemetry introduced in 0.16 * Upgrade h2-mvstore from 1.4.199 to 2.1.212 Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
2025-02-18 12:31:27 +01:00 · 2025-02-18 12:31:27 +01:00 · 51df8f302f
parent 56aa221e0c
commit 51df8f302f
12 changed files with 58 additions and 51 deletions
--- a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
+++ b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
@ -91,5 +91,6 @@ Fragment-Host: org.openhab.automation.groovyscripting
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
 	de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
-	de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)'
+	de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)',\
+	org.jsr-305;version='[3.0.2,3.0.3)'

--- a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
+++ b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
@ -86,4 +86,6 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
 	de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
-	de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)'
+	de.focus_shift.jollyday-jackson;version='[1.4.0,1.4.1)',\
+	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
+	org.yaml.snakeyaml;version='[2.3.0,2.3.1)'
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@ -32,15 +32,15 @@ Import-Package: \
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	com.google.dagger;version='[2.27.0,2.27.1)',\
-	io.netty.codec-http;version='[4.1.59,4.1.60)',\
-	io.netty.transport-native-epoll;version='[4.1.59,4.1.60)',\
+	io.netty.codec-http;version='[4.1.77,4.1.78)',\
+	io.netty.transport-classes-epoll;version='[4.1.77,4.1.78)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	org.jsr-305;version='[3.0.2,3.0.3)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
-	com.h2database.mvstore;version='[1.4.199,1.4.200)',\
+	com.h2database.mvstore;version='[2.1.212,2.1.213)',\
 	com.zaxxer.HikariCP;version='[2.4.7,2.4.8)',\
 	io.dropwizard.metrics.core;version='[3.2.2,3.2.3)',\
 	org.apache.commons.commons-codec;version='[1.16.0,1.16.1)',\
@ -65,7 +65,7 @@ Import-Package: \
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	com.hivemq.client.mqtt;version='[1.3.3,1.3.4)',\
+	com.hivemq.client.mqtt;version='[1.3.5,1.3.6)',\
 	io.reactivex.rxjava2.rxjava;version='[2.2.21,2.2.22)',\
 	reactive-streams;version='[1.0.4,1.0.5)',\
 	junit-jupiter-api;version='[5.11.4,5.11.5)',\
@ -76,16 +76,16 @@ Import-Package: \
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
-	io.netty.buffer;version='[4.1.104,4.1.105)',\
-	io.netty.codec;version='[4.1.104,4.1.105)',\
-	io.netty.codec-mqtt;version='[4.1.104,4.1.105)',\
-	io.netty.codec-socks;version='[4.1.104,4.1.105)',\
-	io.netty.common;version='[4.1.104,4.1.105)',\
-	io.netty.handler;version='[4.1.104,4.1.105)',\
-	io.netty.handler-proxy;version='[4.1.104,4.1.105)',\
-	io.netty.resolver;version='[4.1.104,4.1.105)',\
-	io.netty.transport;version='[4.1.104,4.1.105)',\
-	io.netty.transport-native-unix-common;version='[4.1.104,4.1.105)',\
+	io.netty.buffer;version='[4.1.118,4.1.119)',\
+	io.netty.codec;version='[4.1.118,4.1.119)',\
+	io.netty.codec-mqtt;version='[4.1.118,4.1.119)',\
+	io.netty.codec-socks;version='[4.1.118,4.1.119)',\
+	io.netty.common;version='[4.1.118,4.1.119)',\
+	io.netty.handler;version='[4.1.118,4.1.119)',\
+	io.netty.handler-proxy;version='[4.1.118,4.1.119)',\
+	io.netty.resolver;version='[4.1.118,4.1.119)',\
+	io.netty.transport;version='[4.1.118,4.1.119)',\
+	io.netty.transport-native-unix-common;version='[4.1.118,4.1.119)',\
 	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	com.sun.jna;version='[5.16.0,5.16.1)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
@ -130,4 +130,5 @@ Import-Package: \
 	com.google.guava;version='[33.3.1,33.3.2)',\
 	com.hubspot.immutables.immutables-exceptions;version='[1.9.0,1.9.1)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)'
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/pom.xml
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/pom.xml
@ -37,12 +37,12 @@
    <dependency>
      <groupId>com.h2database</groupId>
      <artifactId>h2-mvstore</artifactId>
-      <version>1.4.199</version>
+      <version>2.1.212</version>
    </dependency>
    <dependency>
      <groupId>io.moquette</groupId>
      <artifactId>moquette-broker</artifactId>
-      <version>0.15</version>
+      <version>0.16</version>
    </dependency>
    <dependency>
      <groupId>io.netty</groupId>
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/src/main/java/org/openhab/binding/mqtt/homeassistant/MqttOSGiTest.java
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/src/main/java/org/openhab/binding/mqtt/homeassistant/MqttOSGiTest.java
@ -68,6 +68,7 @@ public class MqttOSGiTest extends JavaOSGiTest {
        properties.put(BrokerConstants.SSL_PORT_PROPERTY_NAME, BrokerConstants.DISABLED_PORT_BIND);
        properties.put(BrokerConstants.WEB_SOCKET_PORT_PROPERTY_NAME, BrokerConstants.DISABLED_PORT_BIND);
        properties.put(BrokerConstants.WSS_PORT_PROPERTY_NAME, BrokerConstants.DISABLED_PORT_BIND);
+        properties.put(BrokerConstants.ENABLE_TELEMETRY_NAME, "false");
        return properties;
    }

--- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
@ -32,8 +32,8 @@ Import-Package: \
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	com.google.dagger;version='[2.27.0,2.27.1)',\
-	io.netty.codec-http;version='[4.1.59,4.1.60)',\
-	io.netty.transport-native-epoll;version='[4.1.59,4.1.60)',\
+	io.netty.codec-http;version='[4.1.93,4.1.94)',\
+	io.netty.transport-classes-epoll;version='[4.1.93,4.1.94)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	org.jsr-305;version='[3.0.2,3.0.3)',\
@ -65,7 +65,7 @@ Import-Package: \
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	com.hivemq.client.mqtt;version='[1.3.3,1.3.4)',\
+	com.hivemq.client.mqtt;version='[1.3.5,1.3.6)',\
 	io.reactivex.rxjava2.rxjava;version='[2.2.21,2.2.22)',\
 	reactive-streams;version='[1.0.4,1.0.5)',\
 	junit-jupiter-api;version='[5.11.4,5.11.5)',\
@ -76,16 +76,16 @@ Import-Package: \
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
-	io.netty.buffer;version='[4.1.104,4.1.105)',\
-	io.netty.codec;version='[4.1.104,4.1.105)',\
-	io.netty.codec-mqtt;version='[4.1.104,4.1.105)',\
-	io.netty.codec-socks;version='[4.1.104,4.1.105)',\
-	io.netty.common;version='[4.1.104,4.1.105)',\
-	io.netty.handler;version='[4.1.104,4.1.105)',\
-	io.netty.handler-proxy;version='[4.1.104,4.1.105)',\
-	io.netty.resolver;version='[4.1.104,4.1.105)',\
-	io.netty.transport;version='[4.1.104,4.1.105)',\
-	io.netty.transport-native-unix-common;version='[4.1.104,4.1.105)',\
+	io.netty.buffer;version='[4.1.118,4.1.119)',\
+	io.netty.codec;version='[4.1.118,4.1.119)',\
+	io.netty.codec-mqtt;version='[4.1.118,4.1.119)',\
+	io.netty.codec-socks;version='[4.1.118,4.1.119)',\
+	io.netty.common;version='[4.1.118,4.1.119)',\
+	io.netty.handler;version='[4.1.118,4.1.119)',\
+	io.netty.handler-proxy;version='[4.1.118,4.1.119)',\
+	io.netty.resolver;version='[4.1.118,4.1.119)',\
+	io.netty.transport;version='[4.1.118,4.1.119)',\
+	io.netty.transport-native-unix-common;version='[4.1.118,4.1.119)',\
 	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	com.sun.jna;version='[5.16.0,5.16.1)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
--- a/itests/org.openhab.binding.mqtt.homie.tests/pom.xml
+++ b/itests/org.openhab.binding.mqtt.homie.tests/pom.xml
@ -37,12 +37,12 @@
    <dependency>
      <groupId>com.h2database</groupId>
      <artifactId>h2-mvstore</artifactId>
-      <version>1.4.199</version>
+      <version>2.1.212</version>
    </dependency>
    <dependency>
      <groupId>io.moquette</groupId>
      <artifactId>moquette-broker</artifactId>
-      <version>0.15</version>
+      <version>0.16</version>
    </dependency>
    <dependency>
      <groupId>io.netty</groupId>
--- a/itests/org.openhab.binding.mqtt.homie.tests/src/main/java/org/openhab/binding/mqtt/homie/MqttOSGiTest.java
+++ b/itests/org.openhab.binding.mqtt.homie.tests/src/main/java/org/openhab/binding/mqtt/homie/MqttOSGiTest.java
@ -68,6 +68,7 @@ public class MqttOSGiTest extends JavaOSGiTest {
        properties.put(BrokerConstants.SSL_PORT_PROPERTY_NAME, BrokerConstants.DISABLED_PORT_BIND);
        properties.put(BrokerConstants.WEB_SOCKET_PORT_PROPERTY_NAME, BrokerConstants.DISABLED_PORT_BIND);
        properties.put(BrokerConstants.WSS_PORT_PROPERTY_NAME, BrokerConstants.DISABLED_PORT_BIND);
+        properties.put(BrokerConstants.ENABLE_TELEMETRY_NAME, "false");
        return properties;
    }

--- a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
@ -30,8 +30,8 @@ Import-Package: \
 	com.h2database.mvstore;version='[1.4.199,1.4.200)',\
 	com.zaxxer.HikariCP;version='[2.4.7,2.4.8)',\
 	io.dropwizard.metrics.core;version='[3.2.2,3.2.3)',\
-	io.netty.codec-http;version='[4.1.59,4.1.60)',\
-	io.netty.transport-native-epoll;version='[4.1.59,4.1.60)',\
+	io.netty.codec-http;version='[4.1.93,4.1.94)',\
+	io.netty.transport-classes-epoll;version='[4.1.93,4.1.94)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.commons.commons-codec;version='[1.16.0,1.16.1)',\
@ -65,7 +65,7 @@ Import-Package: \
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	com.hivemq.client.mqtt;version='[1.3.3,1.3.4)',\
+	com.hivemq.client.mqtt;version='[1.3.5,1.3.6)',\
 	io.reactivex.rxjava2.rxjava;version='[2.2.21,2.2.22)',\
 	reactive-streams;version='[1.0.4,1.0.5)',\
 	junit-jupiter-api;version='[5.11.4,5.11.5)',\
@ -77,16 +77,16 @@ Import-Package: \
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
-	io.netty.buffer;version='[4.1.104,4.1.105)',\
-	io.netty.codec;version='[4.1.104,4.1.105)',\
-	io.netty.codec-mqtt;version='[4.1.104,4.1.105)',\
-	io.netty.codec-socks;version='[4.1.104,4.1.105)',\
-	io.netty.common;version='[4.1.104,4.1.105)',\
-	io.netty.handler;version='[4.1.104,4.1.105)',\
-	io.netty.handler-proxy;version='[4.1.104,4.1.105)',\
-	io.netty.resolver;version='[4.1.104,4.1.105)',\
-	io.netty.transport;version='[4.1.104,4.1.105)',\
-	io.netty.transport-native-unix-common;version='[4.1.104,4.1.105)',\
+	io.netty.buffer;version='[4.1.118,4.1.119)',\
+	io.netty.codec;version='[4.1.118,4.1.119)',\
+	io.netty.codec-mqtt;version='[4.1.118,4.1.119)',\
+	io.netty.codec-socks;version='[4.1.118,4.1.119)',\
+	io.netty.common;version='[4.1.118,4.1.119)',\
+	io.netty.handler;version='[4.1.118,4.1.119)',\
+	io.netty.handler-proxy;version='[4.1.118,4.1.119)',\
+	io.netty.resolver;version='[4.1.118,4.1.119)',\
+	io.netty.transport;version='[4.1.118,4.1.119)',\
+	io.netty.transport-native-unix-common;version='[4.1.118,4.1.119)',\
 	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	com.sun.jna;version='[5.16.0,5.16.1)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
--- a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/pom.xml
+++ b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/pom.xml
@ -37,12 +37,12 @@
    <dependency>
      <groupId>com.h2database</groupId>
      <artifactId>h2-mvstore</artifactId>
-      <version>1.4.199</version>
+      <version>2.1.212</version>
    </dependency>
    <dependency>
      <groupId>io.moquette</groupId>
      <artifactId>moquette-broker</artifactId>
-      <version>0.15</version>
+      <version>0.16</version>
    </dependency>
    <dependency>
      <groupId>io.netty</groupId>
--- a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/src/main/java/org/openhab/binding/mqtt/ruuvigateway/MqttOSGiTest.java
+++ b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/src/main/java/org/openhab/binding/mqtt/ruuvigateway/MqttOSGiTest.java
@ -98,6 +98,7 @@ public class MqttOSGiTest extends JavaOSGiTest {
        properties.put(BrokerConstants.SSL_PORT_PROPERTY_NAME, BrokerConstants.DISABLED_PORT_BIND);
        properties.put(BrokerConstants.WEB_SOCKET_PORT_PROPERTY_NAME, BrokerConstants.DISABLED_PORT_BIND);
        properties.put(BrokerConstants.WSS_PORT_PROPERTY_NAME, BrokerConstants.DISABLED_PORT_BIND);
+        properties.put(BrokerConstants.ENABLE_TELEMETRY_NAME, "false");
        return properties;
    }

--- a/pom.xml
+++ b/pom.xml
@ -73,7 +73,7 @@
    <jackson.version>2.18.2</jackson.version>
    <jna.version>5.16.0</jna.version>
    <karaf.version>4.4.7</karaf.version>
-    <netty.version>4.1.104.Final</netty.version>
+    <netty.version>4.1.118.Final</netty.version>
    <okhttp3.version>4.12.0</okhttp3.version>
    <okio.version>3.9.0</okio.version>
    <gson.version>2.11.0</gson.version>