From 03c446c565eebab928f959fe63f884b51f5c403d Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 3 Jan 2024 20:20:03 +0100
Subject: [PATCH] Clean up dependency declarations

Code movement we have made allows us to clean up dependencies. This
patch does that.

Change-Id: Ia01ead4410a421e0b1c0e8fe7d89377dc622720d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 codec/yang-data-codec-gson/pom.xml               |  4 ++++
 data/yang-data-api/pom.xml                       |  4 ----
 .../yang-data-api/src/main/java/module-info.java |  1 -
 data/yang-data-spi/pom.xml                       | 16 ++++++++++++----
 data/yang-data-tree-ri/pom.xml                   |  4 ----
 .../src/main/java/module-info.java               |  1 -
 data/yang-data-util/pom.xml                      |  4 ----
 .../src/main/java/module-info.java               |  1 -
 model/rfc6241-model-api/pom.xml                  |  4 ----
 .../src/main/java/module-info.java               |  1 -
 model/rfc6536-model-api/pom.xml                  |  4 ----
 .../src/main/java/module-info.java               |  1 -
 model/rfc8040-model-api/pom.xml                  |  4 ----
 .../src/main/java/module-info.java               |  1 -
 model/rfc8639-model-api/pom.xml                  |  4 ----
 .../src/main/java/module-info.java               |  1 -
 model/yang-model-ri/pom.xml                      |  4 ----
 .../yang-model-ri/src/main/java/module-info.java |  1 -
 model/yang-model-util/pom.xml                    |  9 ---------
 .../src/main/java/module-info.java               |  2 --
 parser/yang-parser-api/pom.xml                   |  4 ----
 .../src/main/java/module-info.java               |  1 -
 parser/yang-parser-impl/pom.xml                  |  8 ++++++++
 parser/yang-parser-reactor/pom.xml               |  4 ----
 .../src/main/java/module-info.java               |  1 -
 parser/yang-parser-spi/pom.xml                   |  4 ----
 .../src/main/java/module-info.java               |  1 -
 parser/yang-test-util/pom.xml                    |  4 ++--
 plugin/plugin-generator-api/pom.xml              |  2 +-
 plugin/yang-maven-plugin/pom.xml                 |  6 +++---
 yang/yang-repo-api/pom.xml                       |  4 ----
 .../yang-repo-api/src/main/java/module-info.java |  1 -
 yang/yang-repo-fs/pom.xml                        | 12 ++++++++++++
 yang/yang-repo-fs/src/main/java/module-info.java |  1 +
 yang/yang-repo-spi/pom.xml                       |  9 +++++++++
 35 files changed, 52 insertions(+), 81 deletions(-)

diff --git a/codec/yang-data-codec-gson/pom.xml b/codec/yang-data-codec-gson/pom.xml
index 7f1ffb4690..e9098b2834 100644
--- a/codec/yang-data-codec-gson/pom.xml
+++ b/codec/yang-data-codec-gson/pom.xml
@@ -55,6 +55,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-util</artifactId>
diff --git a/data/yang-data-api/pom.xml b/data/yang-data-api/pom.xml
index 63146b474e..b86e832e0d 100644
--- a/data/yang-data-api/pom.xml
+++ b/data/yang-data-api/pom.xml
@@ -56,10 +56,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-model-spi</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
diff --git a/data/yang-data-api/src/main/java/module-info.java b/data/yang-data-api/src/main/java/module-info.java
index 177ce87464..55f01a1fa2 100644
--- a/data/yang-data-api/src/main/java/module-info.java
+++ b/data/yang-data-api/src/main/java/module-info.java
@@ -19,7 +19,6 @@ module org.opendaylight.yangtools.yang.data.api {
     requires transitive org.opendaylight.yangtools.util;
     requires transitive org.opendaylight.yangtools.yang.common;
     requires transitive org.opendaylight.yangtools.yang.model.api;
-    requires org.opendaylight.yangtools.yang.model.spi;
     requires org.slf4j;
 
     // Annotations
diff --git a/data/yang-data-spi/pom.xml b/data/yang-data-spi/pom.xml
index 22ce61bce7..bf9956e481 100644
--- a/data/yang-data-spi/pom.xml
+++ b/data/yang-data-spi/pom.xml
@@ -40,12 +40,20 @@
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-common</artifactId>
+            <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>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-api</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/data/yang-data-tree-ri/pom.xml b/data/yang-data-tree-ri/pom.xml
index aebf404fec..639a94eb01 100644
--- a/data/yang-data-tree-ri/pom.xml
+++ b/data/yang-data-tree-ri/pom.xml
@@ -51,10 +51,6 @@
             <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-spi</artifactId>
diff --git a/data/yang-data-tree-ri/src/main/java/module-info.java b/data/yang-data-tree-ri/src/main/java/module-info.java
index e35cee0ca1..0771e139b9 100644
--- a/data/yang-data-tree-ri/src/main/java/module-info.java
+++ b/data/yang-data-tree-ri/src/main/java/module-info.java
@@ -19,7 +19,6 @@ module org.opendaylight.yangtools.yang.data.tree {
     requires org.opendaylight.yangtools.concepts;
     requires org.opendaylight.yangtools.yang.common;
     requires org.opendaylight.yangtools.yang.data.api;
-    requires org.opendaylight.yangtools.yang.data.impl;
     requires org.opendaylight.yangtools.yang.data.spi;
     requires org.opendaylight.yangtools.yang.data.tree.spi;
     requires org.opendaylight.yangtools.yang.data.util;
diff --git a/data/yang-data-util/pom.xml b/data/yang-data-util/pom.xml
index d4b6eba624..61bb5af021 100644
--- a/data/yang-data-util/pom.xml
+++ b/data/yang-data-util/pom.xml
@@ -50,10 +50,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-model-spi</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-util</artifactId>
diff --git a/data/yang-data-util/src/main/java/module-info.java b/data/yang-data-util/src/main/java/module-info.java
index b57acd49b6..382d492ca8 100644
--- a/data/yang-data-util/src/main/java/module-info.java
+++ b/data/yang-data-util/src/main/java/module-info.java
@@ -14,7 +14,6 @@ module org.opendaylight.yangtools.yang.data.util {
     requires transitive org.opendaylight.yangtools.yang.common;
     requires transitive org.opendaylight.yangtools.yang.data.api;
     requires transitive org.opendaylight.yangtools.yang.model.api;
-    requires transitive org.opendaylight.yangtools.yang.model.spi;
     requires transitive org.opendaylight.yangtools.yang.model.util;
     requires transitive org.opendaylight.yangtools.yang.xpath.api;
 
diff --git a/model/rfc6241-model-api/pom.xml b/model/rfc6241-model-api/pom.xml
index 95ce8520d9..3b85816df5 100644
--- a/model/rfc6241-model-api/pom.xml
+++ b/model/rfc6241-model-api/pom.xml
@@ -22,10 +22,6 @@
     <description>RFC6241 extensions for unbound metadata</description>
 
     <dependencies>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.jdt</groupId>
             <artifactId>org.eclipse.jdt.annotation</artifactId>
diff --git a/model/rfc6241-model-api/src/main/java/module-info.java b/model/rfc6241-model-api/src/main/java/module-info.java
index 24d192cc09..e5b8454633 100644
--- a/model/rfc6241-model-api/src/main/java/module-info.java
+++ b/model/rfc6241-model-api/src/main/java/module-info.java
@@ -12,7 +12,6 @@ module org.opendaylight.yangtools.rfc6241.model.api {
 
     requires transitive org.opendaylight.yangtools.yang.common;
     requires transitive org.opendaylight.yangtools.yang.model.api;
-    requires com.google.common;
 
     // Annotations
     requires static transitive org.eclipse.jdt.annotation;
diff --git a/model/rfc6536-model-api/pom.xml b/model/rfc6536-model-api/pom.xml
index 8c19fa8eec..d6bdf651fe 100644
--- a/model/rfc6536-model-api/pom.xml
+++ b/model/rfc6536-model-api/pom.xml
@@ -22,10 +22,6 @@
     <description>RFC6536 metamodel</description>
 
     <dependencies>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.jdt</groupId>
             <artifactId>org.eclipse.jdt.annotation</artifactId>
diff --git a/model/rfc6536-model-api/src/main/java/module-info.java b/model/rfc6536-model-api/src/main/java/module-info.java
index e81a4ae04c..77727955df 100644
--- a/model/rfc6536-model-api/src/main/java/module-info.java
+++ b/model/rfc6536-model-api/src/main/java/module-info.java
@@ -12,7 +12,6 @@ module org.opendaylight.yangtools.rfc6536.model.api {
 
     requires transitive org.opendaylight.yangtools.yang.common;
     requires transitive org.opendaylight.yangtools.yang.model.api;
-    requires com.google.common;
 
     // Annotations
     requires static transitive org.eclipse.jdt.annotation;
diff --git a/model/rfc8040-model-api/pom.xml b/model/rfc8040-model-api/pom.xml
index 5689d8febd..9462c822c4 100644
--- a/model/rfc8040-model-api/pom.xml
+++ b/model/rfc8040-model-api/pom.xml
@@ -22,10 +22,6 @@
     <description>RFC8040 model API</description>
 
     <dependencies>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.jdt</groupId>
             <artifactId>org.eclipse.jdt.annotation</artifactId>
diff --git a/model/rfc8040-model-api/src/main/java/module-info.java b/model/rfc8040-model-api/src/main/java/module-info.java
index e43de6facf..f18d373016 100644
--- a/model/rfc8040-model-api/src/main/java/module-info.java
+++ b/model/rfc8040-model-api/src/main/java/module-info.java
@@ -12,7 +12,6 @@ module org.opendaylight.yangtools.rfc8040.model.api {
 
     requires transitive org.opendaylight.yangtools.yang.common;
     requires transitive org.opendaylight.yangtools.yang.model.api;
-    requires com.google.common;
 
     // Annotations
     requires static transitive org.eclipse.jdt.annotation;
diff --git a/model/rfc8639-model-api/pom.xml b/model/rfc8639-model-api/pom.xml
index 30214687a2..817f20fd82 100644
--- a/model/rfc8639-model-api/pom.xml
+++ b/model/rfc8639-model-api/pom.xml
@@ -22,10 +22,6 @@
     <description>RFC8639 model API</description>
 
     <dependencies>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.jdt</groupId>
             <artifactId>org.eclipse.jdt.annotation</artifactId>
diff --git a/model/rfc8639-model-api/src/main/java/module-info.java b/model/rfc8639-model-api/src/main/java/module-info.java
index b6d74e5bbe..77409976a5 100644
--- a/model/rfc8639-model-api/src/main/java/module-info.java
+++ b/model/rfc8639-model-api/src/main/java/module-info.java
@@ -12,7 +12,6 @@ module org.opendaylight.yangtools.rfc8639.model.api {
 
     requires transitive org.opendaylight.yangtools.yang.common;
     requires transitive org.opendaylight.yangtools.yang.model.api;
-    requires com.google.common;
 
     // Annotations
     requires static transitive org.eclipse.jdt.annotation;
diff --git a/model/yang-model-ri/pom.xml b/model/yang-model-ri/pom.xml
index 9a69580d3d..86f5abe72d 100644
--- a/model/yang-model-ri/pom.xml
+++ b/model/yang-model-ri/pom.xml
@@ -51,10 +51,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-repo-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-xpath-api</artifactId>
diff --git a/model/yang-model-ri/src/main/java/module-info.java b/model/yang-model-ri/src/main/java/module-info.java
index 85d4f25869..89bd6a42a2 100644
--- a/model/yang-model-ri/src/main/java/module-info.java
+++ b/model/yang-model-ri/src/main/java/module-info.java
@@ -17,7 +17,6 @@ module org.opendaylight.yangtools.yang.model.ri {
     requires transitive org.opendaylight.yangtools.yang.common;
     requires transitive org.opendaylight.yangtools.yang.model.api;
     requires transitive org.opendaylight.yangtools.yang.model.spi;
-    requires transitive org.opendaylight.yangtools.yang.repo.api;
     requires transitive org.opendaylight.yangtools.yang.xpath.api;
     requires org.slf4j;
 
diff --git a/model/yang-model-util/pom.xml b/model/yang-model-util/pom.xml
index de9282a11b..9cbf802736 100644
--- a/model/yang-model-util/pom.xml
+++ b/model/yang-model-util/pom.xml
@@ -22,11 +22,6 @@
     <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>
@@ -51,10 +46,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-repo-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-xpath-api</artifactId>
diff --git a/model/yang-model-util/src/main/java/module-info.java b/model/yang-model-util/src/main/java/module-info.java
index 7e611322f0..24cbd66b9c 100644
--- a/model/yang-model-util/src/main/java/module-info.java
+++ b/model/yang-model-util/src/main/java/module-info.java
@@ -13,12 +13,10 @@ module org.opendaylight.yangtools.yang.model.util {
     requires transitive org.opendaylight.yangtools.yang.common;
     requires transitive org.opendaylight.yangtools.yang.model.api;
     requires transitive org.opendaylight.yangtools.yang.model.spi;
-    requires transitive org.opendaylight.yangtools.yang.repo.api;
     requires transitive org.opendaylight.yangtools.yang.xpath.api;
     requires transitive org.opendaylight.yangtools.rfc8040.model.api;
     requires org.slf4j;
 
     // Annotations
     requires static transitive org.eclipse.jdt.annotation;
-    requires static com.github.spotbugs.annotations;
 }
diff --git a/parser/yang-parser-api/pom.xml b/parser/yang-parser-api/pom.xml
index cd8bd27f86..b327dd0456 100644
--- a/parser/yang-parser-api/pom.xml
+++ b/parser/yang-parser-api/pom.xml
@@ -42,9 +42,5 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-repo-api</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/parser/yang-parser-api/src/main/java/module-info.java b/parser/yang-parser-api/src/main/java/module-info.java
index 97796f9a11..b73170cd7d 100644
--- a/parser/yang-parser-api/src/main/java/module-info.java
+++ b/parser/yang-parser-api/src/main/java/module-info.java
@@ -12,7 +12,6 @@ module org.opendaylight.yangtools.yang.parser.api {
     requires transitive org.opendaylight.yangtools.concepts;
     requires transitive org.opendaylight.yangtools.yang.common;
     requires transitive org.opendaylight.yangtools.yang.model.api;
-    requires transitive org.opendaylight.yangtools.yang.repo.api;
 
     // Annotations
     requires static transitive org.eclipse.jdt.annotation;
diff --git a/parser/yang-parser-impl/pom.xml b/parser/yang-parser-impl/pom.xml
index 4dcf8bc088..8c234a6238 100644
--- a/parser/yang-parser-impl/pom.xml
+++ b/parser/yang-parser-impl/pom.xml
@@ -51,10 +51,18 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-ir</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-api</artifactId>
diff --git a/parser/yang-parser-reactor/pom.xml b/parser/yang-parser-reactor/pom.xml
index 4286f3bcf6..e2006c21da 100644
--- a/parser/yang-parser-reactor/pom.xml
+++ b/parser/yang-parser-reactor/pom.xml
@@ -50,9 +50,5 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-repo-api</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/parser/yang-parser-reactor/src/main/java/module-info.java b/parser/yang-parser-reactor/src/main/java/module-info.java
index 579fc4db64..d6f6620946 100644
--- a/parser/yang-parser-reactor/src/main/java/module-info.java
+++ b/parser/yang-parser-reactor/src/main/java/module-info.java
@@ -15,7 +15,6 @@ module org.opendaylight.yangtools.yang.parser.reactor {
     requires transitive org.opendaylight.yangtools.yang.model.spi;
     requires transitive org.opendaylight.yangtools.yang.parser.api;
     requires transitive org.opendaylight.yangtools.yang.parser.spi;
-    requires transitive org.opendaylight.yangtools.yang.repo.api;
     requires org.slf4j;
 
     // Annotations
diff --git a/parser/yang-parser-spi/pom.xml b/parser/yang-parser-spi/pom.xml
index 71927a9bca..394b21ce54 100644
--- a/parser/yang-parser-spi/pom.xml
+++ b/parser/yang-parser-spi/pom.xml
@@ -51,10 +51,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-repo-api</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
diff --git a/parser/yang-parser-spi/src/main/java/module-info.java b/parser/yang-parser-spi/src/main/java/module-info.java
index cc4b0fe485..5f68bfc045 100644
--- a/parser/yang-parser-spi/src/main/java/module-info.java
+++ b/parser/yang-parser-spi/src/main/java/module-info.java
@@ -16,7 +16,6 @@ module org.opendaylight.yangtools.yang.parser.spi {
     requires transitive org.opendaylight.yangtools.yang.common;
     requires transitive org.opendaylight.yangtools.yang.model.api;
     requires transitive org.opendaylight.yangtools.yang.parser.api;
-    requires transitive org.opendaylight.yangtools.yang.repo.api;
     requires org.slf4j;
 
     // Annotations
diff --git a/parser/yang-test-util/pom.xml b/parser/yang-test-util/pom.xml
index ac1be1d3b4..02ac184897 100644
--- a/parser/yang-test-util/pom.xml
+++ b/parser/yang-test-util/pom.xml
@@ -45,11 +45,11 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-parser-api</artifactId>
+            <artifactId>yang-model-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-repo-api</artifactId>
+            <artifactId>yang-parser-api</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 dcd9fffc74..1b92e979af 100644
--- a/plugin/plugin-generator-api/pom.xml
+++ b/plugin/plugin-generator-api/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-repo-api</artifactId>
+            <artifactId>yang-model-spi</artifactId>
         </dependency>
 
         <dependency>
diff --git a/plugin/yang-maven-plugin/pom.xml b/plugin/yang-maven-plugin/pom.xml
index bd7e579741..20e08f21cc 100644
--- a/plugin/yang-maven-plugin/pom.xml
+++ b/plugin/yang-maven-plugin/pom.xml
@@ -113,15 +113,15 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-parser-api</artifactId>
+            <artifactId>yang-model-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-parser-rfc7950</artifactId>
+            <artifactId>yang-parser-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-repo-api</artifactId>
+            <artifactId>yang-parser-rfc7950</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sonatype.plexus</groupId>
diff --git a/yang/yang-repo-api/pom.xml b/yang/yang-repo-api/pom.xml
index 3685aa3273..4314e859e7 100644
--- a/yang/yang-repo-api/pom.xml
+++ b/yang/yang-repo-api/pom.xml
@@ -46,9 +46,5 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-model-spi</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/yang/yang-repo-api/src/main/java/module-info.java b/yang/yang-repo-api/src/main/java/module-info.java
index 436f2f463c..8617de349c 100644
--- a/yang/yang-repo-api/src/main/java/module-info.java
+++ b/yang/yang-repo-api/src/main/java/module-info.java
@@ -13,7 +13,6 @@ module org.opendaylight.yangtools.yang.repo.api {
     requires transitive org.opendaylight.yangtools.concepts;
     requires transitive org.opendaylight.yangtools.yang.common;
     requires transitive org.opendaylight.yangtools.yang.model.api;
-    requires transitive org.opendaylight.yangtools.yang.model.spi;
 
     requires org.opendaylight.yangtools.util;
     requires org.slf4j;
diff --git a/yang/yang-repo-fs/pom.xml b/yang/yang-repo-fs/pom.xml
index df482f55cd..74b53ea613 100644
--- a/yang/yang-repo-fs/pom.xml
+++ b/yang/yang-repo-fs/pom.xml
@@ -26,6 +26,10 @@
             <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>
@@ -34,6 +38,14 @@
             <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-model-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-repo-api</artifactId>
diff --git a/yang/yang-repo-fs/src/main/java/module-info.java b/yang/yang-repo-fs/src/main/java/module-info.java
index 05604378e4..e385296269 100644
--- a/yang/yang-repo-fs/src/main/java/module-info.java
+++ b/yang/yang-repo-fs/src/main/java/module-info.java
@@ -13,5 +13,6 @@ module org.opendaylight.yangtools.yang.model.repo.fs {
     requires transitive org.opendaylight.yangtools.yang.repo.spi;
     requires org.opendaylight.yangtools.util;
     requires org.opendaylight.yangtools.yang.common;
+    requires org.opendaylight.yangtools.yang.model.spi;
     requires org.slf4j;
 }
diff --git a/yang/yang-repo-spi/pom.xml b/yang/yang-repo-spi/pom.xml
index e4b4aacd14..4208a734b6 100644
--- a/yang/yang-repo-spi/pom.xml
+++ b/yang/yang-repo-spi/pom.xml
@@ -38,6 +38,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>util</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-repo-api</artifactId>
@@ -47,5 +51,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-spi</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
-- 
2.36.6