From ddfb7c5419553cf8659c1e1e35610e2743838a3a Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 8 Feb 2022 18:07:41 +0100
Subject: [PATCH] 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>
---
 common/concepts/pom.xml                           | 4 ----
 common/concepts/src/main/java/module-info.java    | 2 +-
 common/yang-common/pom.xml                        | 4 ----
 common/yang-common/src/main/java/module-info.java | 2 +-
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/common/concepts/pom.xml b/common/concepts/pom.xml
index e3b7386849..100aabf79a 100644
--- 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 dae5498a8a..cfa5ac9261 100644
--- 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 a93260ff6a..1669713f5c 100644
--- 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 8efdab8b76..f0e1ef440c 100644
--- 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;
 }
-- 
2.36.6