Upgrade to latest primogenitor

This upgrades the parent pom to the latest version. This introduces
a new requirement on JDK 11, and the project now produces
JDK 11 bytecode. It switches to the bnd-maven-plugin from the
maven-bundle-plugin as this should give somewhat better cross-IDE
support with regards to OSGi development. It also uses the new OSGi
bundle annotations to export packages rather than specifying the
configuration in pom files. Unfortunately, the maven-dependency-plugin
is temporarily disabled due to an incompatibility with JDK 11 bytecode.

Author: io7m

.travis.yml

@@ -1,7 +1,8 @@
 language: java
 
 jdk:
-  - oraclejdk9
+  - oraclejdk11
+  - openjdk11
 
 install: true
 

net.adoptopenjdk.api/pom.xml

@@ -13,7 +13,7 @@
   </parent>
 
   <artifactId>net.adoptopenjdk.api</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
 
   <name>net.adoptopenjdk.api</name>
   <description>Adopt OpenJDK API (API)</description>
@@ -25,6 +25,12 @@
       <artifactId>net.adoptopenjdk.spi</artifactId>
       <version>${project.version}</version>
     </dependency>
+
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation.bundle</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -34,20 +40,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
       </plugin>
-
-      <!-- Produce OSGi bundle -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              net.adoptopenjdk.api
-            </Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

net.adoptopenjdk.api/src/main/java/module-info.java

@@ -22,6 +22,7 @@
 module net.adoptopenjdk.api
 {
   requires transitive net.adoptopenjdk.spi;
+  requires static org.osgi.annotation.bundle;
 
   exports net.adoptopenjdk.api;
 

net.adoptopenjdk.api/src/main/java/net/adoptopenjdk/api/package-info.java

@@ -16,5 +16,6 @@
  * AdoptOpenJDK API.
  */
 
+@org.osgi.annotation.bundle.Export
 package net.adoptopenjdk.api;
 

net.adoptopenjdk.spi/pom.xml

@@ -13,7 +13,7 @@
   </parent>
 
   <artifactId>net.adoptopenjdk.spi</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
 
   <name>net.adoptopenjdk.spi</name>
   <description>Adopt OpenJDK API (Service provider interface)</description>
@@ -25,6 +25,11 @@
       <artifactId>value</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation.bundle</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -49,20 +54,6 @@
           </annotationProcessorPaths>
         </configuration>
       </plugin>
-
-      <!-- Produce OSGi bundle -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              net.adoptopenjdk.spi
-            </Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

net.adoptopenjdk.spi/src/main/java/module-info.java

@@ -19,6 +19,7 @@
 module net.adoptopenjdk.spi
 {
   requires static org.immutables.value;
+  requires static org.osgi.annotation.bundle;
 
   exports net.adoptopenjdk.spi;
 }

net.adoptopenjdk.spi/src/main/java/net/adoptopenjdk/spi/package-info.java

@@ -16,5 +16,6 @@
  * Core types and functions.
  */
 
+@org.osgi.annotation.bundle.Export
 package net.adoptopenjdk.spi;
 

net.adoptopenjdk.v1/pom.xml

@@ -13,7 +13,7 @@
   </parent>
 
   <artifactId>net.adoptopenjdk.v1</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
 
   <name>net.adoptopenjdk.v1</name>
   <description>Adopt OpenJDK API (API 1.* provider)</description>
@@ -31,6 +31,12 @@
       <artifactId>value</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation.bundle</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>com.io7m.jaffirm</groupId>
       <artifactId>com.io7m.jaffirm.core</artifactId>
@@ -67,20 +73,6 @@
           </annotationProcessorPaths>
         </configuration>
       </plugin>
-
-      <!-- Produce OSGi bundle -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              net.adoptopenjdk.v1
-            </Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

net.adoptopenjdk.v1/src/main/java/module-info.java

@@ -22,6 +22,7 @@
 module net.adoptopenjdk.v1
 {
   requires static org.immutables.value;
+  requires static org.osgi.annotation.bundle;
 
   requires com.io7m.jaffirm.core;
   requires net.adoptopenjdk.spi;

net.adoptopenjdk.v1/src/main/java/net/adoptopenjdk/v1/package-info.java

@@ -16,4 +16,5 @@
  * Version 1.* API provider.
  */
 
+@org.osgi.annotation.bundle.Export
 package net.adoptopenjdk.v1;