Bump Netty version to 4.1.92.Final (#14878)

Update to latest netty to ensure latest improvements and security patches are applied.

https://netty.io/news/2023/04/25/4-1-92-Final.html

* Adapt itests to new netty release

Signed-off-by: Matthew Skinner <matt@pcmus.com>
Also-by: Holger Friedrich <mail@holger-friedrich.de>

diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
index 22b815aed12d7eb8ad463c1c5a7310437cd433e8..ddf645d624d13ff2d28192428cdd651503bdd842 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@@ -37,18 +37,8 @@ Import-Package: \
        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)',\
        com.hivemq.client.mqtt;version='[1.2.2,1.2.3)',\
-       io.netty.buffer;version='[4.1.72,4.1.73)',\
-       io.netty.codec;version='[4.1.72,4.1.73)',\
        io.netty.codec-http;version='[4.1.59,4.1.60)',\
-       io.netty.codec-socks;version='[4.1.72,4.1.73)',\
-       io.netty.common;version='[4.1.72,4.1.73)',\
-       io.netty.handler;version='[4.1.72,4.1.73)',\
-       io.netty.handler-proxy;version='[4.1.72,4.1.73)',\
-       io.netty.resolver;version='[4.1.72,4.1.73)',\
-       io.netty.tcnative-classes;version='[2.0.46,2.0.47)',\
-       io.netty.transport;version='[4.1.72,4.1.73)',\
        io.netty.transport-native-epoll;version='[4.1.59,4.1.60)',\
-       io.netty.transport-native-unix-common;version='[4.1.59,4.1.60)',\
        io.reactivex.rxjava2.rxjava;version='[2.2.19,2.2.20)',\
        jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
@@ -66,7 +56,6 @@ 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-mqtt;version='[4.1.72,4.1.73)',\
        ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
        ch.qos.logback.core;version='[1.2.11,1.2.12)',\
        biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
@@ -108,4 +97,15 @@ Import-Package: \
        org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\
        org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
        org.objenesis;version='[3.3.0,3.3.1)',\
-       xstream;version='[1.4.20,1.4.21)'
+       xstream;version='[1.4.20,1.4.21)',\
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       io.netty.buffer;version='[4.1.92,4.1.93)',\
+       io.netty.codec;version='[4.1.92,4.1.93)',\
+       io.netty.codec-mqtt;version='[4.1.92,4.1.93)',\
+       io.netty.codec-socks;version='[4.1.92,4.1.93)',\
+       io.netty.common;version='[4.1.92,4.1.93)',\
+       io.netty.handler;version='[4.1.92,4.1.93)',\
+       io.netty.handler-proxy;version='[4.1.92,4.1.93)',\
+       io.netty.resolver;version='[4.1.92,4.1.93)',\
+       io.netty.transport;version='[4.1.92,4.1.93)',\
+       io.netty.transport-native-unix-common;version='[4.1.92,4.1.93)'

diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
index bfe7c6171b4efe2a0a9e5f2938af1beb9f6e7183..857ebf73d8fc9171f54799b832bbba7de40c190a 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
@@ -37,18 +37,8 @@ Import-Package: \
        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)',\
        com.hivemq.client.mqtt;version='[1.2.2,1.2.3)',\
-       io.netty.buffer;version='[4.1.72,4.1.73)',\
-       io.netty.codec;version='[4.1.72,4.1.73)',\
        io.netty.codec-http;version='[4.1.59,4.1.60)',\
-       io.netty.codec-socks;version='[4.1.72,4.1.73)',\
-       io.netty.common;version='[4.1.72,4.1.73)',\
-       io.netty.handler;version='[4.1.72,4.1.73)',\
-       io.netty.handler-proxy;version='[4.1.72,4.1.73)',\
-       io.netty.resolver;version='[4.1.72,4.1.73)',\
-       io.netty.tcnative-classes;version='[2.0.46,2.0.47)',\
-       io.netty.transport;version='[4.1.72,4.1.73)',\
        io.netty.transport-native-epoll;version='[4.1.59,4.1.60)',\
-       io.netty.transport-native-unix-common;version='[4.1.59,4.1.60)',\
        io.reactivex.rxjava2.rxjava;version='[2.2.19,2.2.20)',\
        jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
@@ -66,7 +56,6 @@ 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-mqtt;version='[4.1.72,4.1.73)',\
        ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
        ch.qos.logback.core;version='[1.2.11,1.2.12)',\
        biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
@@ -108,5 +97,16 @@ Import-Package: \
        org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\
        org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
        org.objenesis;version='[3.3.0,3.3.1)',\
-       xstream;version='[1.4.20,1.4.21)'
+       xstream;version='[1.4.20,1.4.21)',\
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       io.netty.buffer;version='[4.1.92,4.1.93)',\
+       io.netty.codec;version='[4.1.92,4.1.93)',\
+       io.netty.codec-mqtt;version='[4.1.92,4.1.93)',\
+       io.netty.codec-socks;version='[4.1.92,4.1.93)',\
+       io.netty.common;version='[4.1.92,4.1.93)',\
+       io.netty.handler;version='[4.1.92,4.1.93)',\
+       io.netty.handler-proxy;version='[4.1.92,4.1.93)',\
+       io.netty.resolver;version='[4.1.92,4.1.93)',\
+       io.netty.transport;version='[4.1.92,4.1.93)',\
+       io.netty.transport-native-unix-common;version='[4.1.92,4.1.93)'
 

diff --git a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
index de5cf456acd7560cb52e253170392d6a597f9326..29d6efc723f0ea5d743cec70cc50020e075f7256 100644 (file)
--- a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
@@ -38,23 +38,11 @@ Import-Package: \
        com.zaxxer.HikariCP;version='[2.4.7,2.4.8)',\
        io.dropwizard.metrics.core;version='[3.2.2,3.2.3)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
-       io.netty.buffer;version='[4.1.72,4.1.73)',\
-       io.netty.codec;version='[4.1.72,4.1.73)',\
        io.netty.codec-http;version='[4.1.59,4.1.60)',\
-       io.netty.codec-mqtt;version='[4.1.72,4.1.73)',\
-       io.netty.codec-socks;version='[4.1.72,4.1.73)',\
-       io.netty.common;version='[4.1.72,4.1.73)',\
-       io.netty.handler;version='[4.1.72,4.1.73)',\
-       io.netty.handler-proxy;version='[4.1.72,4.1.73)',\
-       io.netty.resolver;version='[4.1.72,4.1.73)',\
-       io.netty.tcnative-classes;version='[2.0.46,2.0.47)',\
-       io.netty.transport;version='[4.1.72,4.1.73)',\
        io.netty.transport-native-epoll;version='[4.1.59,4.1.60)',\
-       io.netty.transport-native-unix-common;version='[4.1.59,4.1.60)',\
        io.reactivex.rxjava2.rxjava;version='[2.2.19,2.2.20)',\
        jakarta.annotation-api;version='[2.0.0,2.0.1)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-       jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
        jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
        javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        junit-jupiter-api;version='[5.9.2,5.9.3)',\
@@ -105,4 +93,15 @@ Import-Package: \
        si.uom.si-quantity;version='[2.1.0,2.1.1)',\
        tech.units.indriya;version='[2.1.2,2.1.3)',\
        uom-lib-common;version='[2.1.0,2.1.1)',\
-       xstream;version='[1.4.20,1.4.21)'
\ No newline at end of file
+       xstream;version='[1.4.20,1.4.21)',\
+       io.netty.buffer;version='[4.1.92,4.1.93)',\
+       io.netty.codec;version='[4.1.92,4.1.93)',\
+       io.netty.codec-mqtt;version='[4.1.92,4.1.93)',\
+       io.netty.codec-socks;version='[4.1.92,4.1.93)',\
+       io.netty.common;version='[4.1.92,4.1.93)',\
+       io.netty.handler;version='[4.1.92,4.1.93)',\
+       io.netty.handler-proxy;version='[4.1.92,4.1.93)',\
+       io.netty.resolver;version='[4.1.92,4.1.93)',\
+       io.netty.transport;version='[4.1.92,4.1.93)',\
+       io.netty.transport-native-unix-common;version='[4.1.92,4.1.93)',\
+       org.osgi.service.cm;version='[1.6.0,1.6.1)'
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index f0531b413c007428d190f5510d43d14359d341b2..fc5f63b5965cc8772a89bf45d229291bd58defda 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
     <eea.version>2.2.1</eea.version>
     <jackson.version>2.14.1</jackson.version>
     <karaf.version>4.4.3</karaf.version>
-    <netty.version>4.1.72.Final</netty.version>
+    <netty.version>4.1.92.Final</netty.version>
     <okhttp.version>3.14.9</okhttp.version>
     <sat.version>0.15.0</sat.version>
     <spotless.version>2.35.0</spotless.version>