Cleanup dependency declarations

odlparent-9 is giving us the ability to enforce dependency declarations,
this fixes some of the more obvious violations reported.

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

diff --git a/common/concepts/pom.xml b/common/concepts/pom.xml
index ca34e883f33aaf33370a3e02132eef0ace3a4d6e..2bb52c44774f7236b84ae5e684bc4267b6f1b067 100644 (file)
--- a/common/concepts/pom.xml
+++ b/common/concepts/pom.xml
@@ -26,6 +26,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.checkerframework</groupId>
+            <artifactId>checker-qual</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>

diff --git a/common/util/pom.xml b/common/util/pom.xml
index 89c23a2550fcaffb74c0bec23838647d179e9fd2..dbbbee643b2d4d59da9dff93e02a76b5d73ab408 100644 (file)
--- a/common/util/pom.xml
+++ b/common/util/pom.xml
@@ -39,6 +39,11 @@
             <artifactId>value</artifactId>
             <classifier>annotations</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.checkerframework</groupId>
+            <artifactId>checker-qual</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -47,7 +52,6 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava-testlib</artifactId>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>

diff --git a/yang/openconfig-model-api/pom.xml b/yang/openconfig-model-api/pom.xml
index 451af132f067e33a0d92b266751150e5f66f53c7..2e5c80b9422fc41ac9684d737e7e3bcdb8a84648 100644 (file)
--- a/yang/openconfig-model-api/pom.xml
+++ b/yang/openconfig-model-api/pom.xml
@@ -22,6 +22,10 @@
     <description>OpenConfig extensions metamodel</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>

diff --git a/yang/rfc7952-data-api/pom.xml b/yang/rfc7952-data-api/pom.xml
index 99c0e99b02a1ca0cd2317abddc63d8c4e8e59b21..1184d60e07928813e2d4d08e2822229493a811d4 100644 (file)
--- a/yang/rfc7952-data-api/pom.xml
+++ b/yang/rfc7952-data-api/pom.xml
@@ -22,6 +22,10 @@
     <description>RFC7952 data model extensions</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>

diff --git a/yang/rfc7952-model-api/pom.xml b/yang/rfc7952-model-api/pom.xml
index 019f6ce71ef0bbddc43a10366f572c23c74caf0e..0d95e5bd552e8a5ec0c4dc60a0f6a07bfe646ae2 100644 (file)
--- a/yang/rfc7952-model-api/pom.xml
+++ b/yang/rfc7952-model-api/pom.xml
@@ -22,6 +22,10 @@
     <description>RFC7952 metamodel</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>

diff --git a/yang/rfc8528-data-api/pom.xml b/yang/rfc8528-data-api/pom.xml
index 8cd1e7224a98d768859bead3f96280f3c8620e2a..4c485b5059c60102a83271d8a54db7fee3fb4705 100644 (file)
--- a/yang/rfc8528-data-api/pom.xml
+++ b/yang/rfc8528-data-api/pom.xml
@@ -22,10 +22,18 @@
     <description>RFC8528 data model extensions</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </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>
@@ -34,6 +42,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-api</artifactId>

diff --git a/yang/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml
index bfb946bab17c209975588e4ebbc9d7149ed9cc9a..4bec3b5d809288c8555c141aa3cb1fe7a90380f8 100644 (file)
--- a/yang/yang-model-api/pom.xml
+++ b/yang/yang-model-api/pom.xml
@@ -22,9 +22,13 @@
     <description>${project.artifactId}</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>util</artifactId>
+            <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -34,9 +38,5 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-xpath-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
     </dependencies>
 </project>

diff --git a/yang/yang-model-api/src/main/java/module-info.java b/yang/yang-model-api/src/main/java/module-info.java
index 3927c0b4dda375845dd660ab6dd858133d9ef7ab..abf5544729dcc768c121834d421ff52781d2fea4 100644 (file)
--- a/yang/yang-model-api/src/main/java/module-info.java
+++ b/yang/yang-model-api/src/main/java/module-info.java
@@ -16,7 +16,6 @@ module org.opendaylight.yangtools.yang.model.api {
     requires transitive org.opendaylight.yangtools.yang.common;
     requires transitive org.opendaylight.yangtools.yang.xpath.api;
     requires com.google.common;
-    requires org.opendaylight.yangtools.util;
     requires org.slf4j;
 
     // Annotations

diff --git a/yang/yang-model-ri/pom.xml b/yang/yang-model-ri/pom.xml
index 7199834a8be2a4b8277470130d4925d1aebc3beb..885ff2f56bc1954b5ea63e6889c17cae4acd0a80 100644 (file)
--- a/yang/yang-model-ri/pom.xml
+++ b/yang/yang-model-ri/pom.xml
@@ -22,6 +22,18 @@
     <description>Reference Implementation of yang.model.api</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
@@ -34,5 +46,9 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-repo-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-xpath-api</artifactId>
+        </dependency>
     </dependencies>
 </project>

diff --git a/yang/yang-model-spi/pom.xml b/yang/yang-model-spi/pom.xml
index 57ff0439eea34ded617ba87a0718bd152d6e466e..d75f6747d951c570c78f99d429c291f00c3f1f3d 100644 (file)
--- a/yang/yang-model-spi/pom.xml
+++ b/yang/yang-model-spi/pom.xml
@@ -22,10 +22,30 @@
     <description>${project.artifactId}</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </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-model-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-xpath-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>rfc7952-model-api</artifactId>

diff --git a/yang/yang-parser-api/pom.xml b/yang/yang-parser-api/pom.xml
index d07d9e41e29d10b1b7cbb3978a74e5fe22fba445..02c5732c91cbaf39c633dc16b7f9605a6736f632 100644 (file)
--- a/yang/yang-parser-api/pom.xml
+++ b/yang/yang-parser-api/pom.xml
@@ -22,6 +22,14 @@
     <description>YANG parser API</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>

diff --git a/yang/yang-parser-reactor/pom.xml b/yang/yang-parser-reactor/pom.xml
index 995a6e28c6ddea03d96ead4468fb93f6184c38f8..623ab357a899c7291331010e65a9f66cdb7c8f41 100644 (file)
--- a/yang/yang-parser-reactor/pom.xml
+++ b/yang/yang-parser-reactor/pom.xml
@@ -44,11 +44,11 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-parser-api</artifactId>
+            <artifactId>yang-parser-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-parser-spi</artifactId>
+            <artifactId>yang-repo-api</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/yang/yang-parser-spi/pom.xml b/yang/yang-parser-spi/pom.xml
index 26c3ba4f6012656ef8fcd4d2d9feed386363ab26..773919ff6ce3d83f3ef397dad43368ca4fd0c831 100644 (file)
--- a/yang/yang-parser-spi/pom.xml
+++ b/yang/yang-parser-spi/pom.xml
@@ -22,6 +22,10 @@
     <description>YANG parser SPI</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>

diff --git a/yang/yang-repo-api/pom.xml b/yang/yang-repo-api/pom.xml
index aaa571bc0f05e1c607efc57a8a09a5e58ff10a2e..09852e1f867827e4a32ba23d32bf2f54e04d3198 100644 (file)
--- a/yang/yang-repo-api/pom.xml
+++ b/yang/yang-repo-api/pom.xml
@@ -26,6 +26,14 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </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>

diff --git a/yang/yang-repo-spi/pom.xml b/yang/yang-repo-spi/pom.xml
index f753fb3645ecc4f177c08d1ed11fdac3044835b9..ea2d699e5839c46fb6d211a482a4a5645dde04ec 100644 (file)
--- a/yang/yang-repo-spi/pom.xml
+++ b/yang/yang-repo-spi/pom.xml
@@ -22,6 +22,22 @@
     <description>YANG Schema Repository SPI</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </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-repo-api</artifactId>

diff --git a/yang/yang-xpath-api/pom.xml b/yang/yang-xpath-api/pom.xml
index af4ffb2e772e9212b1a01d176a42b465babdbacc..2fef4f70ac0ce605297f4cf27ae3284c676a426e 100644 (file)
--- a/yang/yang-xpath-api/pom.xml
+++ b/yang/yang-xpath-api/pom.xml
@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>util</artifactId>
+            <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/yang/yang-xpath-impl/pom.xml b/yang/yang-xpath-impl/pom.xml
index 0a0b14aa5e82bbcb1d78ad41f29a919ccfc69639..9db9fdfa83f1e3a445ff052961cc9a5aedcfb86c 100644 (file)
--- a/yang/yang-xpath-impl/pom.xml
+++ b/yang/yang-xpath-impl/pom.xml
@@ -27,6 +27,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr4-runtime</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>