Do not depend on osgi.annotation

We are using split-out OSGi bundles, make sure our dependencies are
correct.

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

diff --git a/common/concepts/pom.xml b/common/concepts/pom.xml
index e3b738684980274a2daf39945965863ba1b65a84..100aabf79aab1cedac6105b70c76f801bf57b0e7 100644 (file)
--- a/common/concepts/pom.xml
+++ b/common/concepts/pom.xml
@@ -31,10 +31,6 @@
             <artifactId>checker-qual</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.annotation</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>

diff --git a/common/concepts/src/main/java/module-info.java b/common/concepts/src/main/java/module-info.java
index dae5498a8ad6a531c2667b68667c16a26a481058..cfa5ac9261e11560571957133f4be514db18cb82 100644 (file)
--- a/common/concepts/src/main/java/module-info.java
+++ b/common/concepts/src/main/java/module-info.java
@@ -15,5 +15,5 @@ module org.opendaylight.yangtools.concepts {
     requires static transitive org.eclipse.jdt.annotation;
     requires static com.github.spotbugs.annotations;
     requires static org.checkerframework.checker.qual;
-    requires static osgi.annotation;
+    requires static org.osgi.annotation.bundle;
 }

diff --git a/common/yang-common/pom.xml b/common/yang-common/pom.xml
index a93260ff6a414c1b1b65e8bb09e65a287d53c418..1669713f5ce11763b49e7d0f5558cb340dd0277e 100644 (file)
--- a/common/yang-common/pom.xml
+++ b/common/yang-common/pom.xml
@@ -30,9 +30,5 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.annotation</artifactId>
-        </dependency>
     </dependencies>
 </project>

diff --git a/common/yang-common/src/main/java/module-info.java b/common/yang-common/src/main/java/module-info.java
index 8efdab8b766ca9579b5a4d993b1bf17adc51a6de..f0e1ef440cb03ae4636b93ac61d6f6ee87404e87 100644 (file)
--- a/common/yang-common/src/main/java/module-info.java
+++ b/common/yang-common/src/main/java/module-info.java
@@ -35,5 +35,5 @@ module org.opendaylight.yangtools.yang.common {
     requires static transitive org.eclipse.jdt.annotation;
     requires static com.github.spotbugs.annotations;
     requires static org.checkerframework.checker.qual;
-    requires static osgi.annotation;
+    requires static org.osgi.annotation.bundle;
 }