Skip to content

Commit

Permalink
Downgrade Aries JAX-RS Whiteboard from 2.0.1 to 2.0.0 (#2599)
Browse files Browse the repository at this point in the history
It causes unneccessary bundle refreshes whenever add-ons are installed/uninstalled.
As a result the UI does not get properly notified of installation changes.

Fixes #2580
Reverts the Aries JAX-RS Whiteboard upgrade of #2532

Signed-off-by: Wouter Born <[email protected]>
  • Loading branch information
wborn authored Dec 10, 2021
1 parent 69043be commit 0028a3c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion bom/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
<dependency>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>2.0.1</version>
<version>2.0.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand Down
2 changes: 1 addition & 1 deletion bom/test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>2.0.1</version>
<version>2.0.0</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
Expand Down
4 changes: 2 additions & 2 deletions features/karaf/openhab-tp/src/main/feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,15 @@
</feature>

<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.1</capability>
<capability>openhab.tp;feature=jax-rs-whiteboard;version=2.0.0</capability>
<feature>http-whiteboard</feature>
<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.1</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.service.jaxrs/1.0.0</bundle>
<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.1</bundle>
<bundle>mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.whiteboard/2.0.0</bundle>
</feature>

<feature name="openhab.tp-cxf" description="Apache CXF" version="${project.version}">
Expand Down
4 changes: 2 additions & 2 deletions itests/org.openhab.core.io.rest.core.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ Fragment-Host: org.openhab.core.io.rest.core
org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\
org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.1,2.0.2)',\
com.fasterxml.woodstox.woodstox-core;version='[6.2.6,6.2.7)',\
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)',\
Expand All @@ -94,4 +93,5 @@ Fragment-Host: org.openhab.core.io.rest.core
org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
org.objenesis;version='[3.2.0,3.2.1)',\
biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)'
biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)'

0 comments on commit 0028a3c

Please sign in to comment.