demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Upgrade Aries JAX-RS Whiteboard to 2.0.0 (#2316)

Browse Source 
Upgrades the Aries JAX-RS Whiteboard from 1.0.9 to 2.0.0

The biggest change is that CXF is now an external dependency of the Aries JAX-RS Whiteboard bundle.
This also fixes the issue that you could not properly debug the CXF code because there was no source code for the embedded classes.
CXF 3.4.3 is now used instead of 3.2.14.

For release notes see:

* Changelog: https://github.com/apache/aries-jax-rs-whiteboard/blob/master/changelog.md
* Apache JIRA: https://issues.apache.org/jira/issues/?jql=project%20%3D%20ARIES%20AND%20fixVersion%20in%20(jax-rs-whiteboard-1.0.10%2C%20jax-rs-whiteboard-1.1.0%2C%20jax-rs-whiteboard-2.0.0)%20AND%20component%20%3D%20jax-rs-whiteboard

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2021-04-25 11:23:56 +02:00
committed by GitHub
parent 872dacfe7c
commit 0fe6b31f19
4 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bom/runtime/pom.xml
+1 -1
View File
@@ -134,7 +134,7 @@
<dependency>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>1.0.9</version>
<version>2.0.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
bom/test/pom.xml
+1 -1
View File
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>1.0.9</version>
<version>2.0.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
features/karaf/openhab-tp/src/main/feature/feature.xml
+24 -15
View File
@@ -92,25 +92,34 @@
<bundle dependency="true">mvn:org.yaml/snakeyaml/1.27</bundle>
</feature>
<feature name="openhab.tp-jax-rs-whiteboard" version="${project.version}">
<capability>openhab.tp;feature=jax-rs-whiteboard;version=1.0.9</capability>
<!-- BEG: https://issues.apache.org/jira/browse/KARAF-6536 -->
<!-- Add it here, so we do not use to rely on a feature that is using version ranges. -->
<feature name="openhab.tp-jax-rs-whiteboard" description="Aries JAX-RS Whiteboard" version="${project.version}">
<capability>openhab.tp;feature=jax-rs-whiteboard;version=2.0.0</capability>
<feature>http-whiteboard</feature>
<feature dependency="true">openhab.tp-jaxws</feature>
<bundle dependency="true">mvn:org.apache.aries.spec/org.apache.aries.javax.jax.rs-api/1.0.1</bundle>
<feature dependency="true">openhab.tp-cxf</feature>
<feature dependency="true">openhab.tp-jaxb</feature>
<bundle dependency="true">mvn:org.osgi/org.osgi.util.function/1.1.0</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.util.promise/1.1.0</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.util.promise/1.1.1</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.service.jaxrs/1.0.0</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.annotation-api-1.3/1.3_1</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.3/2.3_3</bundle>
<bundle>mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.whiteboard/1.0.9</bundle>
<!-- END: https://issues.apache.org/jira/browse/KARAF-6536 -->
<bundle>mvn:org.apache.aries.component-dsl/org.apache.aries.component-dsl.component-dsl/1.2.2</bundle>
<bundle>mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.whiteboard/2.0.0</bundle>
</feature>
<config name="org.apache.aries.jax.rs.whiteboard.default">
replace.loopback.address.with.localhost=false
</config>
<feature name="openhab.tp-cxf" description="Apache CXF" version="${project.version}">
<capability>openhab.tp;feature=cxf;version=3.4.3</capability>
<feature dependency="true">openhab.tp-jaxws</feature>
<bundle dependency="true">mvn:com.fasterxml.woodstox/woodstox-core/6.2.4</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.codehaus.woodstox/stax2-api/4.2.1</bundle>
<bundle>mvn:org.apache.cxf/cxf-core/3.4.3</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.4.3</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.4.3</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-rs-sse/3.4.3</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-security/3.4.3</bundle>
<bundle>mvn:org.apache.cxf/cxf-rt-transports-http/3.4.3</bundle>
</feature>
<feature name="openhab.tp-jbbp" description="Java Binary Block Parser library" version="${project.version}">
itests/org.openhab.core.io.rest.core.tests/itest.bndrun
+18 -4
View File
@@ -26,11 +26,8 @@ Fragment-Host: org.openhab.core.io.rest.core
org.hamcrest;version='[2.2.0,2.2.1)',\
org.opentest4j;version='[1.2.0,1.2.1)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
org.apache.aries.jax.rs.whiteboard;version='[1.0.9,1.0.10)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
javax.xml.soap-api;version='[1.4.0,1.4.1)',\
org.apache.servicemix.specs.jaxws-api-2.3;version='[2.3.0,2.3.1)',\
org.openhab.core;version='[3.1.0,3.1.1)',\
org.openhab.core.config.core;version='[3.1.0,3.1.1)',\
org.openhab.core.config.discovery;version='[3.1.0,3.1.1)',\
@@ -75,4 +72,21 @@ Fragment-Host: org.openhab.core.io.rest.core
org.apache.xbean.finder;version='[4.18.0,4.18.1)',\
org.objectweb.asm;version='[9.1.0,9.1.1)',\
org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
org.objectweb.asm.tree;version='[9.0.0,9.0.1)'
org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
com.fasterxml.woodstox.woodstox-core;version='[6.2.4,6.2.5)',\
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.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.2,1.3.3)',\
org.apache.cxf.cxf-core;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-rs-client;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-rs-sse;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-security;version='[3.4.3,3.4.4)',\
org.apache.cxf.cxf-rt-transports-http;version='[3.4.3,3.4.4)',\
org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\
org.objectweb.asm.tree.analysis;version='[9.0.0,9.0.1)',\
org.objectweb.asm.util;version='[9.0.0,9.0.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
stax2-api;version='[4.2.1,4.2.2)'