Upgrade Netty dependencies to 4.1.99.Final (#15694)

Signed-off-by: Wouter Born <github@maindrain.net>

diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
index 2c80981ab5c552a160f36b4d0e05482c1a472a69..56af5daef8edf26c9eba0c0503d3be983267663f 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@@ -33,15 +33,12 @@ 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)',\
-       com.hivemq.client.mqtt;version='[1.2.2,1.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.reactivex.rxjava2.rxjava;version='[2.2.19,2.2.20)',\
        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)',\
-       org.reactivestreams.reactive-streams;version='[1.0.3,1.0.4)',\
        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)',\
@@ -63,16 +60,6 @@ Import-Package: \
        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)',\
-       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.openhab.binding.mqtt;version='[4.1.0,4.1.1)',\
        org.openhab.binding.mqtt.generic;version='[4.1.0,4.1.1)',\
        org.openhab.binding.mqtt.homeassistant;version='[4.1.0,4.1.1)',\
@@ -114,4 +101,17 @@ 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.10.1,2.10.2)',\
-       org.objectweb.asm;version='[9.5.0,9.5.1)'
+       org.objectweb.asm;version='[9.5.0,9.5.1)',\
+       com.hivemq.client.mqtt;version='[1.3.3,1.3.4)',\
+       io.netty.buffer;version='[4.1.99,4.1.100)',\
+       io.netty.codec;version='[4.1.99,4.1.100)',\
+       io.netty.codec-mqtt;version='[4.1.99,4.1.100)',\
+       io.netty.codec-socks;version='[4.1.99,4.1.100)',\
+       io.netty.common;version='[4.1.99,4.1.100)',\
+       io.netty.handler;version='[4.1.99,4.1.100)',\
+       io.netty.handler-proxy;version='[4.1.99,4.1.100)',\
+       io.netty.resolver;version='[4.1.99,4.1.100)',\
+       io.netty.transport;version='[4.1.99,4.1.100)',\
+       io.netty.transport-native-unix-common;version='[4.1.99,4.1.100)',\
+       io.reactivex.rxjava2.rxjava;version='[2.2.21,2.2.22)',\
+       reactive-streams;version='[1.0.4,1.0.5)'

diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
index 1977422f066bfbb342a592b5aa3260812ae2ada5..dae25e0f61abbf452ea62b8355a4f0bf911dc956 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
@@ -33,15 +33,12 @@ 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)',\
-       com.hivemq.client.mqtt;version='[1.2.2,1.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.reactivex.rxjava2.rxjava;version='[2.2.19,2.2.20)',\
        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)',\
-       org.reactivestreams.reactive-streams;version='[1.0.3,1.0.4)',\
        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)',\
@@ -63,16 +60,6 @@ Import-Package: \
        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)',\
-       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.openhab.binding.mqtt;version='[4.1.0,4.1.1)',\
        org.openhab.binding.mqtt.generic;version='[4.1.0,4.1.1)',\
        org.openhab.binding.mqtt.homie;version='[4.1.0,4.1.1)',\
@@ -114,5 +101,18 @@ 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.10.1,2.10.2)',\
-       org.objectweb.asm;version='[9.5.0,9.5.1)'
+       org.objectweb.asm;version='[9.5.0,9.5.1)',\
+       com.hivemq.client.mqtt;version='[1.3.3,1.3.4)',\
+       io.netty.buffer;version='[4.1.99,4.1.100)',\
+       io.netty.codec;version='[4.1.99,4.1.100)',\
+       io.netty.codec-mqtt;version='[4.1.99,4.1.100)',\
+       io.netty.codec-socks;version='[4.1.99,4.1.100)',\
+       io.netty.common;version='[4.1.99,4.1.100)',\
+       io.netty.handler;version='[4.1.99,4.1.100)',\
+       io.netty.handler-proxy;version='[4.1.99,4.1.100)',\
+       io.netty.resolver;version='[4.1.99,4.1.100)',\
+       io.netty.transport;version='[4.1.99,4.1.100)',\
+       io.netty.transport-native-unix-common;version='[4.1.99,4.1.100)',\
+       io.reactivex.rxjava2.rxjava;version='[2.2.21,2.2.22)',\
+       reactive-streams;version='[1.0.4,1.0.5)'
 

diff --git a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
index e74751d8f9d66911d8de78f3c573d0b13e9b86dc..60468039b48b6ff11fe550006ffca5268e4b2520 100644 (file)
--- a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
@@ -29,12 +29,10 @@ Import-Package: \
        biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
        com.google.dagger;version='[2.27.0,2.27.1)',\
        com.h2database.mvstore;version='[1.4.199,1.4.200)',\
-       com.hivemq.client.mqtt;version='[1.2.2,1.2.3)',\
        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.reactivex.rxjava2.rxjava;version='[2.2.19,2.2.20)',\
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
        jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
        junit-jupiter-api;version='[5.9.2,5.9.3)',\
@@ -55,20 +53,9 @@ Import-Package: \
        org.opentest4j;version='[1.2.0,1.2.1)',\
        org.osgi.service.component;version='[1.5.0,1.5.1)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
-       org.reactivestreams.reactive-streams;version='[1.0.3,1.0.4)',\
        si-units;version='[2.1.0,2.1.1)',\
        si.uom.si-quantity;version='[2.1.0,2.1.1)',\
        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)',\
        net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
        net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
        org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
@@ -115,4 +102,17 @@ 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.10.1,2.10.2)',\
-       org.objectweb.asm;version='[9.5.0,9.5.1)'
+       org.objectweb.asm;version='[9.5.0,9.5.1)',\
+       com.hivemq.client.mqtt;version='[1.3.3,1.3.4)',\
+       io.netty.buffer;version='[4.1.99,4.1.100)',\
+       io.netty.codec;version='[4.1.99,4.1.100)',\
+       io.netty.codec-mqtt;version='[4.1.99,4.1.100)',\
+       io.netty.codec-socks;version='[4.1.99,4.1.100)',\
+       io.netty.common;version='[4.1.99,4.1.100)',\
+       io.netty.handler;version='[4.1.99,4.1.100)',\
+       io.netty.handler-proxy;version='[4.1.99,4.1.100)',\
+       io.netty.resolver;version='[4.1.99,4.1.100)',\
+       io.netty.transport;version='[4.1.99,4.1.100)',\
+       io.netty.transport-native-unix-common;version='[4.1.99,4.1.100)',\
+       io.reactivex.rxjava2.rxjava;version='[2.2.21,2.2.22)',\
+       reactive-streams;version='[1.0.4,1.0.5)'

diff --git a/pom.xml b/pom.xml
index f33e0bb2fcabae9a964d3754058957d36447ed28..15fea096b72b60b546807b107977cfcba6f767ae 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
     <eea.version>2.2.1</eea.version>
     <jackson.version>2.15.2</jackson.version>
     <karaf.version>4.4.4</karaf.version>
-    <netty.version>4.1.92.Final</netty.version>
+    <netty.version>4.1.99.Final</netty.version>
     <okhttp.version>3.14.9</okhttp.version>
     <sat.version>0.15.0</sat.version>
     <slf4j.version>2.0.6</slf4j.version>