commit f44c765445cf1b5f0a07efa867e5e8179dcfa3e0
author Richard Eckart de Castilho <rec@apache.org> Mon Sep 05 09:22:45 2022 +0200
committer GitHub <noreply@github.com> Mon Sep 05 09:22:45 2022 +0200
tree a5b1a0301670b742276b3aafab77f0c9bc58502c
parent c659fbdb34d59ce1753bc71a4c1ecde1a1cc9197
parent 2ddf7114327826a5ed86cf58164a13f4758ac664

Merge pull request #106 from apache/feature/100-Enable-type-system-discovery-via-SPI-in-OSGI

Issue #100: Enable type system discovery via SPI in OSGI

ruta-basic-type/pom.xml

diff --git a/ruta-basic-type/pom.xml b/ruta-basic-type/pom.xml
index 15a3a4c..e910503 100644
--- a/ruta-basic-type/pom.xml
+++ b/ruta-basic-type/pom.xml
@@ -99,12 +99,6 @@
             <Export-Package>
               org.apache.uima.ruta.type
             </Export-Package>
-            <Require-Capability>
-              osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)"
-            </Require-Capability>
-            <Provide-Capability>
-              osgi.serviceloader;osgi.serviceloader=org.apache.uima.spi.JCasClassProvider
-            </Provide-Capability>
           </instructions>
         </configuration>
       </plugin>

ruta-core/pom.xml

diff --git a/ruta-core/pom.xml b/ruta-core/pom.xml
index 2671b0a..3f8505b 100644
--- a/ruta-core/pom.xml
+++ b/ruta-core/pom.xml
@@ -252,6 +252,17 @@
               org.apache.uima.ruta,
               org.apache.uima.ruta.*
             </Export-Package>
+            <!--
+              - These capabilities need to be declared here due to  
+              - https://issues.apache.org/jira/browse/ARIES-2082
+              -->
+            <Require-Capability>
+              osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional
+            </Require-Capability>
+            <Provide-Capability>
+              osgi.serviceloader;osgi.serviceloader=org.apache.uima.spi.TypeSystemDescriptionProvider,
+              osgi.serviceloader;osgi.serviceloader=org.apache.uima.spi.JCasClassProvider
+            </Provide-Capability>
           </instructions>
         </configuration>
       </plugin>

ruta-typesystem/pom.xml

diff --git a/ruta-typesystem/pom.xml b/ruta-typesystem/pom.xml
index a42eda0..89cf63f 100644
--- a/ruta-typesystem/pom.xml
+++ b/ruta-typesystem/pom.xml
@@ -112,13 +112,6 @@
               org.apache.uima.ruta.type.html,
               org.apache.uima.ruta.engine;-split-package:=merge-first
             </Export-Package>
-            <Require-Capability>
-              osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)"
-            </Require-Capability>
-            <Provide-Capability>
-              osgi.serviceloader;osgi.serviceloader=org.apache.uima.spi.TypeSystemDescriptionProvider,
-              osgi.serviceloader;osgi.serviceloader=org.apache.uima.spi.JCasClassProvider
-            </Provide-Capability>
           </instructions>
         </configuration>
       </plugin>