From d12c30dfcf044a90c3b3d76f8fed4f7d595cea85 Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Sat, 19 Sep 2020 15:59:48 +0200
Subject: [PATCH] Upgrade Aries JAX-RS Whiteboard to 1.0.9 (#1656)

This version uses CXF 3.2.13 which has some SSE fixes.

Signed-off-by: Wouter Born <github@maindrain.net>
---
 bom/runtime/pom.xml                                     | 2 +-
 bom/test/pom.xml                                        | 2 +-
 features/karaf/openhab-tp/src/main/feature/feature.xml  | 4 ++--
 itests/org.openhab.core.io.rest.core.tests/itest.bndrun | 5 +++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index f4af63f9c..b16988efe 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>org.apache.aries.jax.rs</groupId>
       <artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
-      <version>1.0.8</version>
+      <version>1.0.9</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
diff --git a/bom/test/pom.xml b/bom/test/pom.xml
index ad881477e..a728b5273 100644
--- a/bom/test/pom.xml
+++ b/bom/test/pom.xml
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>org.apache.aries.jax.rs</groupId>
       <artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
-      <version>1.0.8</version>
+      <version>1.0.9</version>
       <exclusions>
         <exclusion>
           <groupId>org.apache.geronimo.specs</groupId>
diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
index 4233afdc5..25598ac7c 100644
--- a/features/karaf/openhab-tp/src/main/feature/feature.xml
+++ b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -92,7 +92,7 @@
 	</feature>
 
 	<feature name="openhab.tp-jax-rs-whiteboard" version="${project.version}">
-		<capability>openhab.tp;feature=jax-rs-whiteboard;version=1.0.8</capability>
+		<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. -->
@@ -104,7 +104,7 @@
 		<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.2/2.9.0</bundle>
-		<bundle>mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.whiteboard/1.0.8</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 -->
 
 		<config name="org.apache.aries.jax.rs.whiteboard.default">
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 f2e69405e..79273f069 100644
--- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
@@ -38,7 +38,6 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
 	org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
 	org.apache.aries.javax.jax.rs-api;version='[1.0.0,1.0.1)',\
-	org.apache.aries.jax.rs.whiteboard;version='[1.0.8,1.0.9)',\
 	org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
 	org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
 	org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\
@@ -76,4 +75,6 @@ Fragment-Host: org.openhab.core.io.rest.core
 	net.bytebuddy.byte-buddy-agent;version='[1.10.13,1.10.14)',\
 	org.hamcrest;version='[2.2.0,2.2.1)',\
 	org.mockito.mockito-core;version='[3.4.6,3.4.7)',\
-	org.opentest4j;version='[1.2.0,1.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)'