Switch yang-ir to bnd-parent

This is a simplistic bundle, switch to to bnd-parent so we get control
over exported packages.

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

diff --git a/parser/yang-ir/pom.xml b/parser/yang-ir/pom.xml
index af0b541919e710386151e469b141749c8459ac34..2f19498e97f3d691d94890befecbe9a877ef8fa2 100644 (file)
--- a/parser/yang-ir/pom.xml
+++ b/parser/yang-ir/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>13.0.0-SNAPSHOT</version>
-        <relativePath>../../bundle-parent</relativePath>
+        <relativePath>../../bnd-parent</relativePath>
     </parent>
 
     <artifactId>yang-ir</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>${project.artifactId}</name>
     <description>Intermediate YANG parsing representation</description>
 

diff --git a/parser/yang-ir/src/main/java/module-info.java b/parser/yang-ir/src/main/java/module-info.java
index e10bf64c518ed79474c86c9c1a00552d2b87b757..1f405d43c5cec67a67e2742fcad1a7c9310278dd 100644 (file)
--- a/parser/yang-ir/src/main/java/module-info.java
+++ b/parser/yang-ir/src/main/java/module-info.java
@@ -13,4 +13,5 @@ module org.opendaylight.yangtools.yang.ir {
 
     // Annotations
     requires static transitive org.eclipse.jdt.annotation;
+    requires static org.osgi.annotation.bundle;
 }

diff --git a/parser/yang-ir/src/main/java/org/opendaylight/yangtools/yang/ir/IOSupport.java b/parser/yang-ir/src/main/java/org/opendaylight/yangtools/yang/ir/IOSupport.java
index 82f9c2365a967a70db7edb6e814d7bb73ac816bf..1b1748c705b756976aa9118108dfa646966c7f61 100644 (file)
--- a/parser/yang-ir/src/main/java/org/opendaylight/yangtools/yang/ir/IOSupport.java
+++ b/parser/yang-ir/src/main/java/org/opendaylight/yangtools/yang/ir/IOSupport.java
@@ -13,6 +13,9 @@ import java.io.DataOutput;
 import java.io.IOException;
 import org.eclipse.jdt.annotation.NonNull;
 
+/**
+ * Support methods for reading and writing {@link IRStatement}s.
+ */
 @Beta
 public final class IOSupport {
     private static final int MAGICK = 0xAF57BA07;

diff --git a/parser/yang-ir/src/main/java/org/opendaylight/yangtools/yang/ir/package-info.java b/parser/yang-ir/src/main/java/org/opendaylight/yangtools/yang/ir/package-info.java
index 5239008bf98b1c417226b7d6dafa60458015107d..7f2216ea4c47538fc04017e4de094591ea55c130 100644 (file)
--- a/parser/yang-ir/src/main/java/org/opendaylight/yangtools/yang/ir/package-info.java
+++ b/parser/yang-ir/src/main/java/org/opendaylight/yangtools/yang/ir/package-info.java
@@ -15,4 +15,5 @@
  * which represents a single YANG statement. Every YANG file is required to contain exactly one top-level statement,
  * {@code module} or {@code submodule}, hence an IRStatement also represents the significant contents of a YANG file.
  */
-package org.opendaylight.yangtools.yang.ir;
\ No newline at end of file
+@org.osgi.annotation.bundle.Export
+package org.opendaylight.yangtools.yang.ir;