Convert restconf-server-spi to bnd-parent

restconf-server-spi is a simple single-package module, use bnd-parent to
build it.

JIRA: NETCONF-773
Change-Id: I87c794b8c0639a4c1ce2a1f0d8c52f3e5e216a62
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/protocol/restconf-server-spi/pom.xml b/protocol/restconf-server-spi/pom.xml
index 4c279f4d63b0c10dd977a1d604200c0e8cae45ca..16b8d4a0c71fdf25b4d64b3f1369f53942240d8c 100644 (file)
--- a/protocol/restconf-server-spi/pom.xml
+++ b/protocol/restconf-server-spi/pom.xml
@@ -13,14 +13,14 @@
 
     <parent>
         <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>netconf-parent</artifactId>
+        <artifactId>bnd-parent</artifactId>
         <version>8.0.0-SNAPSHOT</version>
-        <relativePath>../../parent</relativePath>
+        <relativePath>../../bnd-parent</relativePath>
     </parent>
 
     <artifactId>restconf-server-spi</artifactId>
+    <packaging>jar</packaging>
     <name>${project.artifactId}</name>
-    <packaging>bundle</packaging>
     <description>RESTCONF server SPI</description>
 
     <dependencies>

diff --git a/protocol/restconf-server-spi/src/main/java/module-info.java b/protocol/restconf-server-spi/src/main/java/module-info.java
index 4c9583441f7847eea8877a86629f9c1b42670c03..c8933689b938a17c3b3fb09651660349f6fd8a49 100644 (file)
--- a/protocol/restconf-server-spi/src/main/java/module-info.java
+++ b/protocol/restconf-server-spi/src/main/java/module-info.java
@@ -23,4 +23,5 @@ module org.opendaylight.restconf.server.spi {
     // Annotation-only dependencies
     requires static transitive org.eclipse.jdt.annotation;
     requires static com.github.spotbugs.annotations;
+    requires static org.osgi.annotation.bundle;
 }

diff --git a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/RestconfStream.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/RestconfStream.java
index ce66d822d554dad96cd24e81566b698d1bfc8278..76cb2a3c3fcf057c9944b81de421d4290b7d0173 100644 (file)
--- a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/RestconfStream.java
+++ b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/RestconfStream.java
@@ -21,7 +21,6 @@ import java.time.Instant;
 import java.util.Set;
 import java.util.regex.Pattern;
 import javax.xml.xpath.XPathExpressionException;
-import org.checkerframework.checker.lock.qual.GuardedBy;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.restconf.server.api.EventStreamGetParams;
@@ -196,7 +195,6 @@ public final class RestconfStream<T> {
     @SuppressFBWarnings(value = "URF_UNREAD_FIELD", justification = "https://github.com/spotbugs/spotbugs/issues/2749")
     private volatile Subscribers<T> subscribers = Subscribers.empty();
 
-    @GuardedBy("this")
     private Registration registration;
 
     RestconfStream(final AbstractRestconfStreamRegistry registry, final Source<T> source, final String name) {

diff --git a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/package-info.java b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/package-info.java
index dfc97df219a48b0ff9acd307972a807c5dc02cea..c6a323e284d30fcda85e75733d97421ae0c716b3 100644 (file)
--- a/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/package-info.java
+++ b/protocol/restconf-server-spi/src/main/java/org/opendaylight/restconf/server/spi/package-info.java
@@ -8,4 +8,5 @@
 /**
  * Interface towards RestconfServer implementations.
  */
+@org.osgi.annotation.bundle.Export
 package org.opendaylight.restconf.server.spi;
\ No newline at end of file