Upgrade Netty to 4.1.104.Final and Jackson to 2.16.0 (#16102)

* Update Jackson to 2.16.0

See openhab/openhab-core#3956

* Upgrade Netty to 4.1.104.Final

See openhab/openhab-core#3955

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

diff --git a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
index 71d0fdfad0291f0152a5c3b753711eb91b220e90..5e7cb5b20b1538abb113165abfad57b7b46bc166 100644 (file)
--- a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
+++ b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
@@ -37,11 +37,6 @@ Fragment-Host: org.openhab.automation.groovyscripting
        org.apiguardian.api;version='[1.1.2,1.1.3)',\
        tech.units.indriya;version='[2.2.0,2.2.1)',\
        uom-lib-common;version='[2.2.0,2.2.1)',\
-       com.fasterxml.jackson.core.jackson-annotations;version='[2.15.2,2.15.3)',\
-       com.fasterxml.jackson.core.jackson-core;version='[2.15.2,2.15.3)',\
-       com.fasterxml.jackson.core.jackson-databind;version='[2.15.2,2.15.3)',\
-       com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.15.2,2.15.3)',\
-       org.yaml.snakeyaml;version='[2.0.0,2.0.1)',\
        io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
        com.sun.jna;version='[5.13.0,5.13.1)',\
        com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
@@ -84,4 +79,9 @@ Fragment-Host: org.openhab.automation.groovyscripting
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
        org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\
+       com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.1)',\
+       com.fasterxml.jackson.core.jackson-databind;version='[2.16.0,2.16.1)',\
+       com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.16.0,2.16.1)',\
+       org.jsr-305;version='[3.0.2,3.0.3)',\
+       org.yaml.snakeyaml;version='[2.2.0,2.2.1)'

diff --git a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
index 12c44c50b7dd64d2d2433b26ce6dac905f356288..580ba740d2ae2e95f4633ddb3b5b31ebde33e27e 100644 (file)
--- a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
+++ b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
@@ -78,5 +78,4 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
        org.openhab.core.io.console;version='[4.2.0,4.2.1)',\
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
-       org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun
index c09390c1ab367b864fdaa5e3ef0812a12d3a2820..c80bbac09f6caf31dc624ae31cc347e7fdc3678a 100644 (file)
--- a/itests/org.openhab.binding.astro.tests/itest.bndrun
+++ b/itests/org.openhab.binding.astro.tests/itest.bndrun
@@ -55,5 +55,4 @@ Fragment-Host: org.openhab.binding.astro
        org.openhab.core.io.console;version='[4.2.0,4.2.1)',\
        org.openhab.core.storage.json;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
-       org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
index 1c51d601117b325e5d45fb96eb4edf2ef887bb8c..8aeb27fe094935f6c8b437179130f31b3399be0f 100644 (file)
--- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
+++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
@@ -87,5 +87,4 @@ Fragment-Host: org.openhab.binding.avmfritz
        org.openhab.core.io.net;version='[4.2.0,4.2.1)',\
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
-       org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun
index fd0381b2752ef58935e545f2fdb9eeda932493e3..e17ecc674fc15e83d4388398a276991a42a52d53 100644 (file)
--- a/itests/org.openhab.binding.hue.tests/itest.bndrun
+++ b/itests/org.openhab.binding.hue.tests/itest.bndrun
@@ -93,5 +93,4 @@ Fragment-Host: org.openhab.binding.hue
        org.openhab.core.io.transport.mdns;version='[4.2.0,4.2.1)',\
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
-       org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun
index f4c8c00cecf4e48361b381a06238ef59de65dd3b..06f29441ff90dc741ae656d49defe72a0e5caafa 100644 (file)
--- a/itests/org.openhab.binding.max.tests/itest.bndrun
+++ b/itests/org.openhab.binding.max.tests/itest.bndrun
@@ -73,5 +73,4 @@ Fragment-Host: org.openhab.binding.max
        org.openhab.core.io.console;version='[4.2.0,4.2.1)',\
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
-       org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
index 3527e595753b65e15aa9299a38bdc0468b973198..87f1c979a416c07a2a7827b5e339994b8338daf3 100644 (file)
--- a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
@@ -93,5 +93,4 @@ Fragment-Host: org.openhab.binding.mielecloud
        org.openhab.core.io.net;version='[4.2.0,4.2.1)',\
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
-       org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun
index 2f4675e588cf0af8195175353900f40137a31158..60efe1d9bb80b15e998161c3a980520f750d7cd1 100644 (file)
--- a/itests/org.openhab.binding.modbus.tests/itest.bndrun
+++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun
@@ -81,5 +81,4 @@ Fragment-Host: org.openhab.binding.modbus
        org.openhab.core.io.transport.modbus;version='[4.2.0,4.2.1)',\
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
-       org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
index 039d52337315ec88dc978bd034e89b9b66256768..3ad0fe6938d569aa7a41f09754d81082daeddf43 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@@ -82,16 +82,6 @@ Import-Package: \
        com.google.gson;version='[2.10.1,2.10.2)',\
        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)',\
        biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\
@@ -114,4 +104,15 @@ Import-Package: \
        org.openhab.core.io.transport.mqtt;version='[4.2.0,4.2.1)',\
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
-       org.openhab.core.transform;version='[4.2.0,4.2.1)'
+       org.openhab.core.transform;version='[4.2.0,4.2.1)',\
+       jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
+       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)'

diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
index dc62cc4ae1021b2a9e14fc475c54b70c705d638f..9f94e8e3568106b4244856d9d3bdcc60422439a5 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
@@ -82,16 +82,6 @@ Import-Package: \
        com.google.gson;version='[2.10.1,2.10.2)',\
        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)',\
        biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\
@@ -114,5 +104,16 @@ Import-Package: \
        org.openhab.core.io.transport.mqtt;version='[4.2.0,4.2.1)',\
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
-       org.openhab.core.transform;version='[4.2.0,4.2.1)'
+       org.openhab.core.transform;version='[4.2.0,4.2.1)',\
+       jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
+       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)'
 

diff --git a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
index c61ea363922601463a6d34ca8e8226c41bc42d26..1431a33ad1014c84e46f6536fb0c916b42003140 100644 (file)
--- a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
@@ -82,16 +82,6 @@ Import-Package: \
        com.google.gson;version='[2.10.1,2.10.2)',\
        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)',\
        biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\
@@ -115,4 +105,15 @@ Import-Package: \
        org.openhab.core.io.transport.mqtt;version='[4.2.0,4.2.1)',\
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
-       org.openhab.core.transform;version='[4.2.0,4.2.1)'
+       org.openhab.core.transform;version='[4.2.0,4.2.1)',\
+       jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
+       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)'

diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun
index 6a4dfdbe9834ef7824f27a5f034e7e2bd18a03b6..c54d7a2f16c56299de1b6eff7bed5682903ca11c 100644 (file)
--- a/itests/org.openhab.binding.ntp.tests/itest.bndrun
+++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun
@@ -77,5 +77,4 @@ Fragment-Host: org.openhab.binding.ntp
        org.openhab.core.io.console;version='[4.2.0,4.2.1)',\
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
-       org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
index 76f12b938582d4a2e464cab57e498b283df230a3..ce37c882a9b168a3f0432a3925ec3737d588e170 100644 (file)
--- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
@@ -80,5 +80,4 @@ Fragment-Host: org.openhab.binding.systeminfo
        org.openhab.core.io.console;version='[4.2.0,4.2.1)',\
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
-       org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
index 24c558310cce95972ce8cea45e81334f9ce582d8..141ae36de11fe85d14ba8604ede7bf901e5ac17d 100644 (file)
--- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun
+++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
@@ -84,5 +84,4 @@ Fragment-Host: org.openhab.binding.tradfri
        org.openhab.core.io.transport.mdns;version='[4.2.0,4.2.1)',\
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
-       org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun
index 89f328ee92ffe7889ff8329966bb2343aca80770..e9db1f88b9dc8270f0dc0e5131061bcd94c5df22 100644 (file)
--- a/itests/org.openhab.binding.wemo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun
@@ -89,5 +89,4 @@ Fragment-Host: org.openhab.binding.wemo
        org.openhab.core.io.transport.upnp;version='[4.2.0,4.2.1)',\
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.core.thing;version='[4.2.0,4.2.1)',\
-       org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.core.transform;version='[4.2.0,4.2.1)'

diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
index 07a5d488ec73328d26ffabad4ef677bc6aba5911..2430d6c988be63696a42e7e502ff23ec8965abed 100644 (file)
--- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
+++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
@@ -71,5 +71,4 @@ Fragment-Host: org.openhab.persistence.mapdb
        org.openhab.core.persistence;version='[4.2.0,4.2.1)',\
        org.openhab.core.test;version='[4.2.0,4.2.1)',\
        org.openhab.persistence.mapdb;version='[4.2.0,4.2.1)',\
-       org.openhab.persistence.mapdb.tests;version='[4.2.0,4.2.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.openhab.persistence.mapdb.tests;version='[4.2.0,4.2.1)'

diff --git a/pom.xml b/pom.xml
index 7fb19911b2bd1c02d1870be97298104e38ce0d44..b2ce235ed18b29f30a735c08f5d4aca24356be49 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -72,9 +72,9 @@
     <bnd.version>7.0.0</bnd.version>
     <commons.net.version>3.9.0</commons.net.version>
     <eea.version>2.2.1</eea.version>
-    <jackson.version>2.15.2</jackson.version>
+    <jackson.version>2.16.0</jackson.version>
     <karaf.version>4.4.4</karaf.version>
-    <netty.version>4.1.99.Final</netty.version>
+    <netty.version>4.1.104.Final</netty.version>
     <okhttp.version>3.14.9</okhttp.version>
     <sat.version>0.15.0</sat.version>
     <slf4j.version>2.0.6</slf4j.version>