From 2a5675dbad1a072826f949877cbf6904cedc7fbc Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 19 Jan 2022 13:51:22 +0100
Subject: [PATCH] Migrate yang-common to bnd-parent

yang-common is a simple component, migrate it to bind-plugin. Also make
sure package-info.java is correctly named.

Change-Id: I5a16bab7056ea6d6124773d1ab71ddc752e0b7a9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 common/yang-common/bnd.bnd                        |  1 +
 common/yang-common/pom.xml                        | 10 +++++++---
 common/yang-common/src/main/java/module-info.java |  1 +
 .../common/{pkg-info.java => package-info.java}   | 15 +++++++++------
 4 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 common/yang-common/bnd.bnd
 rename common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/{pkg-info.java => package-info.java} (58%)

diff --git a/common/yang-common/bnd.bnd b/common/yang-common/bnd.bnd
new file mode 100644
index 0000000000..544a02c9c4
--- /dev/null
+++ b/common/yang-common/bnd.bnd
@@ -0,0 +1 @@
+Import-Package: org.checkerframework.*;resolution:=optional, *
diff --git a/common/yang-common/pom.xml b/common/yang-common/pom.xml
index 66a6ae865b..a93260ff6a 100644
--- a/common/yang-common/pom.xml
+++ b/common/yang-common/pom.xml
@@ -11,13 +11,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>bundle-parent</artifactId>
+        <artifactId>bnd-parent</artifactId>
         <version>8.0.0-SNAPSHOT</version>
-        <relativePath>../../bundle-parent</relativePath>
+        <relativePath>../../bnd-parent</relativePath>
     </parent>
 
     <artifactId>yang-common</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>${project.artifactId}</name>
     <description>Common YANG definitions</description>
 
@@ -30,5 +30,9 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.annotation</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/common/yang-common/src/main/java/module-info.java b/common/yang-common/src/main/java/module-info.java
index f0e02075b5..8efdab8b76 100644
--- a/common/yang-common/src/main/java/module-info.java
+++ b/common/yang-common/src/main/java/module-info.java
@@ -35,4 +35,5 @@ module org.opendaylight.yangtools.yang.common {
     requires static transitive org.eclipse.jdt.annotation;
     requires static com.github.spotbugs.annotations;
     requires static org.checkerframework.checker.qual;
+    requires static osgi.annotation;
 }
diff --git a/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/pkg-info.java b/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/package-info.java
similarity index 58%
rename from common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/pkg-info.java
rename to common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/package-info.java
index 081e1f005e..8cd80f67e5 100644
--- a/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/pkg-info.java
+++ b/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/package-info.java
@@ -8,13 +8,16 @@
 /**
  * Common YANG concepts and constants expressed in terms of Java. This notably includes the concepts of
  * <ul>
- * <li>a {@link YangVersion}</li>
- * <li>a {@link Revision}</li>
- * <li>a {@link QNameModule}</li>
- * <li>a {@link QName}</li>
- * <li>a Java-native representation of a YANG string, {@link DerivedString}</li>
- * <li>a Java-native representations of numeric YANG types, like {@link Uint64}, {@link Decimal64} and
+ *   <li>a {@link YangVersion}</li>
+ *   <li>a {@link Revision}</li>
+ *   <li>a {@link QNameModule}</li>
+ *   <li>a {@link QName}</li>
+ *   <li>a Java-native representation of a YANG string, {@link DerivedString}</li>
+ *   <li>a Java-native representations of numeric YANG types, like {@link Uint64}, {@link Decimal64} and
  *     {@link Empty}</li>
  * </ul>
  */
+@Export
 package org.opendaylight.yangtools.yang.common;
+
+import org.osgi.annotation.bundle.Export;
-- 
2.36.6