minor tweak to osgi capabilities

Signed-off-by: Lukas Jungmann <[email protected]>
eclipse-ee4j · Dec 23, 2022 · d07a577 · d07a577
1 parent 5c6d8cb
commit d07a577
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/activation-registry/pom.xml b/activation-registry/pom.xml
@@ -47,14 +47,23 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
+                        <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.service;
+                              objectClass:List<String>="com.sun.activation.registries.MailcapRegistryProviderImpl";effective:=active,
+                            osgi.service;
+                              objectClass:List<String>="com.sun.activation.registries.MimeTypeRegistryProviderImpl";effective:=active,
                             osgi.serviceloader;
-                                osgi.serviceloader="jakarta.activation.spi.MailcapRegistryProvider";
-                                uses="jakarta.activation.spi",
+                              osgi.serviceloader="com.sun.activation.registries.MailcapRegistryProviderImpl";
+                              register:="com.sun.activation.registries.MailcapRegistryProviderImpl",
                             osgi.serviceloader;
-                                osgi.serviceloader="jakarta.activation.spi.MimeTypeRegistryProvider";
-                                uses="jakarta.activation.spi",
-                            ]]>
+                              osgi.serviceloader="com.sun.activation.registries.MimeTypeRegistryProviderImpl";
+                              register:="com.sun.activation.registries.MimeTypeRegistryProviderImpl"
+                          ]]>
                         </Provide-Capability>
                     </instructions>
                 </configuration>
@@ -88,7 +97,6 @@
                 </plugins>
             </build>
         </profile>
-
     </profiles>
 
 </project>
diff --git a/pom.xml b/pom.xml
@@ -44,8 +44,6 @@
 Comments to: <a href="mailto:[email protected]">[email protected]</a>.<br>
 Copyright &#169; 2019, ${current.year} Eclipse Foundation. All rights reserved.]]></angus-activation.javadoc.bottom>
 
-
-        <javadoc.title>Agnus Activation Documentation</javadoc.title>
         <copyright.exclude>etc/copyright-exclude</copyright.exclude>
         <copyright.ignoreyear>false</copyright.ignoreyear>
         <copyright.scmonly>true</copyright.scmonly>
@@ -147,7 +145,7 @@ Copyright &#169; 2019, ${current.year} Eclipse Foundation. All rights reserved.]
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>5.1.1</version>
+                    <version>5.1.8</version>
                     <configuration>
                         <instructions>
                             <_noextraheaders>true</_noextraheaders>
@@ -302,6 +300,7 @@ Copyright &#169; 2019, ${current.year} Eclipse Foundation. All rights reserved.]
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
+                    <niceManifest>true</niceManifest>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Specification-Title>${spec.title}</Specification-Title>
@@ -429,7 +428,6 @@ Copyright &#169; 2019, ${current.year} Eclipse Foundation. All rights reserved.]
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
                 <configuration>
-                    <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
                     <fork>true</fork>
                     <excludeFilterFile>${spotbugs.exclude}</excludeFilterFile>
                     <failThreshold>High</failThreshold>