Covert yang-binding to bnd-parent

There are just a few exported packages, switch to bnd-parent.

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

diff --git a/binding/yang-binding/pom.xml b/binding/yang-binding/pom.xml
index 5b72a35d68a031cdf22cb2da6c83197c13416b4b..8226a8a290ffa46a820f2af78c75ea609a05e151 100644 (file)
--- a/binding/yang-binding/pom.xml
+++ b/binding/yang-binding/pom.xml
@@ -11,13 +11,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</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-binding</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>${project.artifactId}</name>
     <description>Java binding for YANG</description>
 

diff --git a/binding/yang-binding/src/main/java/module-info.java b/binding/yang-binding/src/main/java/module-info.java
index 2aba738bf7a280bde49277dd88b17a7e329ba277..ba86e6a12fe6ee60efca080418be46a080075967 100644 (file)
--- a/binding/yang-binding/src/main/java/module-info.java
+++ b/binding/yang-binding/src/main/java/module-info.java
@@ -18,4 +18,5 @@ module org.opendaylight.yangtools.yang.binding {
     requires static transitive org.eclipse.jdt.annotation;
     requires static com.github.spotbugs.annotations;
     requires static org.checkerframework.checker.qual;
+    requires static org.osgi.annotation.bundle;
 }

diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java
index 22681a4d0f13e789f541c444d117e22d76b08df2..3a217f3f04b16c94e90ad5404f41a74c046f1d60 100644 (file)
--- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java
+++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifier.java
@@ -189,8 +189,6 @@ public sealed class InstanceIdentifier<T extends DataObject>
      *
      * <p>
      * And you wanted to obtain the Instance identifier which represented Nodes you would do it like so,
-     *
-     * <p>
      * <pre>
      *      identifier.firstIdentifierOf(Nodes.class)
      * </pre>

diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/annotations/package-info.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/annotations/package-info.java
new file mode 100644 (file)
index 0000000..b3c51cb
--- /dev/null
+++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/annotations/package-info.java
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 PANTHEON.tech, s.r.o. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+@org.osgi.annotation.bundle.Export
+package org.opendaylight.yangtools.yang.binding.annotations;
\ No newline at end of file

diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/contract/package-info.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/contract/package-info.java
new file mode 100644 (file)
index 0000000..6d19e8c
--- /dev/null
+++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/contract/package-info.java
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 PANTHEON.tech, s.r.o. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+@org.osgi.annotation.bundle.Export
+package org.opendaylight.yangtools.yang.binding.contract;
\ No newline at end of file

diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/package-info.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/package-info.java
index eee24a978e693ef0e6ec637f62403ceb8c148311..1e04840bfffe93d841291c641eb194ecce3aabe2 100644 (file)
--- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/package-info.java
+++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/package-info.java
@@ -5,4 +5,5 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+@org.osgi.annotation.bundle.Export
 package org.opendaylight.yangtools.yang.binding;
\ No newline at end of file

diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/package-info.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/package-info.java
new file mode 100644 (file)
index 0000000..0e4d7bf
--- /dev/null
+++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/package-info.java
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2024 PANTHEON.tech, s.r.o. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+@org.osgi.annotation.bundle.Export
+package org.opendaylight.yangtools.yang.binding.util;
\ No newline at end of file