switch to bnd-maven-plugin, suppress javadoc errors

Author: stefanseifert

pom.xml

@@ -13,9 +13,8 @@
     <groupId>com.damnhandy</groupId>
     <artifactId>handy-uri-templates</artifactId>
     <version>2.1.9-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>Handy URI Templates</name>
 
+    <name>Handy URI Templates</name>
     <description>
         Handy URI Templates is a RFC6570 compliant URI template processor. The library allows clients to
         utilize templatized URIs and inject replacement variables to expand the template into a URI. The library sports
@@ -24,6 +23,7 @@
 
     <properties>
         <java.version>11</java.version>
+        <bnd.version>7.2.3</bnd.version>
         <jackson.version>2.11.0</jackson.version>
     </properties>
 
@@ -72,29 +72,67 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>5.1.9</version>
-                <extensions>true</extensions>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+                <version>${bnd.version}</version>
+                <configuration>
+                    <bnd>
+                        <!-- Do not set Bundle-Developers -->
+                        Bundle-Developers:
+                        <!-- Export all versioned packages by default -->
+                        -exportcontents: ${packages;VERSIONED}
+                        <!-- Use "SNAPSHOT" suffix for snapshot bundle versions -->
+                        -snapshot: SNAPSHOT
+                        <!-- Remove Private-Package header as it may contain lists of all SLING-INF folders -->
+                        -removeheaders: Private-Package
+                        <!-- reproducible builds (https://github.com/bndtools/bnd/issues/3521) -->
+                        -noextraheaders: true
+                        <!-- Do not create imports for java.* as this leads to failed builds with AEM cloud service -->
+                        -noimportjava: true
+                    </bnd>
+                </configuration>
                 <executions>
-                    <!-- Configure extra execution of 'manifest' in process-classes phase to make sure SCR metadata is generated before unit test runs -->
                     <execution>
-                    <id>scr-metadata</id>
+                    <id>bnd-process</id>
                     <goals>
-                        <goal>manifest</goal>
+                        <goal>bnd-process</goal>
                     </goals>
-                    <configuration>
-                        <supportIncrementalBuild>true</supportIncrementalBuild>
-                    </configuration>
                     </execution>
                 </executions>
+            </plugin>
+
+            <!-- TODO: enabled baseline plugin after first release -->
+            <!--
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-baseline-maven-plugin</artifactId>
+                <version>${bnd.version}</version>
+                <configuration>
+                    <includeDistributionManagement>false</includeDistributionManagement>
+                    <fullReport>true</fullReport>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>bnd-baseline</id>
+                        <goals>
+                            <goal>baseline</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            -->
+
+            <!-- suppress javadoc warnings/errors -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                    </instructions>
+                    <doclint>none</doclint>
+                    <failOnError>false</failOnError>
                 </configuration>
             </plugin>
+
+            <!-- Match different test naming conventions -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -106,6 +144,7 @@
                     </includes>
                 </configuration>
             </plugin>
+
         </plugins>
     </build>
 
@@ -166,6 +205,14 @@
             <scope>compile</scope>
         </dependency>
 
+        <!-- OSGi Versioning -->
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.annotation.versioning</artifactId>
+            <version>1.1.2</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
 </project>

src/main/java/com/damnhandy/uri/template/jackson/datatype/package-info.java

@@ -29,6 +29,5 @@
  * @author <a href="ryan@damnhandy.com">Ryan J. McDonough</a>
  * @version $Revision: 1.1 $
  */
-package com.damnhandy.uri.template.jackson.datatype;
-
-
+@org.osgi.annotation.versioning.Version("2.1.8")
+package com.damnhandy.uri.template.jackson.datatype;

src/main/java/com/damnhandy/uri/template/package-info.java

@@ -8,4 +8,5 @@
  * @since 1.0.0
  * @author <a href="mailto:ryan@damnhandy.com">Ryan J. McDonough</a>
  */
+@org.osgi.annotation.versioning.Version("2.1.8")
 package com.damnhandy.uri.template;