This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch feature/100-Enable-type-system-discovery-via-SPI-in-OSGI in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 2ddf7114327826a5ed86cf58164a13f4758ac664 Author: Richard Eckart de Castilho <[email protected]> AuthorDate: Mon Sep 5 08:40:20 2022 +0200 Issue #100: Enable type system discovery via SPI in OSGI - Move capabilitiy headers from type fragments to ruta-core bundle because of https://issues.apache.org/jira/browse/ARIES-2082 - Allow core bundle to resolve even if no serviceloader registrar is available --- ruta-basic-type/pom.xml | 6 ------ ruta-core/pom.xml | 11 +++++++++++ ruta-typesystem/pom.xml | 7 ------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ruta-basic-type/pom.xml b/ruta-basic-type/pom.xml index 15a3a4c6..e9105031 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> diff --git a/ruta-core/pom.xml b/ruta-core/pom.xml index 2671b0a0..3f8505b7 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> diff --git a/ruta-typesystem/pom.xml b/ruta-typesystem/pom.xml index a42eda00..89cf63f2 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>
