From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 25 Feb 2025 16:27:50 +0000 (+0100)
Subject: Convert mdsal-singleton-impl to bnd-parent
X-Git-Tag: v14.0.10~1
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=2611261c53629b27b0225768b7b69f0d909d22c5;p=mdsal.git

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
index 0000000000..4ca3cea46d
--- /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 29dd4c423c..8dc5905202 100644
--- 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 -->