From f0a032a7b97fa006169dc7ea1dd4a7cc510af687 Mon Sep 17 00:00:00 2001
From: Steinar Bang <sb@dod.no>
Date: Sun, 17 Sep 2023 18:23:44 +0200
Subject: [PATCH] Add Require-Capability header requiring
 osgi.serviceloader.registrar to all imageio OSGi bundle MANIFEST.MF files

---
 imageio/imageio-jpeg/pom.xml |  3 ---
 imageio/pom.xml              | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/imageio/imageio-jpeg/pom.xml b/imageio/imageio-jpeg/pom.xml
index 4f381e3b..66e65dfb 100644
--- a/imageio/imageio-jpeg/pom.xml
+++ b/imageio/imageio-jpeg/pom.xml
@@ -40,9 +40,6 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Require-Capability>
-                            osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"
-                        </Require-Capability>
                         <Provide-Capability>
                             osgi.serviceloader;
                             osgi.serviceloader=javax.imageio.spi.ImageReaderSpi;
diff --git a/imageio/pom.xml b/imageio/pom.xml
index 964bf618..aa9519c9 100644
--- a/imageio/pom.xml
+++ b/imageio/pom.xml
@@ -170,4 +170,20 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <configuration>
+                        <instructions>
+                            <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
+                        </instructions>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 </project>