public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve runbundles for CXF upgrade (#15473)

Browse Source 
* Resolve runbundles for CXF upgrade

Related to openhab/openhab-core#3770

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

* Replace Grizzly JAX-RS Client with Jetty HTTP client in hueemulation tests

It seems that the Grizzly JAX-RS Client implementation does not work well with the new CXF dependencies on the classpath.
As we do not use Grizzly anywhere else it is probably best to also stop using the Grizzly HTTP Server in these tests in the future.

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

---------

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2023-08-23 09:14:15 +02:00
committed by GitHub
parent 5f31eeb506
commit 626c6bde4a
24 changed files with 166 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
-1
View File
@@ -69,7 +69,6 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
org.openhab.core.thing;version='[4.1.0,4.1.1)',\
org.openhab.core.transform;version='[4.1.0,4.1.1)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
itests/org.openhab.binding.astro.tests/itest.bndrun
-1
View File
@@ -52,7 +52,6 @@ Fragment-Host: org.openhab.binding.astro
org.openhab.core.thing;version='[4.1.0,4.1.1)',\
org.openhab.core.transform;version='[4.1.0,4.1.1)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
itests/org.openhab.binding.avmfritz.tests/itest.bndrun
-1
View File
@@ -78,7 +78,6 @@ Fragment-Host: org.openhab.binding.avmfritz
org.openhab.core.thing;version='[4.1.0,4.1.1)',\
org.openhab.core.transform;version='[4.1.0,4.1.1)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
itests/org.openhab.binding.hue.tests/itest.bndrun
-1
View File
@@ -84,7 +84,6 @@ Fragment-Host: org.openhab.binding.hue
org.openhab.core.thing;version='[4.1.0,4.1.1)',\
org.openhab.core.transform;version='[4.1.0,4.1.1)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
itests/org.openhab.binding.max.tests/itest.bndrun
-1
View File
@@ -64,7 +64,6 @@ Fragment-Host: org.openhab.binding.max
org.openhab.core.thing;version='[4.1.0,4.1.1)',\
org.openhab.core.transform;version='[4.1.0,4.1.1)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
itests/org.openhab.binding.mielecloud.tests/itest.bndrun
-1
View File
@@ -84,7 +84,6 @@ Fragment-Host: org.openhab.binding.mielecloud
org.openhab.core.thing;version='[4.1.0,4.1.1)',\
org.openhab.core.transform;version='[4.1.0,4.1.1)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
itests/org.openhab.binding.modbus.tests/itest.bndrun
-1
View File
@@ -72,7 +72,6 @@ Fragment-Host: org.openhab.binding.modbus
org.openhab.core.thing;version='[4.1.0,4.1.1)',\
org.openhab.core.transform;version='[4.1.0,4.1.1)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
-2
View File
@@ -105,8 +105,6 @@ Import-Package: \
org.openhab.core.thing;version='[4.1.0,4.1.1)',\
org.openhab.core.transform;version='[4.1.0,4.1.1)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
-2
View File
@@ -105,8 +105,6 @@ Import-Package: \
org.openhab.core.thing;version='[4.1.0,4.1.1)',\
org.openhab.core.transform;version='[4.1.0,4.1.1)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
-2
View File
@@ -106,8 +106,6 @@ Import-Package: \
org.openhab.core.thing;version='[4.1.0,4.1.1)',\
org.openhab.core.transform;version='[4.1.0,4.1.1)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
itests/org.openhab.binding.nest.tests/itest.bndrun
+8 -10
View File
@@ -26,19 +26,10 @@ Fragment-Host: org.openhab.binding.nest
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
org.apache.aries.javax.jax.rs-api;version='[1.0.1,1.0.2)',\
jakarta.annotation-api;version='[1.3.5,1.3.6)',\
jakarta.xml.soap-api;version='[1.4.2,1.4.3)',\
jakarta.xml.ws-api;version='[2.3.3,2.3.4)',\
org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\
org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\
stax2-api;version='[4.2.1,4.2.2)',\
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
org.apache.cxf.cxf-core;version='[3.4.5,3.4.6)',\
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.5,3.4.6)',\
org.apache.cxf.cxf-rt-rs-client;version='[3.4.5,3.4.6)',\
org.apache.cxf.cxf-rt-rs-sse;version='[3.4.5,3.4.6)',\
org.apache.cxf.cxf-rt-security;version='[3.4.5,3.4.6)',\
org.apache.cxf.cxf-rt-transports-http;version='[3.4.5,3.4.6)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\
@@ -111,4 +102,11 @@ Fragment-Host: org.openhab.binding.nest
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.woodstox.woodstox-core;version='[6.5.1,6.5.2)'
com.fasterxml.woodstox.woodstox-core;version='[6.5.1,6.5.2)',\
org.apache.cxf.cxf-core;version='[3.6.1,3.6.2)',\
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.1,3.6.2)',\
org.apache.cxf.cxf-rt-rs-client;version='[3.6.1,3.6.2)',\
org.apache.cxf.cxf-rt-rs-sse;version='[3.6.1,3.6.2)',\
org.apache.cxf.cxf-rt-security;version='[3.6.1,3.6.2)',\
org.apache.cxf.cxf-rt-transports-http;version='[3.6.1,3.6.2)',\
org.apache.ws.xmlschema.core;version='[2.3.0,2.3.1)'
itests/org.openhab.binding.ntp.tests/itest.bndrun
-1
View File
@@ -68,7 +68,6 @@ Fragment-Host: org.openhab.binding.ntp
org.openhab.core.thing;version='[4.1.0,4.1.1)',\
org.openhab.core.transform;version='[4.1.0,4.1.1)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
itests/org.openhab.binding.systeminfo.tests/itest.bndrun
-1
View File
@@ -71,7 +71,6 @@ Fragment-Host: org.openhab.binding.systeminfo
org.openhab.core.thing;version='[4.1.0,4.1.1)',\
org.openhab.core.transform;version='[4.1.0,4.1.1)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
itests/org.openhab.binding.tradfri.tests/itest.bndrun
-1
View File
@@ -75,7 +75,6 @@ Fragment-Host: org.openhab.binding.tradfri
org.openhab.core.thing;version='[4.1.0,4.1.1)',\
org.openhab.core.transform;version='[4.1.0,4.1.1)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
itests/org.openhab.binding.wemo.tests/itest.bndrun
-1
View File
@@ -80,7 +80,6 @@ Fragment-Host: org.openhab.binding.wemo
org.openhab.core.thing;version='[4.1.0,4.1.1)',\
org.openhab.core.transform;version='[4.1.0,4.1.1)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
itests/org.openhab.persistence.mapdb.tests/itest.bndrun
-1
View File
@@ -62,7 +62,6 @@ Fragment-Host: org.openhab.persistence.mapdb
org.openhab.persistence.mapdb;version='[4.1.0,4.1.1)',\
org.openhab.persistence.mapdb.tests;version='[4.1.0,4.1.1)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\