You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2022/07/28 12:37:54 UTC

[uima-uimafit] 01/01: Issue #196 - Provide OSGI metadata in JARs

This is an automated email from the ASF dual-hosted git repository.

rec pushed a commit to branch feature/196-Provide-OSGI-metadata-in-JARs
in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git

commit 16b611c9c986623b21d682bb62f12655d55d19ac
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Thu Jul 28 14:37:39 2022 +0200

    Issue #196 - Provide OSGI metadata in JARs
    
    - Added metadata to uimafit-core and uimafit-assertj
    - Upgrade to UIMA Parent POM 16-SNAPSHOT
---
 uimafit-assertj/.gitignore                         |  1 +
 .../marker-file-identifying-osgi-bundle            |  0
 uimafit-assertj/pom.xml                            |  4 +++
 uimafit-core/.gitignore                            |  1 +
 uimafit-core/marker-file-identifying-osgi-bundle   |  0
 uimafit-core/pom.xml                               | 38 +++++++++++++++++++---
 uimafit-parent/pom.xml                             |  9 ++++-
 7 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/uimafit-assertj/.gitignore b/uimafit-assertj/.gitignore
new file mode 100644
index 0000000..3385916
--- /dev/null
+++ b/uimafit-assertj/.gitignore
@@ -0,0 +1 @@
+/META-INF/
diff --git a/uimafit-assertj/marker-file-identifying-osgi-bundle b/uimafit-assertj/marker-file-identifying-osgi-bundle
new file mode 100644
index 0000000..e69de29
diff --git a/uimafit-assertj/pom.xml b/uimafit-assertj/pom.xml
index e58c76f..6274b3b 100644
--- a/uimafit-assertj/pom.xml
+++ b/uimafit-assertj/pom.xml
@@ -25,8 +25,12 @@
     <version>3.4.0-SNAPSHOT</version>
     <relativePath>../uimafit-parent</relativePath>
   </parent>
+  
   <artifactId>uimafit-assertj</artifactId>
+  <packaging>bundle</packaging>
+  
   <name>Apache UIMA uimaFIT - AssertJ support</name>
+  
   <dependencies>
     <dependency>
       <groupId>org.apache.uima</groupId>
diff --git a/uimafit-core/.gitignore b/uimafit-core/.gitignore
new file mode 100644
index 0000000..3385916
--- /dev/null
+++ b/uimafit-core/.gitignore
@@ -0,0 +1 @@
+/META-INF/
diff --git a/uimafit-core/marker-file-identifying-osgi-bundle b/uimafit-core/marker-file-identifying-osgi-bundle
new file mode 100644
index 0000000..e69de29
diff --git a/uimafit-core/pom.xml b/uimafit-core/pom.xml
index 0434cf0..826ea51 100644
--- a/uimafit-core/pom.xml
+++ b/uimafit-core/pom.xml
@@ -19,17 +19,21 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>uimafit-core</artifactId>
-  <packaging>jar</packaging>
-  <name>Apache UIMA uimaFIT - Core</name>
-  <description>Factories, Injection, and Testing library for UIMA</description>
-  <url>${uimaWebsiteUrl}</url>
+
   <parent>
     <groupId>org.apache.uima</groupId>
     <artifactId>uimafit-parent</artifactId>
     <version>3.4.0-SNAPSHOT</version>
     <relativePath>../uimafit-parent</relativePath>
   </parent>
+
+  <artifactId>uimafit-core</artifactId>
+  <packaging>bundle</packaging>
+  
+  <name>Apache UIMA uimaFIT - Core</name>
+  <description>Factories, Injection, and Testing library for UIMA</description>
+  <url>${uimaWebsiteUrl}</url>
+
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -91,6 +95,30 @@
   </dependencies>
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
+            <_dsannotations>*</_dsannotations>
+            <_metatypeannotations>*</_metatypeannotations>
+            <Import-Package>
+              !com.apple.eio,
+              org.apache.uima.fit.legacy;resolution:=optional,
+              *
+            </Import-Package>
+            <Export-Package>
+              org.apache.uima.fit.*
+            </Export-Package>
+            <Require-Capability>
+            	osgi.extender;filter:="(osgi.extender=osgi.serviceloader.processor)",
+            	osgi.serviceloader;filter:="(osgi.serviceloader=org.apache.uima.spi.TypeSystemDescriptionProvider)";cardinality:=multiple
+            </Require-Capability>
+          </instructions>
+        </configuration>
+      </plugin>
+    
       <plugin>
         <groupId>org.apache.uima</groupId>
         <artifactId>jcasgen-maven-plugin</artifactId>
diff --git a/uimafit-parent/pom.xml b/uimafit-parent/pom.xml
index 30fe106..c7e77aa 100644
--- a/uimafit-parent/pom.xml
+++ b/uimafit-parent/pom.xml
@@ -25,7 +25,7 @@
     <groupId>org.apache.uima</groupId>
     <artifactId>parent-pom</artifactId>
     <relativePath />
-    <version>15</version>
+    <version>16-SNAPSHOT</version>
   </parent>
   <artifactId>uimafit-parent</artifactId>
   <version>3.4.0-SNAPSHOT</version>
@@ -217,6 +217,13 @@
         <groupId>com.github.siom79.japicmp</groupId>
         <artifactId>japicmp-maven-plugin</artifactId>
         <version>0.15.7</version>
+        <configuration>
+          <newVersion>
+            <file>
+              <path>${project.build.directory}/${project.build.finalName}.jar</path>
+            </file>
+          </newVersion>
+        </configuration>
         <dependencies>
           <dependency>
             <groupId>org.codehaus.groovy</groupId>