Merge pull request #940 from fipro78/master

Add OSGi metadata and correct repository build
eclipse · Jul 15, 2020 · db1e10f · db1e10f
2 parents a058ad2 + 6f3c16a
commit db1e10f
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 15 deletions.
diff --git a/eclipse-collections-api/bnd.bnd b/eclipse-collections-api/bnd.bnd
@@ -0,0 +1,6 @@
+package-version=${version;===;${Bundle-Version}}
+
+Automatic-Module-Name: org.eclipse.collections.api
+Bundle-SymbolicName: org.eclipse.collections.api
+Export-Package: \
+  *;version="${package-version}"
diff --git a/eclipse-collections-api/pom.xml b/eclipse-collections-api/pom.xml
@@ -63,13 +63,16 @@
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
 
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+            </plugin>
+
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
-                        <manifestEntries>
-                            <Automatic-Module-Name>org.eclipse.collections.api</Automatic-Module-Name>
-                        </manifestEntries>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                     </archive>
                 </configuration>
             </plugin>

diff --git a/eclipse-collections/bnd.bnd b/eclipse-collections/bnd.bnd
@@ -0,0 +1,7 @@
+package-version=${version;===;${Bundle-Version}}
+
+Automatic-Module-Name: org.eclipse.collections.impl
+Bundle-SymbolicName: org.eclipse.collections.impl
+
+Export-Package: \
+	org.eclipse.collections.impl.*;version="${package-version}"
diff --git a/eclipse-collections/pom.xml b/eclipse-collections/pom.xml
@@ -73,13 +73,16 @@
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
 
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+            </plugin>
+
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
-                        <manifestEntries>
-                            <Automatic-Module-Name>org.eclipse.collections.impl</Automatic-Module-Name>
-                        </manifestEntries>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                     </archive>
                 </configuration>
             </plugin>

diff --git a/p2-feature/org.eclipse.collections.feature/pom.xml b/p2-feature/org.eclipse.collections.feature/pom.xml
@@ -19,9 +19,6 @@
     </parent>
     <artifactId>org.eclipse.collections.feature</artifactId>
     <packaging>eclipse-feature</packaging>
-    <properties>
-       <collections.repository.url>file://${project.basedir}/../../p2-repository/org.eclipse.collections/target/repository</collections.repository.url>
-    </properties>
     <build>
         <plugins>
             <plugin>

diff --git a/p2-feature/org.eclipse.collections.repository/category.xml b/p2-feature/org.eclipse.collections.repository/category.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.collections.feature.source_10.1.0.qualifier.jar" id="org.eclipse.collections.feature.source" version="10.1.0.qualifier">
-      <category name="org.eclipse.collections.source"/>
+   <feature url="features/org.eclipse.collections.feature_10.3.0.qualifier.jar" id="org.eclipse.collections.feature" version="10.3.0.qualifier">
+      <category name="category_org.eclipse.collections"/>
    </feature>
-   <category-def name="org.eclipse.collections" label="Eclipse Collections"/>
+   <feature url="features/org.eclipse.collections.feature.source_10.3.0.qualifier.jar" id="org.eclipse.collections.feature.source" version="10.3.0.qualifier">
+      <category name="category_org.eclipse.collections"/>
+   </feature>
+   <category-def name="category_org.eclipse.collections" label="Eclipse Collections">
+      <description>Eclipse Collections is a collections framework for Java. It has JDK-compatible List, Set and Map
+        implementations with a rich API and set of utility classes that work with any JDK compatible Collections,
+        Arrays, Maps or Strings. The iteration protocol was inspired by the Smalltalk collection framework.</description>
+   </category-def>
 </site>
diff --git a/p2-feature/org.eclipse.collections.repository/pom.xml b/p2-feature/org.eclipse.collections.repository/pom.xml
@@ -19,9 +19,6 @@
     </parent>
     <artifactId>p2-repository</artifactId>
     <packaging>eclipse-repository</packaging>
-    <properties>
-       <collections.repository.url>file://${project.basedir}/../../p2-repository/org.eclipse.collections/target/repository</collections.repository.url>
-    </properties>
     <build>
         <plugins>
             <plugin>

diff --git a/pom.xml b/pom.xml
@@ -546,6 +546,19 @@
                         </lifecycleMappingMetadata>
                     </configuration>
                 </plugin>
+
+                <plugin>
+                    <groupId>biz.aQute.bnd</groupId>
+                    <artifactId>bnd-maven-plugin</artifactId>
+                    <version>5.1.1</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>bnd-process</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>