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

bnd-parent is a more modern replacement, migrate to use it.

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

diff --git a/xpath/yang-xpath-antlr/pom.xml b/xpath/yang-xpath-antlr/pom.xml
index faaac0e918..0ed933f27e 100644
--- a/xpath/yang-xpath-antlr/pom.xml
+++ b/xpath/yang-xpath-antlr/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-antlr</artifactId>
     <version>8.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>${project.artifactId}</name>
     <description>YANG XPath ANTLR grammars</description>
 
diff --git a/xpath/yang-xpath-antlr/src/main/java/module-info.java b/xpath/yang-xpath-antlr/src/main/java/module-info.java
index 5d01f72d36..5d25431cc6 100644
--- a/xpath/yang-xpath-antlr/src/main/java/module-info.java
+++ b/xpath/yang-xpath-antlr/src/main/java/module-info.java
@@ -9,4 +9,7 @@ module org.opendaylight.yangtools.yang.xpath.antlr {
     exports org.opendaylight.yangtools.yang.xpath.antlr;
 
     requires transitive org.antlr.antlr4.runtime;
+
+    // Annotations
+    requires static org.osgi.annotation.bundle;
 }
diff --git a/xpath/yang-xpath-antlr/src/main/java/org/opendaylight/yangtools/yang/xpath/antlr/package-info.java b/xpath/yang-xpath-antlr/src/main/java/org/opendaylight/yangtools/yang/xpath/antlr/package-info.java
index 4075cc773e..e2e71db807 100644
--- a/xpath/yang-xpath-antlr/src/main/java/org/opendaylight/yangtools/yang/xpath/antlr/package-info.java
+++ b/xpath/yang-xpath-antlr/src/main/java/org/opendaylight/yangtools/yang/xpath/antlr/package-info.java
@@ -9,4 +9,7 @@
  * ANTLR grammars for parsing RFC7950 XPpath constructs. This package is considered an implementation detail and does
  * not fall under API stability contract. Use at your own risk.
  */
+@Export
 package org.opendaylight.yangtools.yang.xpath.antlr;
+
+import org.osgi.annotation.bundle.Export;
-- 
2.36.6