From 7743e9f9abbdeb21e1be74ab75a4d7249949dfb0 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Mon, 21 Aug 2023 21:23:09 +0200 Subject: [PATCH] Update CXF to 3.6.1 (#3770) Updates CXF from 3.4.5 to 3.6.1 For some recent release notes, see: * [3.5.0](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310511&version=12348382) * [3.6.0](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310511&version=12351469) * [3.6.1](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310511&version=12353191) This upgrade addresses: * CVE-2022-46363 * CVE-2022-46364 Signed-off-by: Wouter Born --- bom/runtime/pom.xml | 2 +- bom/test/pom.xml | 2 +- .../openhab-tp/src/main/feature/feature.xml | 20 +++++++++---------- .../itest.bndrun | 1 - .../itest.bndrun | 1 - .../itest.bndrun | 1 - .../itest.bndrun | 1 - .../itest.bndrun | 1 - .../itest.bndrun | 1 - .../itest.bndrun | 1 - .../itest.bndrun | 1 - .../itest.bndrun | 1 - .../itest.bndrun | 1 - .../itest.bndrun | 1 - .../itest.bndrun | 1 - .../itest.bndrun | 1 - .../itest.bndrun | 1 - .../itest.bndrun | 18 ++++++++--------- .../itest.bndrun | 5 ++--- .../itest.bndrun | 2 -- .../itest.bndrun | 1 - .../itest.bndrun | 5 ++--- .../itest.bndrun | 1 - itests/org.openhab.core.tests/itest.bndrun | 1 - 24 files changed, 24 insertions(+), 47 deletions(-) diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 7499fb8133c..dcc8ff13644 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -17,7 +17,7 @@ 2.7.4 - 3.4.5 + 3.6.1 2.15.2 9.4.50.v20221201 2.2.0 diff --git a/bom/test/pom.xml b/bom/test/pom.xml index 48b6f5be1db..d35524be7ff 100644 --- a/bom/test/pom.xml +++ b/bom/test/pom.xml @@ -16,7 +16,7 @@ openHAB Core :: BOM :: Test - 3.4.5 + 3.6.1 5.9.2 4.11.0 diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml index 9f4034732ba..ab2b8ac495d 100644 --- a/features/karaf/openhab-tp/src/main/feature/feature.xml +++ b/features/karaf/openhab-tp/src/main/feature/feature.xml @@ -133,21 +133,21 @@ - openhab.tp;feature=cxf;version=3.4.5 + openhab.tp;feature=cxf;version=3.6.1 openhab.tp-jaxws - mvn:com.fasterxml.woodstox/woodstox-core/6.2.6 + mvn:com.fasterxml.woodstox/woodstox-core/6.5.1 mvn:jakarta.jws/jakarta.jws-api/2.1.0 mvn:jakarta.xml.ws/jakarta.xml.ws-api/2.3.3 mvn:javax.servlet/javax.servlet-api/3.1.0 - mvn:org.apache.aries.spec/org.apache.aries.javax.jax.rs-api/1.0.1 - mvn:org.apache.ws.xmlschema/xmlschema-core/2.2.5 + mvn:org.apache.aries.spec/org.apache.aries.javax.jax.rs-api/1.0.4 + mvn:org.apache.ws.xmlschema/xmlschema-core/2.3.0 mvn:org.codehaus.woodstox/stax2-api/4.2.1 - mvn:org.apache.cxf/cxf-core/3.4.5 - mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.4.5 - mvn:org.apache.cxf/cxf-rt-rs-client/3.4.5 - mvn:org.apache.cxf/cxf-rt-rs-sse/3.4.5 - mvn:org.apache.cxf/cxf-rt-security/3.4.5 - mvn:org.apache.cxf/cxf-rt-transports-http/3.4.5 + mvn:org.apache.cxf/cxf-core/3.6.1 + mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.6.1 + mvn:org.apache.cxf/cxf-rt-rs-client/3.6.1 + mvn:org.apache.cxf/cxf-rt-rs-sse/3.6.1 + mvn:org.apache.cxf/cxf-rt-security/3.6.1 + mvn:org.apache.cxf/cxf-rt-transports-http/3.6.1 diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun index 035e305e7a9..9c53b6c796c 100644 --- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun +++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun @@ -66,7 +66,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client org.openhab.core.io.net;version='[4.1.0,4.1.1)',\ org.openhab.core.test;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)',\ diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index ca830f97013..14a5d1cbcdb 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -64,7 +64,6 @@ Fragment-Host: org.openhab.core.automation 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)',\ diff --git a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun index d7e12f4fc05..34aed5a04d1 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -64,7 +64,6 @@ Fragment-Host: org.openhab.core.automation 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)',\ diff --git a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun index cd8fd51a20b..b099138fb2b 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -61,7 +61,6 @@ Fragment-Host: org.openhab.core.automation.module.script 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)',\ diff --git a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun index 1419752a776..c751cac6aa0 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -64,7 +64,6 @@ Fragment-Host: org.openhab.core.automation 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)',\ diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index 3123d519255..ce27e95c46b 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -64,7 +64,6 @@ Fragment-Host: org.openhab.core.automation 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)',\ diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun index 90022058c33..886bd951726 100644 --- a/itests/org.openhab.core.config.core.tests/itest.bndrun +++ b/itests/org.openhab.core.config.core.tests/itest.bndrun @@ -59,7 +59,6 @@ Fragment-Host: org.openhab.core.config.core org.openhab.core.config.core.tests;version='[4.1.0,4.1.1)',\ org.openhab.core.test;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)',\ diff --git a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun index e4aeba2bbbd..6054da8b8b7 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun @@ -64,7 +64,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns 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)',\ diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun index de5f18bdaf3..6dfa200e9dd 100644 --- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun @@ -63,7 +63,6 @@ Fragment-Host: org.openhab.core.config.discovery 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)',\ diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun index 13952018bf5..280e765e7f6 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun @@ -64,7 +64,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs 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)',\ diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun index 5e745ef04a3..a18c03aef95 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun @@ -72,7 +72,6 @@ Provide-Capability: \ 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)',\ diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun index 2dc72fb519b..d3dde388735 100644 --- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun +++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun @@ -52,7 +52,6 @@ Fragment-Host: org.openhab.core.config.dispatch org.openhab.core.config.dispatch.tests;version='[4.1.0,4.1.1)',\ org.openhab.core.test;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)',\ diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index 0a2c477d20a..97fb5ce8bca 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -61,7 +61,6 @@ feature.openhab-config: \ org.openhab.core.ephemeris.tests;version='[4.1.0,4.1.1)',\ org.openhab.core.test;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)',\ diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun index 58716867e0e..f3fbeb0333b 100644 --- a/itests/org.openhab.core.io.net.tests/itest.bndrun +++ b/itests/org.openhab.core.io.net.tests/itest.bndrun @@ -70,7 +70,6 @@ Fragment-Host: org.openhab.core.io.net org.openhab.core.io.net.tests;version='[4.1.0,4.1.1)',\ org.openhab.core.test;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)',\ diff --git a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun index 71d775c3a18..22670f5acd5 100644 --- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun +++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun @@ -28,19 +28,10 @@ Fragment-Host: org.openhab.core.io.rest.core org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ 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.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)',\ @@ -107,4 +98,11 @@ Fragment-Host: org.openhab.core.io.rest.core 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)' diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index 0213525638a..79c840168eb 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -110,9 +110,8 @@ Fragment-Host: org.openhab.core.model.item org.openhab.core.transform;version='[4.1.0,4.1.1)',\ org.openhab.core.voice;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.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ 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)' + uom-lib-common;version='[2.2.0,2.2.1)',\ + org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index e1dba991d28..410c1aea6aa 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -115,9 +115,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.openhab.core.transform;version='[4.1.0,4.1.1)',\ org.openhab.core.voice;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)',\ - org.openhab.core.model.item.runtime;version='[4.1.0,4.1.1)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)' diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index cf65e2602d7..7724a4344da 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -120,6 +120,5 @@ Fragment-Host: org.openhab.core.model.script org.openhab.base-fixes;version='[1.0.0,1.0.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ - org.openhab.core.model.item.runtime;version='[4.1.0,4.1.1)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)' diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index 9e08f6ee0de..07eea033337 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -119,9 +119,8 @@ Fragment-Host: org.openhab.core.model.thing org.openhab.core.transform;version='[4.1.0,4.1.1)',\ org.openhab.core.voice;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.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ 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)' + uom-lib-common;version='[2.2.0,2.2.1)',\ + org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun index 3396796ca50..cce09022d8f 100644 --- a/itests/org.openhab.core.storage.json.tests/itest.bndrun +++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun @@ -57,7 +57,6 @@ Fragment-Host: org.openhab.core.storage.json 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)',\ diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun index 81c5e759b32..56e0a405184 100644 --- a/itests/org.openhab.core.tests/itest.bndrun +++ b/itests/org.openhab.core.tests/itest.bndrun @@ -56,7 +56,6 @@ Fragment-Host: org.openhab.core org.openhab.core.test;version='[4.1.0,4.1.1)',\ org.openhab.core.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)',\