From a6920cf6a20d6202e6c9b3044086501449928df8 Mon Sep 17 00:00:00 2001
From: Markus KARG <markus@headcrashing.eu>
Date: Sat, 22 Dec 2018 23:38:46 +0100
Subject: [PATCH 1/2] JAX-RS 2.1.4 (OSGi fixes)

Signed-off-by: Markus KARG <markus@headcrashing.eu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c88ad7dc760..c1911931238 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1974,7 +1974,7 @@
         <jaxb.ri.version>2.3.2</jaxb.ri.version>
         <jsonb.api.version>1.0.1</jsonb.api.version>
         <jaxrs.api.spec.version>2.1</jaxrs.api.spec.version>
-        <jaxrs.api.impl.version>2.1.3</jaxrs.api.impl.version>
+        <jaxrs.api.impl.version>2.1.4</jaxrs.api.impl.version>
         <jboss.logging.version>3.3.0.Final</jboss.logging.version>
         <jersey1.version>1.19.3</jersey1.version>
         <jersey1.last.final.version>${jersey1.version}</jersey1.last.final.version>

From 02520da1ea9158bd45884cb6cfc809b85ccb9688 Mon Sep 17 00:00:00 2001
From: Jan Supol <jan.supol@oracle.com>
Date: Fri, 28 Dec 2018 01:26:11 +0100
Subject: [PATCH 2/2] Adopt JAX-RS 2.1.4

Change-Id: I350d73783bb0e945128614f3fa66a361ac1ae39e
Signed-off-by: Jan Supol <jan.supol@oracle.com>
---
 .../functional-test/src/test/resources/felix.policy             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/osgi-helloworld-webapp/functional-test/src/test/resources/felix.policy b/examples/osgi-helloworld-webapp/functional-test/src/test/resources/felix.policy
index 18caacb3153..103cc5206a3 100644
--- a/examples/osgi-helloworld-webapp/functional-test/src/test/resources/felix.policy
+++ b/examples/osgi-helloworld-webapp/functional-test/src/test/resources/felix.policy
@@ -12,7 +12,7 @@ allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*System*"] (org
 allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*System*"] (org.osgi.framework.PackagePermission) } "packageToSystem";
 allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*additional-bundle*"] (java.security.AllPermission) } "allToAdditional";
 allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*javassist*"] (java.security.AllPermission) } "allToJavassist";
-allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*javax.ws.rs*"] (java.security.AllPermission) } "allToJavaxWsRs";
+allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jakarta.ws.rs*"] (java.security.AllPermission) } "allToJavaxWsRs";
 allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jetty*"] (java.security.AllPermission) } "allToJetty";
 allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*hk2*"] (java.security.AllPermission) } "allToHk2";
 allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*osgi*"] (java.security.AllPermission) } "allToOsgi";