Clean up dependency declarations

We have a number of modules which are using spotbugs annotations, where
they no longer need those. Also fixup pom.xmls to explicitly pull in JDT
annotations.

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

diff --git a/codec/yang-data-codec-binfmt/pom.xml b/codec/yang-data-codec-binfmt/pom.xml
index 7d42e4785f63f603b36349d9e7bcf8176efc5166..6112d1759016e9a2fb1443ba101764a0e3ff249c 100644 (file)
--- a/codec/yang-data-codec-binfmt/pom.xml
+++ b/codec/yang-data-codec-binfmt/pom.xml
@@ -27,9 +27,8 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/codec/yang-data-codec-binfmt/src/main/java/module-info.java b/codec/yang-data-codec-binfmt/src/main/java/module-info.java
index ec77f1070614c6ec6630d5ec2efc36e25d5f6f52..8b1582976a7c6d610b27ecf3c4a40fccd9c83936 100644 (file)
--- a/codec/yang-data-codec-binfmt/src/main/java/module-info.java
+++ b/codec/yang-data-codec-binfmt/src/main/java/module-info.java
@@ -19,6 +19,5 @@ module org.opendaylight.yangtools.yang.data.codec.binfmt {
     requires org.slf4j;
 
     // Annotations
-    requires static com.github.spotbugs.annotations;
     requires static org.eclipse.jdt.annotation;
 }

diff --git a/codec/yang-data-codec-gson/pom.xml b/codec/yang-data-codec-gson/pom.xml
index 2ed42e82c568de2cd3b3109990efda9181b9c1ec..1f83e062463d5ab61473b3965e33c47482f428e4 100644 (file)
--- a/codec/yang-data-codec-gson/pom.xml
+++ b/codec/yang-data-codec-gson/pom.xml
@@ -22,6 +22,11 @@
     <description>JSON (RFC7951) encoding for NormalizedNodes</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -31,9 +36,8 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -63,6 +67,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-util</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>rfc8040-model-api</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/codec/yang-data-codec-xml/pom.xml b/codec/yang-data-codec-xml/pom.xml
index 824c04f8c293b33bdbc8610d60ea93446142a2e5..d3657565ba8a1bac401340451836bc8627cd41d6 100644 (file)
--- a/codec/yang-data-codec-xml/pom.xml
+++ b/codec/yang-data-codec-xml/pom.xml
@@ -30,6 +30,10 @@
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>stax2-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>

diff --git a/common/yang-common-netty/pom.xml b/common/yang-common-netty/pom.xml
index 8c25612b21a2b5c79351473a696fd0a77c12ca20..c7a5f369320e076b4c740a93709729c2b26284b8 100644 (file)
--- a/common/yang-common-netty/pom.xml
+++ b/common/yang-common-netty/pom.xml
@@ -23,8 +23,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/data/yang-data-api/pom.xml b/data/yang-data-api/pom.xml
index 9b2fdae9b1f539bb4ca9cea6be53052d353f1833..34ef6c97d13a08abd39d8abdc44217d26e4390b3 100644 (file)
--- a/data/yang-data-api/pom.xml
+++ b/data/yang-data-api/pom.xml
@@ -22,14 +22,18 @@
     <description>${project.artifactId}</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.immutables</groupId>

diff --git a/data/yang-data-impl/pom.xml b/data/yang-data-impl/pom.xml
index 74df4573397f653c632263d4cacc0bbd782e1b4c..2827590cd6be01f82e4aa87b8e7df60eb895653a 100644 (file)
--- a/data/yang-data-impl/pom.xml
+++ b/data/yang-data-impl/pom.xml
@@ -40,14 +40,18 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/data/yang-data-spi/pom.xml b/data/yang-data-spi/pom.xml
index c066cd75da52992b8cc8514aab20fcab580bccec..c0e8c3c00d70ce2fdca28b3d0fcc67631ad20349 100644 (file)
--- a/data/yang-data-spi/pom.xml
+++ b/data/yang-data-spi/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>

diff --git a/data/yang-data-transform/pom.xml b/data/yang-data-transform/pom.xml
index 5cdbb5fda90980b9a6c4c7ae2365af0de832cea4..c7d81501963888fa8a217536dc458f97cb184140 100644 (file)
--- a/data/yang-data-transform/pom.xml
+++ b/data/yang-data-transform/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>

diff --git a/data/yang-data-tree-api/pom.xml b/data/yang-data-tree-api/pom.xml
index bd0025eb180d3f49a885c94415c2ba15658430ea..81e1eda3e2ebaec8b691f779f3370190ddd9ac6d 100644 (file)
--- a/data/yang-data-tree-api/pom.xml
+++ b/data/yang-data-tree-api/pom.xml
@@ -22,14 +22,18 @@
     <description>${project.artifactId}</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/data/yang-data-tree-ri/pom.xml b/data/yang-data-tree-ri/pom.xml
index 4ab9d00a95c1f3d3c3106c7a5031783eacc63413..4396f67e046cdd9ebc682179db524e0b302c8866 100644 (file)
--- a/data/yang-data-tree-ri/pom.xml
+++ b/data/yang-data-tree-ri/pom.xml
@@ -22,14 +22,18 @@
     <description>${project.artifactId}</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/data/yang-data-tree-spi/pom.xml b/data/yang-data-tree-spi/pom.xml
index 1669c77ea195561fcb61c129e3487b56388f63f4..043714a2206bbd04da118ca7759aa116517dcbe6 100644 (file)
--- a/data/yang-data-tree-spi/pom.xml
+++ b/data/yang-data-tree-spi/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>

diff --git a/data/yang-data-util/pom.xml b/data/yang-data-util/pom.xml
index dee8bd13b23d207fe0b9fae76460827b85326e81..b11a4914c2ba368ec76ff332cafae3ec917299de 100644 (file)
--- a/data/yang-data-util/pom.xml
+++ b/data/yang-data-util/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>

diff --git a/model/odlext-model-api/pom.xml b/model/odlext-model-api/pom.xml
index 725eeed62b50cfed658255ea1451c35da16beed5..f1c0f3d7650eb5024e8a66a47bdc5c877bdde38f 100644 (file)
--- a/model/odlext-model-api/pom.xml
+++ b/model/odlext-model-api/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>

diff --git a/model/openconfig-model-api/pom.xml b/model/openconfig-model-api/pom.xml
index ba4e27064fcd137323665128406c3de958cf5c98..e0186554d6292a5a59d31d752052763ffd14db37 100644 (file)
--- a/model/openconfig-model-api/pom.xml
+++ b/model/openconfig-model-api/pom.xml
@@ -22,14 +22,18 @@
     <description>OpenConfig extensions metamodel</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/model/rfc6241-model-api/pom.xml b/model/rfc6241-model-api/pom.xml
index 4efc288defaa0f387e323fe7a39bb06802de2dd7..e1d9ba50b682498efc6b93dc40a545b9ec7f1dcd 100644 (file)
--- a/model/rfc6241-model-api/pom.xml
+++ b/model/rfc6241-model-api/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>

diff --git a/model/rfc6536-model-api/pom.xml b/model/rfc6536-model-api/pom.xml
index 6a71281bd6c850102534084d9c6b60db8557444d..ab2d07cf06ea56f5619cc71c09a09fde1741aa9d 100644 (file)
--- a/model/rfc6536-model-api/pom.xml
+++ b/model/rfc6536-model-api/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>

diff --git a/model/rfc6643-model-api/pom.xml b/model/rfc6643-model-api/pom.xml
index 56bf9de76d49eed4ab3a9c7b83b4ebc739213892..91b2128da3ef965889ab0522b8a48ac997ad4edb 100644 (file)
--- a/model/rfc6643-model-api/pom.xml
+++ b/model/rfc6643-model-api/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>

diff --git a/model/rfc7952-model-api/pom.xml b/model/rfc7952-model-api/pom.xml
index 308d33ab4709c7db7e9f6aaeaef67967171bada7..3d09130ba2ae12bc58b83f083b4a001eb6288647 100644 (file)
--- a/model/rfc7952-model-api/pom.xml
+++ b/model/rfc7952-model-api/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>

diff --git a/model/rfc8040-model-api/pom.xml b/model/rfc8040-model-api/pom.xml
index c0b03ac178dfecd119c785475391408ebf2bf342..961bc1eb099e1bd1994a2cab652861054754a53d 100644 (file)
--- a/model/rfc8040-model-api/pom.xml
+++ b/model/rfc8040-model-api/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>

diff --git a/model/rfc8528-model-api/pom.xml b/model/rfc8528-model-api/pom.xml
index 54d0f3faeb64f01c3f8f56dec92dc01c89ab0a39..bdaf10bfe00bf339f0bae548b56338e549c22cf0 100644 (file)
--- a/model/rfc8528-model-api/pom.xml
+++ b/model/rfc8528-model-api/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>

diff --git a/model/rfc8639-model-api/pom.xml b/model/rfc8639-model-api/pom.xml
index 1b4798d5f5eaf197152cabdbfe7a6b561105a69a..c03c967fd9a97f4defdcec541d03c1e50cbbafbf 100644 (file)
--- a/model/rfc8639-model-api/pom.xml
+++ b/model/rfc8639-model-api/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>

diff --git a/model/rfc8819-model-api/pom.xml b/model/rfc8819-model-api/pom.xml
index 15445620d837eebeb9234212d2634ddf3e672dcc..e39a52cb81b5469700eb0bf2b3d4cff8767976a2 100644 (file)
--- a/model/rfc8819-model-api/pom.xml
+++ b/model/rfc8819-model-api/pom.xml
@@ -27,9 +27,8 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/model/rfc8819-model-api/src/main/java/module-info.java b/model/rfc8819-model-api/src/main/java/module-info.java
index 9503ca89ff2a7cdda8dcd05ab374f575dbbb7508..003de274638de83a02e4edc17a25b0c93c1be155 100644 (file)
--- a/model/rfc8819-model-api/src/main/java/module-info.java
+++ b/model/rfc8819-model-api/src/main/java/module-info.java
@@ -14,5 +14,4 @@ module org.opendaylight.yangtools.rfc8819.model.api {
 
     // Annotations
     requires static org.eclipse.jdt.annotation;
-    requires static com.github.spotbugs.annotations;
-}
\ No newline at end of file
+}

diff --git a/model/yang-model-api/pom.xml b/model/yang-model-api/pom.xml
index 487d76a272feb17d0a69196eef4fe240af6fb108..b74eb82a46dad25fee25d531456cb5ebdedd9b57 100644 (file)
--- a/model/yang-model-api/pom.xml
+++ b/model/yang-model-api/pom.xml
@@ -22,14 +22,18 @@
     <description>${project.artifactId}</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/model/yang-model-export/pom.xml b/model/yang-model-export/pom.xml
index bc77e5c5e2110ebab7307592aa238600b82c71b0..375cb5a052860c6405a01ed8f99a1bc35fc2728c 100644 (file)
--- a/model/yang-model-export/pom.xml
+++ b/model/yang-model-export/pom.xml
@@ -27,9 +27,8 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/model/yang-model-export/src/main/java/module-info.java b/model/yang-model-export/src/main/java/module-info.java
index 8179b9c3873729f493db7ccd9eb3653cb3a25794..3bb94de42433a86dfaf02ec23c9802cfb65e8391 100644 (file)
--- a/model/yang-model-export/src/main/java/module-info.java
+++ b/model/yang-model-export/src/main/java/module-info.java
@@ -15,5 +15,4 @@ module org.opendaylight.yangtools.yang.model.export {
 
     // Annotations
     requires static transitive org.eclipse.jdt.annotation;
-    requires static com.github.spotbugs.annotations;
 }

diff --git a/model/yang-model-ri/pom.xml b/model/yang-model-ri/pom.xml
index 3ba294267c091060136fd5efb9fee2694396266a..83ae724e8cea36c536b2865bdbf8557b1e3176f7 100644 (file)
--- a/model/yang-model-ri/pom.xml
+++ b/model/yang-model-ri/pom.xml
@@ -22,14 +22,18 @@
     <description>Reference Implementation of yang.model.api</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/model/yang-model-spi/pom.xml b/model/yang-model-spi/pom.xml
index c8d751703ce42bc88142008b80ec260b7ef927d8..e960185f75e926dac788ffc356531e12482f22f3 100644 (file)
--- a/model/yang-model-spi/pom.xml
+++ b/model/yang-model-spi/pom.xml
@@ -22,14 +22,18 @@
     <description>${project.artifactId}</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/model/yang-model-util/pom.xml b/model/yang-model-util/pom.xml
index 88ad14e3d9530ef044b433f84f7a044fc1a45f92..203534353e5aed99cf73a27265aba4a943ecc885 100644 (file)
--- a/model/yang-model-util/pom.xml
+++ b/model/yang-model-util/pom.xml
@@ -22,14 +22,18 @@
     <description>${project.artifactId}</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/parser/odlext-parser-support/pom.xml b/parser/odlext-parser-support/pom.xml
index 1e3bf438e7a65aca88630e155f0b0ad0c657e283..30a16e3b92d922e372c2b5f249be87a067c92aad 100644 (file)
--- a/parser/odlext-parser-support/pom.xml
+++ b/parser/odlext-parser-support/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>

diff --git a/parser/rfc8040-parser-support/pom.xml b/parser/rfc8040-parser-support/pom.xml
index 70eb4b6a059de546bce5bb72ff720f0b2d4d18e3..9df2422f9dc72cf235899b3412b6a21120eed03b 100644 (file)
--- a/parser/rfc8040-parser-support/pom.xml
+++ b/parser/rfc8040-parser-support/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>

diff --git a/parser/yang-ir/pom.xml b/parser/yang-ir/pom.xml
index 6d055e2a1707dee3b272f17e3711b5374b2f7159..61fbc55a7d4140e61e00d073d0d98032d42e15cb 100644 (file)
--- a/parser/yang-ir/pom.xml
+++ b/parser/yang-ir/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>

diff --git a/parser/yang-parser-api/pom.xml b/parser/yang-parser-api/pom.xml
index 4342b92a6f4967f720ccc35a6e405439c88991ea..5dbdba11241143e1052c7b786078073d6cc5c2f0 100644 (file)
--- a/parser/yang-parser-api/pom.xml
+++ b/parser/yang-parser-api/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>

diff --git a/parser/yang-parser-impl/pom.xml b/parser/yang-parser-impl/pom.xml
index 170471f728ce6442c21960838c52f82e6297c251..6c74cb819fedd6b854a640431d2447b0319ab48b 100644 (file)
--- a/parser/yang-parser-impl/pom.xml
+++ b/parser/yang-parser-impl/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.gaul</groupId>
             <artifactId>modernizer-maven-annotations</artifactId>

diff --git a/parser/yang-parser-reactor/pom.xml b/parser/yang-parser-reactor/pom.xml
index 21008cd1cb2141c9dc952348aada448e60f3a1b5..6757bad5a3b538477b4155935b8bbbffa94fbbda 100644 (file)
--- a/parser/yang-parser-reactor/pom.xml
+++ b/parser/yang-parser-reactor/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>

diff --git a/parser/yang-parser-rfc7950/pom.xml b/parser/yang-parser-rfc7950/pom.xml
index 310234766e3a30b47451c2c760463117f5a82ad8..f1ae72fd669d3e8ee5f94bee0a346b2cfabf879c 100644 (file)
--- a/parser/yang-parser-rfc7950/pom.xml
+++ b/parser/yang-parser-rfc7950/pom.xml
@@ -22,19 +22,23 @@
     <description>RFC6020/RFC7950 parser support</description>
 
     <dependencies>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>

diff --git a/parser/yang-parser-spi/pom.xml b/parser/yang-parser-spi/pom.xml
index 6573076c2706b9d240ba7eed4ac92e2fd367c6de..9157b9f573f7530fa4c13ff4d15ca78382944202 100644 (file)
--- a/parser/yang-parser-spi/pom.xml
+++ b/parser/yang-parser-spi/pom.xml
@@ -22,14 +22,18 @@
     <description>YANG parser SPI</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/parser/yang-test-util/pom.xml b/parser/yang-test-util/pom.xml
index e2220b0a19d0ff77904a59cea14a01b7d8173238..5ec6f701e55d6e7e9731ba04491dc1796102279c 100644 (file)
--- a/parser/yang-test-util/pom.xml
+++ b/parser/yang-test-util/pom.xml
@@ -22,14 +22,18 @@
     <description>${project.artifactId}</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/plugin/plugin-generator-api/pom.xml b/plugin/plugin-generator-api/pom.xml
index cd50ff1fbcdc3542c2ed3b2f3e6d7bd1e27d4463..e09e64155025d7d14609f7c8cbdb049c0d64e3bd 100644 (file)
--- a/plugin/plugin-generator-api/pom.xml
+++ b/plugin/plugin-generator-api/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>

diff --git a/plugin/yang-maven-plugin/pom.xml b/plugin/yang-maven-plugin/pom.xml
index a89393146d1375cdae8c01eb12053f761d14c570..5603fca6e64bd6c67a8d58f7f032d8a81bdeaf20 100644 (file)
--- a/plugin/yang-maven-plugin/pom.xml
+++ b/plugin/yang-maven-plugin/pom.xml
@@ -78,14 +78,18 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.kohsuke.metainf-services</groupId>

diff --git a/xpath/yang-xpath-api/pom.xml b/xpath/yang-xpath-api/pom.xml
index ce3104046808c8c8aacc423997292c3c7300d5f5..cea04c290a895902610a1e601961281937125f13 100644 (file)
--- a/xpath/yang-xpath-api/pom.xml
+++ b/xpath/yang-xpath-api/pom.xml
@@ -23,14 +23,18 @@
     <description>YANG XPath ${project.artifactId}</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/xpath/yang-xpath-impl/pom.xml b/xpath/yang-xpath-impl/pom.xml
index aca3a270374f89700dcd9d014fec1d481144d4a9..5c85d392e7933b91bf4d63a8e9e9a15a4f7b9eb1 100644 (file)
--- a/xpath/yang-xpath-impl/pom.xml
+++ b/xpath/yang-xpath-impl/pom.xml
@@ -30,6 +30,10 @@
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>

diff --git a/yang/yang-repo-api/pom.xml b/yang/yang-repo-api/pom.xml
index 18ae722c6b50907a38c9939190ddef3ab5dfcc76..afbc21ef8db5478b97f7768970b8751159dc7fe0 100644 (file)
--- a/yang/yang-repo-api/pom.xml
+++ b/yang/yang-repo-api/pom.xml
@@ -26,6 +26,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>

diff --git a/yang/yang-repo-spi/pom.xml b/yang/yang-repo-spi/pom.xml
index 48e6ec276db6a94287aa1b37f1e50afa3a077cbb..ebf7b919248dd2f53d3e9b76c2db929a868a8e6e 100644 (file)
--- a/yang/yang-repo-spi/pom.xml
+++ b/yang/yang-repo-spi/pom.xml
@@ -27,9 +27,8 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/yang/yang-repo-spi/src/main/java/module-info.java b/yang/yang-repo-spi/src/main/java/module-info.java
index f3c0220090746a5dbaf6f57fd66a9c8f048ceb47..805b7b165ed982f659d62b51ea3ad212e101520d 100644 (file)
--- a/yang/yang-repo-spi/src/main/java/module-info.java
+++ b/yang/yang-repo-spi/src/main/java/module-info.java
@@ -17,6 +17,5 @@ module org.opendaylight.yangtools.yang.repo.spi {
 
     // Annotations
     requires static transitive org.eclipse.jdt.annotation;
-    requires static com.github.spotbugs.annotations;
     requires static org.checkerframework.checker.qual;
 }