Convert mdsal-singleton-impl to bnd-parent

This fixes a few packaging warnings and allows us to not import
javax.inject/javax.annotation in OSGi.

Change-Id: I5e3fd7e1cd7534d6a53f72f2917427f59f1f2851
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/singleton-service/mdsal-singleton-impl/bnd.bnd b/singleton-service/mdsal-singleton-impl/bnd.bnd
new file mode 100644 (file)
index 0000000..4ca3cea
--- /dev/null
+++ b/singleton-service/mdsal-singleton-impl/bnd.bnd
@@ -0,0 +1 @@
+Import-Package: !javax.annotation,!javax.inject,org.checkerframework.*;resolution:=optional, *

diff --git a/singleton-service/mdsal-singleton-impl/pom.xml b/singleton-service/mdsal-singleton-impl/pom.xml
index 29dd4c423c5a61d4e6f7fda7d178c71858159964..8dc59052021735c84e641ad63a314541aba642e3 100644 (file)
--- a/singleton-service/mdsal-singleton-impl/pom.xml
+++ b/singleton-service/mdsal-singleton-impl/pom.xml
@@ -11,13 +11,15 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>bundle-parent</artifactId>
+        <artifactId>bnd-parent</artifactId>
         <version>14.0.10-SNAPSHOT</version>
-        <relativePath>../../bundle-parent</relativePath>
+        <relativePath>../../bnd-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-singleton-impl</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
+    <name>${project.artifactId}</name>
+    <description>Cluster Singleton Service implementation</description>
 
     <properties>
         <!-- FIXME: fix these up and set maven.javadoc.failOnWarnings=true -->