Skip to content

Commit

Permalink
Upgrade CXF to 3.6.2 (#3826)
Browse files Browse the repository at this point in the history 
Upgrades CXF from 3.6.1 to 3.6.2.

For release notes, see:

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310511&version=12353311

It has a fix to address OOM issues when using HTTP clients:

https://issues.apache.org/jira/browse/CXF-8885

Signed-off-by: Wouter Born <github@maindrain.net>
  • Loading branch information
@wborn
wborn authored Oct 4, 2023
1 parent c82f8fc commit 02f6c5c
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 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.6.1</cxf.version>
<cxf.version>3.6.2</cxf.version>
<jackson.version>2.15.2</jackson.version>
<jetty.version>9.4.52.v20230823</jetty.version>
<pax.logging.version>2.2.3</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.6.1</cxf.version>
<cxf.version>3.6.2</cxf.version>
<junit.version>5.9.2</junit.version>
<mockito.version>4.11.0</mockito.version>
</properties>
Expand Down
16 changes: 8 additions & 8 deletions features/karaf/openhab-tp/src/main/feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,21 +112,21 @@
</feature>

<feature name="openhab.tp-cxf" description="Apache CXF" version="${project.version}">
<capability>openhab.tp;feature=cxf;version=3.6.1</capability>
<capability>openhab.tp;feature=cxf;version=3.6.2</capability>
<feature dependency="true">openhab.tp-jaxws</feature>
<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.4</bundle>
<bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/2.3.0</bundle>
<bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/2.3.1</bundle>
<bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/4.2.1</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>
<bundle>mvn:org.apache.cxf/cxf-core/3.6.2</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.6.2</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.6.2</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-rs-sse/3.6.2</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-security/3.6.2</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-transports-http/3.6.2</bundle>
</feature>

<feature name="openhab.tp-jbbp" description="Java Binary Block Parser library" version="${project.version}">
Expand Down
16 changes: 8 additions & 8 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 @@ -68,13 +68,6 @@ Fragment-Host: org.openhab.core.io.rest.core
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)',\
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)',\
json-path;version='[2.8.0,2.8.1)',\
net.minidev.accessors-smart;version='[2.4.9,2.4.10)',\
net.minidev.json-smart;version='[2.4.10,2.4.11)',\
Expand Down Expand Up @@ -104,4 +97,11 @@ Fragment-Host: org.openhab.core.io.rest.core
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.10.1,2.10.2)',\
org.objectweb.asm;version='[9.5.0,9.5.1)'
org.objectweb.asm;version='[9.5.0,9.5.1)',\
org.apache.cxf.cxf-core;version='[3.6.2,3.6.3)',\
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.2,3.6.3)',\
org.apache.cxf.cxf-rt-rs-client;version='[3.6.2,3.6.3)',\
org.apache.cxf.cxf-rt-rs-sse;version='[3.6.2,3.6.3)',\
org.apache.cxf.cxf-rt-security;version='[3.6.2,3.6.3)',\
org.apache.cxf.cxf-rt-transports-http;version='[3.6.2,3.6.3)',\
org.apache.ws.xmlschema.core;version='[2.3.1,2.3.2)'

0 comments on commit 02f6c5c

Please sign in to comment.