Skip to content

Commit

Permalink
Upgrade Netty to 4.1.104.Final and Jackson to 2.16.0 (openhab#16102)
Browse files Browse the repository at this point in the history 
* 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>
  • Loading branch information
@holgerfriedrich
holgerfriedrich authored Dec 23, 2023
1 parent c58d894 commit 09cedf0
Show file tree
Hide file tree
Showing 17 changed files with 56 additions and 65 deletions.
12 changes: 6 additions & 6 deletions itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down Expand Up @@ -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)'
3 changes: 1 addition & 2 deletions itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
3 changes: 1 addition & 2 deletions itests/org.openhab.binding.astro.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
3 changes: 1 addition & 2 deletions itests/org.openhab.binding.avmfritz.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
3 changes: 1 addition & 2 deletions itests/org.openhab.binding.hue.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
3 changes: 1 addition & 2 deletions itests/org.openhab.binding.max.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
3 changes: 1 addition & 2 deletions itests/org.openhab.binding.mielecloud.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
3 changes: 1 addition & 2 deletions itests/org.openhab.binding.modbus.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
23 changes: 12 additions & 11 deletions itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand All @@ -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)'
23 changes: 12 additions & 11 deletions itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand All @@ -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)'

23 changes: 12 additions & 11 deletions itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand All @@ -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)'
3 changes: 1 addition & 2 deletions itests/org.openhab.binding.ntp.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
3 changes: 1 addition & 2 deletions itests/org.openhab.binding.systeminfo.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
3 changes: 1 addition & 2 deletions itests/org.openhab.binding.tradfri.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
3 changes: 1 addition & 2 deletions itests/org.openhab.binding.wemo.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
3 changes: 1 addition & 2 deletions itests/org.openhab.persistence.mapdb.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 09cedf0

Please sign in to comment.