Skip to content

Commit

Permalink
Update CXF to 3.6.1 (#3770)
Browse files Browse the repository at this point in the history 
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 <[email protected]>
  • Loading branch information
@wborn
wborn authored Aug 21, 2023
1 parent c0b4ccf commit 7743e9f
Show file tree
Hide file tree
Showing 24 changed files with 24 additions and 47 deletions.
2 changes: 1 addition & 1 deletion bom/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<properties>
<californium.version>2.7.4</californium.version>
<cxf.version>3.4.5</cxf.version>
<cxf.version>3.6.1</cxf.version>
<jackson.version>2.15.2</jackson.version>
<jetty.version>9.4.50.v20221201</jetty.version>
<pax.logging.version>2.2.0</pax.logging.version>
Expand Down
2 changes: 1 addition & 1 deletion bom/test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<name>openHAB Core :: BOM :: Test</name>

<properties>
<cxf.version>3.4.5</cxf.version>
<cxf.version>3.6.1</cxf.version>
<junit.version>5.9.2</junit.version>
<mockito.version>4.11.0</mockito.version>
</properties>
Expand Down
20 changes: 10 additions & 10 deletions features/karaf/openhab-tp/src/main/feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,21 +133,21 @@
</feature>

<feature name="openhab.tp-cxf" description="Apache CXF" version="${project.version}">
<capability>openhab.tp;feature=cxf;version=3.4.5</capability>
<capability>openhab.tp;feature=cxf;version=3.6.1</capability>
<feature dependency="true">openhab.tp-jaxws</feature>
<bundle dependency="true">mvn:com.fasterxml.woodstox/woodstox-core/6.2.6</bundle>
<bundle dependency="true">mvn:com.fasterxml.woodstox/woodstox-core/6.5.1</bundle>
<bundle dependency="true">mvn:jakarta.jws/jakarta.jws-api/2.1.0</bundle>
<bundle dependency="true">mvn:jakarta.xml.ws/jakarta.xml.ws-api/2.3.3</bundle>
<bundle dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
<bundle dependency="true">mvn:org.apache.aries.spec/org.apache.aries.javax.jax.rs-api/1.0.1</bundle>
<bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/2.2.5</bundle>
<bundle dependency="true">mvn:org.apache.aries.spec/org.apache.aries.javax.jax.rs-api/1.0.4</bundle>
<bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/2.3.0</bundle>
<bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/4.2.1</bundle>
<bundle>mvn:org.apache.cxf/cxf-core/3.4.5</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.4.5</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.4.5</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-rs-sse/3.4.5</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-security/3.4.5</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-transports-http/3.4.5</bundle>
<bundle>mvn:org.apache.cxf/cxf-core/3.6.1</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.6.1</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.6.1</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-rs-sse/3.6.1</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-security/3.6.1</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-transports-http/3.6.1</bundle>
</feature>

<feature name="openhab.tp-jbbp" description="Java Binary Block Parser library" version="${project.version}">
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.core.automation.integration.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.core.automation.module.core.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.core.automation.module.script.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.core.automation.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.core.config.core.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.core.config.discovery.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.core.config.dispatch.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.core.ephemeris.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.core.io.net.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
18 changes: 8 additions & 10 deletions itests/org.openhab.core.io.rest.core.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down Expand Up @@ -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)'
5 changes: 2 additions & 3 deletions itests/org.openhab.core.model.item.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
2 changes: 0 additions & 2 deletions itests/org.openhab.core.model.rule.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
1 change: 0 additions & 1 deletion itests/org.openhab.core.model.script.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
5 changes: 2 additions & 3 deletions itests/org.openhab.core.model.thing.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
1 change: 0 additions & 1 deletion itests/org.openhab.core.storage.json.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
1 change: 0 additions & 1 deletion itests/org.openhab.core.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down

0 comments on commit 7743e9f

Please sign in to comment.