SLF4J-574: Add full OSGi headers, especially "uses" clauses

Fixes: https://jira.qos.ch/browse/SLF4J-574 This uses the BND tool, via org.apache.felix to generate the MANIFEST.MF to be fully compliant with OSGi. Compared to using just the maven-jar-plugin to create the MANIFEST.MF the uses clauses are added to the Export-Package Signed-off-by: Jonah Graham <[email protected]>
qos-ch · Dec 9, 2022 · 171679b · 171679b
1 parent 921b5b3
commit 171679b
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -228,22 +228,39 @@
             </goals>
             <configuration>
               <archive>
-                <manifestEntries>
-                  <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
-                  <Bundle-Description>${project.description}</Bundle-Description>
-                  <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
-                  <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
-                  <Implementation-Version>${project.version}</Implementation-Version>
-                  <Multi-Release>true</Multi-Release>
-                </manifestEntries>
                 <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
               </archive>
               <skipIfEmpty>true</skipIfEmpty>
             </configuration>
           </execution>
         </executions>
       </plugin>
-
+
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+            <configuration>
+              <unpackBundle>true</unpackBundle>
+              <instructions>
+                <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
+                <Bundle-Description>${project.description}</Bundle-Description>
+                <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
+                <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
+                <Implementation-Version>${project.version}</Implementation-Version>
+                <Multi-Release>true</Multi-Release>
+              </instructions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>

diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml
@@ -52,6 +52,20 @@
           </execution>
         </executions>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
 
   </build>