Convert yang-model-spi to bnd-parent

This is a simplistic conversion.

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

diff --git a/model/yang-model-spi/pom.xml b/model/yang-model-spi/pom.xml
index a697baa01de7a72c1edc881a2f7773fe611755a2..ddbca3664d1edb1a55257b9124197051ff6686b2 100644 (file)
--- a/model/yang-model-spi/pom.xml
+++ b/model/yang-model-spi/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.1-SNAPSHOT</version>
-        <relativePath>../../bundle-parent</relativePath>
+        <relativePath>../../bnd-parent</relativePath>
     </parent>
 
     <artifactId>yang-model-spi</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 

diff --git a/model/yang-model-spi/src/main/java/module-info.java b/model/yang-model-spi/src/main/java/module-info.java
index 92d200ff1e26fc059dae2b79d155ff9ca5b606e1..a67ed77c0cc071e611e87f74f9d9ddc8e4f970af 100644 (file)
--- a/model/yang-model-spi/src/main/java/module-info.java
+++ b/model/yang-model-spi/src/main/java/module-info.java
@@ -21,6 +21,7 @@ module org.opendaylight.yangtools.yang.model.spi {
     requires org.slf4j;
 
     // Annotations
-    requires static com.github.spotbugs.annotations;
     requires static transitive org.eclipse.jdt.annotation;
+    requires static com.github.spotbugs.annotations;
+    requires static org.osgi.annotation.bundle;
 }

diff --git a/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/package-info.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/package-info.java
new file mode 100644 (file)
index 0000000..964d103
--- /dev/null
+++ b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/meta/package-info.java
@@ -0,0 +1,12 @@
+/*
+ * 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
+ */
+/**
+ * Various utilities dealing with statement declarations.
+ */
+@org.osgi.annotation.bundle.Export
+package org.opendaylight.yangtools.yang.model.spi.meta;
\ No newline at end of file

diff --git a/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/package-info.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/package-info.java
new file mode 100644 (file)
index 0000000..29064de
--- /dev/null
+++ b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/package-info.java
@@ -0,0 +1,12 @@
+/*
+ * 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
+ */
+/**
+ * Various base classes for implementing YANG model constructs..
+ */
+@org.osgi.annotation.bundle.Export
+package org.opendaylight.yangtools.yang.model.spi;
\ No newline at end of file

diff --git a/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/source/package-info.java b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/source/package-info.java
index 04565fb7505ff66e1b170d37f8c4b3fd4bd0a4f6..3d0c5976f831a92c1baa13401d88435f83ceb6f2 100644 (file)
--- a/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/source/package-info.java
+++ b/model/yang-model-spi/src/main/java/org/opendaylight/yangtools/yang/model/spi/source/package-info.java
@@ -8,4 +8,5 @@
 /**
  * Various utilities dealing with sources of YANG and YIN models.
  */
+@org.osgi.annotation.bundle.Export
 package org.opendaylight.yangtools.yang.model.spi.source;
\ No newline at end of file