From 09cedf00e3b5a49ae8b377d1e776ab094885840b Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Sat, 23 Dec 2023 23:52:47 +0100
Subject: [PATCH] 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>
---
 .../itest.bndrun                              | 12 +++++-----
 .../itest.bndrun                              |  3 +--
 .../itest.bndrun                              |  3 +--
 .../itest.bndrun                              |  3 +--
 .../itest.bndrun                              |  3 +--
 .../itest.bndrun                              |  3 +--
 .../itest.bndrun                              |  3 +--
 .../itest.bndrun                              |  3 +--
 .../itest.bndrun                              | 23 ++++++++++---------
 .../itest.bndrun                              | 23 ++++++++++---------
 .../itest.bndrun                              | 23 ++++++++++---------
 .../itest.bndrun                              |  3 +--
 .../itest.bndrun                              |  3 +--
 .../itest.bndrun                              |  3 +--
 .../itest.bndrun                              |  3 +--
 .../itest.bndrun                              |  3 +--
 pom.xml                                       |  4 ++--
 17 files changed, 56 insertions(+), 65 deletions(-)

diff --git a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
index 71d0fdfad02..5e7cb5b20b1 100644
--- 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 12c44c50b7d..580ba740d2a 100644
--- 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 c09390c1ab3..c80bbac09f6 100644
--- 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 1c51d601117..8aeb27fe094 100644
--- 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 fd0381b2752..e17ecc674fc 100644
--- 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 f4c8c00cecf..06f29441ff9 100644
--- 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 3527e595753..87f1c979a41 100644
--- 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 2f4675e588c..60efe1d9bb8 100644
--- 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 039d5233731..3ad0fe6938d 100644
--- 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 dc62cc4ae10..9f94e8e3568 100644
--- 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 c61ea363922..1431a33ad10 100644
--- 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 6a4dfdbe983..c54d7a2f16c 100644
--- 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 76f12b93858..ce37c882a9b 100644
--- 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 24c558310cc..141ae36de11 100644
--- 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 89f328ee92f..e9db1f88b9d 100644
--- 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 07a5d488ec7..2430d6c988b 100644
--- 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 7fb19911b2b..b2ce235ed18 100644
--- 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>