Do not require spotbugs transitively

Clean up dependencies, eliminating unused declared dependencies on
spotbugs-annotations. Also clean up dependency confusion between
mdsal-binding-dom-adapter and mdsal-binding-test-utils.

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

diff --git a/binding/mdsal-binding-api/src/main/java/module-info.java b/binding/mdsal-binding-api/src/main/java/module-info.java
index 26ccc9e7f0f3dc3ac15d78f9d84cb8035cd4a4fe..1fe683f4aa0e7640a403739169d3e7cd39b88b23 100644 (file)
--- a/binding/mdsal-binding-api/src/main/java/module-info.java
+++ b/binding/mdsal-binding-api/src/main/java/module-info.java
@@ -16,5 +16,5 @@ module org.opendaylight.mdsal.binding.api {
 
     // Annotations
     requires static transitive org.eclipse.jdt.annotation;
-    requires static transitive com.github.spotbugs.annotations;
+    requires static com.github.spotbugs.annotations;
 }

diff --git a/binding/mdsal-binding-dom-adapter/pom.xml b/binding/mdsal-binding-dom-adapter/pom.xml
index cac4a185b516a8bbebc7ba2253bf5e87b0ceb223..3a41d3dae316d8853ce369d3c64f69a5b04a58e0 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/pom.xml
+++ b/binding/mdsal-binding-dom-adapter/pom.xml
@@ -29,39 +29,95 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.guicedee.services</groupId>
+            <artifactId>javax.inject</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.gaul</groupId>
             <artifactId>modernizer-maven-annotations</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.kohsuke.metainf-services</groupId>
+            <artifactId>metainf-services</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-tree-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-util</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-dom-api</artifactId>
+            <artifactId>mdsal-binding-dom-codec-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-dom-spi</artifactId>
+            <artifactId>mdsal-binding-dom-codec-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-dom-codec</artifactId>
+            <artifactId>mdsal-binding-model-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-data-impl</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-runtime-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kohsuke.metainf-services</groupId>
-            <artifactId>metainf-services</artifactId>
-            <optional>true</optional>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-spec-util</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.guicedee.services</groupId>
-            <artifactId>javax.inject</artifactId>
-            <optional>true</optional>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-common-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-dom-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-dom-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -84,6 +140,11 @@
             <artifactId>org.osgi.util.tracker</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-dom-codec</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-generator</artifactId>

diff --git a/binding/mdsal-binding-dom-codec-osgi/pom.xml b/binding/mdsal-binding-dom-codec-osgi/pom.xml
index 48db4839f78a97767aad65bcd33a34aa5ba39a98..4730bc0f79d104d059c77e49dea6ddadc2c89463 100644 (file)
--- a/binding/mdsal-binding-dom-codec-osgi/pom.xml
+++ b/binding/mdsal-binding-dom-codec-osgi/pom.xml
@@ -20,15 +20,14 @@
     <packaging>bundle</packaging>
 
     <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>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-api</artifactId>

diff --git a/binding/mdsal-binding-dom-codec-spi/pom.xml b/binding/mdsal-binding-dom-codec-spi/pom.xml
index 7d80cee66d766f03e06ccc3470e663eb5af7eff0..eb4b89d3d6fc1eef6f0c88171e00f23b81ee45e2 100644 (file)
--- a/binding/mdsal-binding-dom-codec-spi/pom.xml
+++ b/binding/mdsal-binding-dom-codec-spi/pom.xml
@@ -20,11 +20,6 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/binding/mdsal-binding-loader/pom.xml b/binding/mdsal-binding-loader/pom.xml
index 6a189037a7e1317f41d39b6da1434eb5d13dd898..e647174fdb97cb2350b45df432d02a15d65efa44 100644 (file)
--- a/binding/mdsal-binding-loader/pom.xml
+++ b/binding/mdsal-binding-loader/pom.xml
@@ -20,11 +20,6 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/binding/mdsal-binding-model-ri/pom.xml b/binding/mdsal-binding-model-ri/pom.xml
index a95d1f847d84cf9ec4b904d723396ae729b3797b..514dd8a7bebc7b332f9588b18874659b76c8beb7 100644 (file)
--- a/binding/mdsal-binding-model-ri/pom.xml
+++ b/binding/mdsal-binding-model-ri/pom.xml
@@ -20,11 +20,6 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/binding/mdsal-binding-runtime-api/pom.xml b/binding/mdsal-binding-runtime-api/pom.xml
index 958984211eb1fa43e4465619cbd900c0fc34ddbc..4863aed08b77c3a68e465525469dba81c6a11094 100644 (file)
--- a/binding/mdsal-binding-runtime-api/pom.xml
+++ b/binding/mdsal-binding-runtime-api/pom.xml
@@ -20,11 +20,6 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/binding/mdsal-binding-runtime-osgi/pom.xml b/binding/mdsal-binding-runtime-osgi/pom.xml
index c2dad73aa3eb9519fa2ee6708ca3618b260988b6..d7b1a7be6d6ff7599d8e7274416574d94ae50cab 100644 (file)
--- a/binding/mdsal-binding-runtime-osgi/pom.xml
+++ b/binding/mdsal-binding-runtime-osgi/pom.xml
@@ -20,11 +20,6 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/binding/mdsal-binding-runtime-osgi/src/main/java/module-info.java b/binding/mdsal-binding-runtime-osgi/src/main/java/module-info.java
index fd6aba72bcebf091c7bdda66d7410c2ec8847490..f8b8a221b168f8aa1e3df44134c626e36eaee2d9 100644 (file)
--- a/binding/mdsal-binding-runtime-osgi/src/main/java/module-info.java
+++ b/binding/mdsal-binding-runtime-osgi/src/main/java/module-info.java
@@ -18,7 +18,6 @@ module org.opendaylight.mdsal.binding.runtime.osgi {
     requires org.slf4j;
 
     // Annotations
-    requires static com.github.spotbugs.annotations;
     requires static org.checkerframework.checker.qual;
     requires static org.eclipse.jdt.annotation;
     requires static org.osgi.service.component.annotations;

diff --git a/binding/mdsal-binding-runtime-spi/pom.xml b/binding/mdsal-binding-runtime-spi/pom.xml
index adc8d5bd071bebb7c130dce3c4ff310ced0b2020..d3bc99ebf43011dd06f089528218583da3842f7a 100644 (file)
--- a/binding/mdsal-binding-runtime-spi/pom.xml
+++ b/binding/mdsal-binding-runtime-spi/pom.xml
@@ -20,11 +20,6 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/binding/mdsal-binding-spec-util/pom.xml b/binding/mdsal-binding-spec-util/pom.xml
index 19483415ad5914ef1e1bfe5829d40e9734bfaf90..3300c5957132ac14cbe0aa29da37ccc04fc183c9 100644 (file)
--- a/binding/mdsal-binding-spec-util/pom.xml
+++ b/binding/mdsal-binding-spec-util/pom.xml
@@ -20,11 +20,6 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/binding/mdsal-binding-spi/pom.xml b/binding/mdsal-binding-spi/pom.xml
index c7a96b15487e4b31c4a48557dfb53a734ce8680a..97e1439b0a1a45c13ef36b3e70ebc0d3fd39578b 100644 (file)
--- a/binding/mdsal-binding-spi/pom.xml
+++ b/binding/mdsal-binding-spi/pom.xml
@@ -21,11 +21,6 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/binding/mdsal-binding-test-utils/pom.xml b/binding/mdsal-binding-test-utils/pom.xml
index 738cbdf7ba42b50812824f49bf2927e16fd91ed0..f6df05cd5696fe0dd57617c8175ab71fd15171cc 100644 (file)
--- a/binding/mdsal-binding-test-utils/pom.xml
+++ b/binding/mdsal-binding-test-utils/pom.xml
@@ -74,6 +74,10 @@
         </dependency>
         <!-- For testing purposes we want to bring in also implementation
              artifacts -->
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-dom-codec</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-dom-broker</artifactId>

diff --git a/binding/yang-binding/src/main/java/module-info.java b/binding/yang-binding/src/main/java/module-info.java
index c4015e8eae242f45e032ad520ead84b020bf444a..2aba738bf7a280bde49277dd88b17a7e329ba277 100644 (file)
--- a/binding/yang-binding/src/main/java/module-info.java
+++ b/binding/yang-binding/src/main/java/module-info.java
@@ -16,8 +16,6 @@ module org.opendaylight.yangtools.yang.binding {
 
     // Annotations
     requires static transitive org.eclipse.jdt.annotation;
-    // FIXME: yeah, because ... we use this in public classes, so tools need
-    //        to resolve it. Why exactly?!
-    requires static transitive com.github.spotbugs.annotations;
+    requires static com.github.spotbugs.annotations;
     requires static org.checkerframework.checker.qual;
 }

diff --git a/dom/mdsal-dom-api/src/main/java/module-info.java b/dom/mdsal-dom-api/src/main/java/module-info.java
index de37454ad834d53d0b661c6ead5d87ff8011b748..96c88e0be4ca1ad4b47d23eeeb8869671ea4eeda 100644 (file)
--- a/dom/mdsal-dom-api/src/main/java/module-info.java
+++ b/dom/mdsal-dom-api/src/main/java/module-info.java
@@ -21,7 +21,7 @@ module org.opendaylight.mdsal.dom.api {
     requires org.opendaylight.yangtools.util;
 
     // Annotations
-    requires static transitive com.github.spotbugs.annotations;
+    requires static com.github.spotbugs.annotations;
     requires static transitive org.checkerframework.checker.qual;
     requires static transitive org.eclipse.jdt.annotation;
 }

diff --git a/dom/mdsal-dom-broker/src/main/java/module-info.java b/dom/mdsal-dom-broker/src/main/java/module-info.java
index df0dbb282ef81864a4a956ab5fee60fd1db58cb3..fbb06d8fb304f1d4c223ece9040a209979e5ef6f 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/module-info.java
+++ b/dom/mdsal-dom-broker/src/main/java/module-info.java
@@ -22,6 +22,7 @@ module org.opendaylight.mdsal.dom.broker {
     // Annotations
     requires static transitive java.annotation;
     requires static transitive javax.inject;
+    requires static com.github.spotbugs.annotations;
     requires static org.kohsuke.metainf_services;
     requires static org.osgi.service.component.annotations;
     requires static org.osgi.service.metatype.annotations;

diff --git a/dom/mdsal-dom-schema-osgi/pom.xml b/dom/mdsal-dom-schema-osgi/pom.xml
index e0756287b97320b18cab9800349a21396d0a7547..05704197bb925cd49283982b09d7eb8f3c65a4d5 100644 (file)
--- a/dom/mdsal-dom-schema-osgi/pom.xml
+++ b/dom/mdsal-dom-schema-osgi/pom.xml
@@ -20,11 +20,6 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-dom-spi</artifactId>

diff --git a/entityownership/mdsal-eos-binding-adapter/src/main/java/module-info.java b/entityownership/mdsal-eos-binding-adapter/src/main/java/module-info.java
index 31e1edf8fc6b3f574c2966d1ee4eee8c2214a16c..e8a44215894fce80d5ba55a8b24f5cb0e17c7017 100644 (file)
--- a/entityownership/mdsal-eos-binding-adapter/src/main/java/module-info.java
+++ b/entityownership/mdsal-eos-binding-adapter/src/main/java/module-info.java
@@ -15,6 +15,7 @@ module org.opendaylight.mdsal.eos.binding.dom.adapter {
     requires org.slf4j;
 
     // Annotations
+    requires static com.github.spotbugs.annotations;
     requires static javax.inject;
     requires static org.osgi.service.component.annotations;
 }

diff --git a/entityownership/mdsal-eos-binding-api/pom.xml b/entityownership/mdsal-eos-binding-api/pom.xml
index 30a035aa03aa195aca08ff9f4921a75a49910910..2b8c50e1ab68c0ada567acaeb5d901d2b73ba4ea 100644 (file)
--- a/entityownership/mdsal-eos-binding-api/pom.xml
+++ b/entityownership/mdsal-eos-binding-api/pom.xml
@@ -19,11 +19,6 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/entityownership/mdsal-eos-dom-simple/pom.xml b/entityownership/mdsal-eos-dom-simple/pom.xml
index 305f4a8030272bb87f9f146c2788ec8fcae94aad..fe2eae57f9b306a60e1689dd3244ef7162051681 100644 (file)
--- a/entityownership/mdsal-eos-dom-simple/pom.xml
+++ b/entityownership/mdsal-eos-dom-simple/pom.xml
@@ -19,11 +19,6 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/entityownership/mdsal-eos-dom-simple/src/main/java/module-info.java b/entityownership/mdsal-eos-dom-simple/src/main/java/module-info.java
index ab70eee986d03895632b7bcc9f5bd93b0ad5d634..08410399d94aaae9e0720b0283fc131143889eae 100644 (file)
--- a/entityownership/mdsal-eos-dom-simple/src/main/java/module-info.java
+++ b/entityownership/mdsal-eos-dom-simple/src/main/java/module-info.java
@@ -18,7 +18,6 @@ module org.opendaylight.mdsal.eos.dom.simple {
     provides DOMEntityOwnershipService with SimpleDOMEntityOwnershipService;
 
     // Annotations
-    requires static com.github.spotbugs.annotations;
     requires static javax.inject;
     requires static org.eclipse.jdt.annotation;
     requires static org.checkerframework.checker.qual;

diff --git a/yanglib/mdsal-yanglib-rfc8525/pom.xml b/yanglib/mdsal-yanglib-rfc8525/pom.xml
index 304db1f856d56c60769ef5328a44ae52a54d116c..518b283b1a573373f61f553b4b62a33fb0904c00 100644 (file)
--- a/yanglib/mdsal-yanglib-rfc8525/pom.xml
+++ b/yanglib/mdsal-yanglib-rfc8525/pom.xml
@@ -22,11 +22,6 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-yanglib-api</artifactId>

diff --git a/yanglib/mdsal-yanglib-rfc8525/src/main/java/module-info.java b/yanglib/mdsal-yanglib-rfc8525/src/main/java/module-info.java
index 7503121b6e06b8c82068180ffbfa2b3533939891..5ba1f1d37fb2df7950a401898f03e13bd6f709b7 100644 (file)
--- a/yanglib/mdsal-yanglib-rfc8525/src/main/java/module-info.java
+++ b/yanglib/mdsal-yanglib-rfc8525/src/main/java/module-info.java
@@ -37,7 +37,6 @@ module org.opendaylight.mdsal.yanglib.rfc8525 {
     requires org.slf4j;
 
     // Annotations
-    requires static com.github.spotbugs.annotations;
     requires static javax.inject;
     requires static org.kohsuke.metainf_services;
     requires static org.osgi.service.component.annotations;