From b40ffff22bb9df639579664315672b58bdc0dbd1 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 8 Feb 2022 15:53:09 +0100
Subject: [PATCH] Migrate yang-xpath-api to bnd-parent

Use bnd-parent instead of bundle-parent, so we end up with cleaner
integration.

Change-Id: Ic32867bf8fe9cfeca7b4fdff02d74efb1de7d6ff
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 xpath/yang-xpath-api/pom.xml                                | 6 +++---
 xpath/yang-xpath-api/src/main/java/module-info.java         | 1 +
 .../opendaylight/yangtools/yang/xpath/api/package-info.java | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/xpath/yang-xpath-api/pom.xml b/xpath/yang-xpath-api/pom.xml
index c90232786b..85bb77d1e3 100644
--- a/xpath/yang-xpath-api/pom.xml
+++ b/xpath/yang-xpath-api/pom.xml
@@ -11,14 +11,14 @@
     <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-xpath-api</artifactId>
     <version>8.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>${project.artifactId}</name>
     <description>YANG XPath ${project.artifactId}</description>
 
diff --git a/xpath/yang-xpath-api/src/main/java/module-info.java b/xpath/yang-xpath-api/src/main/java/module-info.java
index 2c20412683..b8fe35430c 100644
--- a/xpath/yang-xpath-api/src/main/java/module-info.java
+++ b/xpath/yang-xpath-api/src/main/java/module-info.java
@@ -18,4 +18,5 @@ module org.opendaylight.yangtools.yang.xpath.api {
     // Annotations
     requires static transitive org.eclipse.jdt.annotation;
     requires static com.github.spotbugs.annotations;
+    requires static org.osgi.annotation.bundle;
 }
diff --git a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/package-info.java b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/package-info.java
index c883d78688..246465c06a 100644
--- a/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/package-info.java
+++ b/xpath/yang-xpath-api/src/main/java/org/opendaylight/yangtools/yang/xpath/api/package-info.java
@@ -18,7 +18,9 @@
  *
  * @author Robert Varga
  */
+@Export
 @NonNullByDefault
 package org.opendaylight.yangtools.yang.xpath.api;
 
-import org.eclipse.jdt.annotation.NonNullByDefault;
\ No newline at end of file
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.osgi.annotation.bundle.Export;
\ No newline at end of file
-- 
2.36.6