From 82f3f1a4a37f0a72b7ec2404f3f1f8ef92efd6f4 Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Wed, 12 Jul 2023 20:07:06 +0200
Subject: [PATCH] improve compatibility with OSGi mediator

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 bundles/jakarta.json/pom.xml | 16 ++++++++++++++++
 impl/pom.xml                 | 10 ++++++++++
 2 files changed, 26 insertions(+)

diff --git a/bundles/jakarta.json/pom.xml b/bundles/jakarta.json/pom.xml
index d0bfe5a1..9ae8f27b 100644
--- a/bundles/jakarta.json/pom.xml
+++ b/bundles/jakarta.json/pom.xml
@@ -171,6 +171,22 @@
                                     org.glassfish.hk2.osgiresourcelocator;resolution:=optional,
                                     *
                                 </Import-Package>
+                                <Require-Capability><![CDATA[
+                            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.json.spi.JsonProvider";
+                                osgi.serviceloader="jakarta.json.spi.JsonProvider";
+                                cardinality:=multiple;resolution:=optional
+                            ]]>
+                                </Require-Capability>
+                                <Provide-Capability><![CDATA[
+                            osgi.serviceloader;
+                              osgi.serviceloader="jakarta.json.spi.JsonProvider",
+                          ]]>
+                                </Provide-Capability>
                             </instructions>
                         </configuration>
                     </execution>
diff --git a/impl/pom.xml b/impl/pom.xml
index b61e79ca..82f70b9a 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -49,6 +49,16 @@
                                 <HK2-Bundle-Name>${project.groupId}:${project.artifactId}</HK2-Bundle-Name>
                                 <Implementation-Build-Id>${project.version} - ${buildNumber}</Implementation-Build-Id>
                                 <Export-Package>org.eclipse.parsson.api</Export-Package>
+                                <Require-Capability><![CDATA[
+                            osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)
+                              (version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
+                            ]]>
+                                </Require-Capability>
+                                <Provide-Capability><![CDATA[
+                            osgi.serviceloader;
+                              osgi.serviceloader="jakarta.json.spi.JsonProvider",
+                          ]]>
+                                </Provide-Capability>
                             </instructions>
                         </configuration>
                     </execution>