From: Robert Varga Date: Tue, 8 Feb 2022 17:07:41 +0000 (+0100) Subject: Do not depend on osgi.annotation X-Git-Tag: v8.0.0~40 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=yangtools.git;a=commitdiff_plain;h=ddfb7c5419553cf8659c1e1e35610e2743838a3a 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 --- 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 @@ checker-qual provided - - org.osgi - osgi.annotation - org.opendaylight.yangtools mockito-configuration 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 @@ org.opendaylight.yangtools concepts - - org.osgi - osgi.annotation - 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; }