From 884475d0966b2eed063ceb4e8358a23a59d20b37 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 10 Apr 2021 12:38:28 +0200
Subject: [PATCH] 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>
---
 common/concepts/pom.xml                       |  5 +++++
 common/util/pom.xml                           |  6 +++++-
 yang/openconfig-model-api/pom.xml             |  4 ++++
 yang/rfc7952-data-api/pom.xml                 |  4 ++++
 yang/rfc7952-model-api/pom.xml                |  4 ++++
 yang/rfc8528-data-api/pom.xml                 | 12 +++++++++++
 yang/yang-model-api/pom.xml                   | 10 +++++-----
 .../src/main/java/module-info.java            |  1 -
 yang/yang-model-ri/pom.xml                    | 16 +++++++++++++++
 yang/yang-model-spi/pom.xml                   | 20 +++++++++++++++++++
 yang/yang-parser-api/pom.xml                  |  8 ++++++++
 yang/yang-parser-reactor/pom.xml              |  4 ++--
 yang/yang-parser-spi/pom.xml                  |  4 ++++
 yang/yang-repo-api/pom.xml                    |  8 ++++++++
 yang/yang-repo-spi/pom.xml                    | 16 +++++++++++++++
 yang/yang-xpath-api/pom.xml                   |  2 +-
 yang/yang-xpath-impl/pom.xml                  |  4 ++++
 17 files changed, 118 insertions(+), 10 deletions(-)

diff --git a/common/concepts/pom.xml b/common/concepts/pom.xml
index ca34e883f3..2bb52c4477 100644
--- 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 89c23a2550..dbbbee643b 100644
--- 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 451af132f0..2e5c80b942 100644
--- 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 99c0e99b02..1184d60e07 100644
--- 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 019f6ce71e..0d95e5bd55 100644
--- 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 8cd1e7224a..4c485b5059 100644
--- 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 bfb946bab1..4bec3b5d80 100644
--- 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 3927c0b4dd..abf5544729 100644
--- 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 7199834a8b..885ff2f56b 100644
--- 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 57ff0439ee..d75f6747d9 100644
--- 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 d07d9e41e2..02c5732c91 100644
--- 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 995a6e28c6..623ab357a8 100644
--- 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 26c3ba4f60..773919ff6c 100644
--- 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 aaa571bc0f..09852e1f86 100644
--- 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 f753fb3645..ea2d699e58 100644
--- 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 af4ffb2e77..2fef4f70ac 100644
--- 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 0a0b14aa5e..9db9fdfa83 100644
--- 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>
-- 
2.36.6