From a26c608c0845cdb7b207d378c2ffa71479bf0641 Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Wed, 15 Jan 2025 13:36:45 +0100
Subject: [PATCH 1/3] Issue 5834

---
 core-client/pom.xml | 10 ++++++++++
 core-common/pom.xml | 13 ++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/core-client/pom.xml b/core-client/pom.xml
index 4630b0751c..35ff88829c 100644
--- a/core-client/pom.xml
+++ b/core-client/pom.xml
@@ -95,6 +95,16 @@
                             *
                         </Import-Package>
                         <unpackBundle>true</unpackBundle>
+                        <!-- Needed to integrate ServiceLoader mechanism with OSGi -->
+                        <Require-Capability><![CDATA[
+                         osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)(version>=1.0.0)(!(version>=2.0.0)))";
+                         resolution:=optional,osgi.serviceloader;filter:="(osgi.serviceloader=jakarta.ws.rs.client.ClientBuilder)";osgi.serviceloader="jakarta.ws.rs.ClientBuilder";cardinality:=multiple;
+                         resolution:=optional,osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)(version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
+                         osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
+                         ]]></Require-Capability>
+                        <Provide-Capability><![CDATA[
+                        osgi.serviceloader;osgi.serviceloader="jakarta.ws.rs.client.ClientBuilder"
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/core-common/pom.xml b/core-common/pom.xml
index a1ba6b46f6..5cc41ef8c6 100644
--- a/core-common/pom.xml
+++ b/core-common/pom.xml
@@ -147,7 +147,18 @@
                         </Import-Package>
                         <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
                         <Export-Package>org.glassfish.jersey.*;version=${project.version}</Export-Package>
-                        <Require-Capability>osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=1.8))"</Require-Capability>
+                        <!-- Needed to integrate ServiceLoader mechanism with OSGi -->
+                        <Require-Capability><![CDATA[
+                         osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)(version>=1.0.0)(!(version>=2.0.0)))";
+                         resolution:=optional,osgi.serviceloader;filter:="(osgi.serviceloader=jakarta.ws.rs.ext.RuntimeDelegate)";osgi.serviceloader="jakarta.ws.rs.ext.RuntimeDelegate";cardinality:=multiple;
+                         resolution:=optional,osgi.serviceloader;filter:="(osgi.serviceloader=org.glassfish.jersey.internal.spi.AutoDiscoverable)";osgi.serviceloader="org.glassfish.jersey.internal.spi.AutoDiscoverable";cardinality:=multiple;
+                         resolution:=optional,osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)(version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
+                         osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
+                         ]]></Require-Capability>
+                        <Provide-Capability><![CDATA[
+                        osgi.serviceloader;osgi.serviceloader="jakarta.ws.rs.ext.RuntimeDelegate",
+                        osgi.serviceloader;osgi.serviceloader="org.glassfish.jersey.internal.spi.AutoDiscoverable"
+                        ]]></Provide-Capability>
                     </instructions>
                     <unpackBundle>true</unpackBundle>
                 </configuration>

From 2f88c305ad1e9c418e7e523bb7d63fc50da734f0 Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Mon, 3 Feb 2025 08:33:30 +0100
Subject: [PATCH 2/3]  Issue 5834

---
 core-common/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core-common/pom.xml b/core-common/pom.xml
index 5cc41ef8c6..6381601fdb 100644
--- a/core-common/pom.xml
+++ b/core-common/pom.xml
@@ -149,10 +149,10 @@
                         <Export-Package>org.glassfish.jersey.*;version=${project.version}</Export-Package>
                         <!-- Needed to integrate ServiceLoader mechanism with OSGi -->
                         <Require-Capability><![CDATA[
-                         osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)(version>=1.0.0)(!(version>=2.0.0)))";
-                         resolution:=optional,osgi.serviceloader;filter:="(osgi.serviceloader=jakarta.ws.rs.ext.RuntimeDelegate)";osgi.serviceloader="jakarta.ws.rs.ext.RuntimeDelegate";cardinality:=multiple;
-                         resolution:=optional,osgi.serviceloader;filter:="(osgi.serviceloader=org.glassfish.jersey.internal.spi.AutoDiscoverable)";osgi.serviceloader="org.glassfish.jersey.internal.spi.AutoDiscoverable";cardinality:=multiple;
-                         resolution:=optional,osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)(version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
+                         osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)(version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
+                         osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)(version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
+                         osgi.serviceloader;filter:="(osgi.serviceloader=jakarta.ws.rs.ext.RuntimeDelegate)";osgi.serviceloader="jakarta.ws.rs.ext.RuntimeDelegate";cardinality:=multiple;resolution:=optional,
+                         osgi.serviceloader;filter:="(osgi.serviceloader=org.glassfish.jersey.internal.spi.AutoDiscoverable)";osgi.serviceloader="org.glassfish.jersey.internal.spi.AutoDiscoverable";cardinality:=multiple;resolution:=optional,
                          osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
                          ]]></Require-Capability>
                         <Provide-Capability><![CDATA[

From 430bb6c213c8c1e13b3a6a991d8cbf660c9ce701 Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Tue, 4 Feb 2025 14:23:11 +0100
Subject: [PATCH 3/3] format, add sse

---
 core-client/pom.xml |  6 +++---
 media/sse/pom.xml   | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/core-client/pom.xml b/core-client/pom.xml
index 35ff88829c..cf8a0d3cd8 100644
--- a/core-client/pom.xml
+++ b/core-client/pom.xml
@@ -97,9 +97,9 @@
                         <unpackBundle>true</unpackBundle>
                         <!-- Needed to integrate ServiceLoader mechanism with OSGi -->
                         <Require-Capability><![CDATA[
-                         osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)(version>=1.0.0)(!(version>=2.0.0)))";
-                         resolution:=optional,osgi.serviceloader;filter:="(osgi.serviceloader=jakarta.ws.rs.client.ClientBuilder)";osgi.serviceloader="jakarta.ws.rs.ClientBuilder";cardinality:=multiple;
-                         resolution:=optional,osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)(version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
+                         osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)(version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
+                         osgi.serviceloader;filter:="(osgi.serviceloader=jakarta.ws.rs.client.ClientBuilder)";osgi.serviceloader="jakarta.ws.rs.ClientBuilder";cardinality:=multiple;resolution:=optional
+                         osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)(version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
                          osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
                          ]]></Require-Capability>
                         <Provide-Capability><![CDATA[
diff --git a/media/sse/pom.xml b/media/sse/pom.xml
index bea92f43d9..f108eb6203 100644
--- a/media/sse/pom.xml
+++ b/media/sse/pom.xml
@@ -77,6 +77,18 @@
                 <configuration>
                     <instructions>
                         <Import-Package>${jakarta.annotation.osgi.version},*</Import-Package>
+                        <!-- Needed to integrate ServiceLoader mechanism with OSGi -->
+                        <Require-Capability><![CDATA[
+                         osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)(version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
+                         osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)(version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
+                         osgi.serviceloader;filter:="(osgi.serviceloader=jakarta.ws.rs.sse.SseEventSource$Builder)";osgi.serviceloader="jakarta.ws.rs.sse.SseEventSource$Builder";cardinality:=multiple;resolution:=optional,
+                         osgi.serviceloader;filter:="(osgi.serviceloader=org.glassfish.jersey.internal.spi.ForcedAutoDiscoverable)";osgi.serviceloader="org.glassfish.jersey.internal.spi.ForcedAutoDiscoverable";cardinality:=multiple;resolution:=optional,
+                         osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
+                         ]]></Require-Capability>
+                        <Provide-Capability><![CDATA[
+                        osgi.serviceloader;osgi.serviceloader="jakarta.ws.rs.sse.SseEventSource$Builder",
+                        osgi.serviceloader;osgi.serviceloader="org.glassfish.jersey.internal.spi.ForcedAutoDiscoverable"
+                        ]]></Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>