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>

diff --git a/codec/yang-data-codec-gson/pom.xml b/codec/yang-data-codec-gson/pom.xml
index 7f1ffb4690db8ea81b461ad4264c6a51f48042f1..e9098b283462cece35d43d93c9fde4e096f611de 100644 (file)
--- 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 63146b474ef05e8f69ebe37c09ad1b497ab17d04..b86e832e0d3240f396499678265eb5a5f996fbf1 100644 (file)
--- 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 177ce87464e1315adab3829787eee342ae13ace4..55f01a1fa2fd460a180c3a4d6a001548272db341 100644 (file)
--- 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 22ce61bce7b2bc8952abbe00308a8ec23a20b36d..bf9956e4812850601b0403de06b566fa1ff6ae79 100644 (file)
--- 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 aebf404fecece5c9b5bffdde1ae2e2686a297aa1..639a94eb01d83ef73432d1ab25851c6a532b4d9e 100644 (file)
--- 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 e35cee0ca1607d6cdff2d3e2baa81950a0aaf64f..0771e139b9cbf8d9ddda55685f88a02716a1ab32 100644 (file)
--- 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 d4b6eba624e184d62c8ddb73d0ce267d33d58c8f..61bb5af0215f35bf6c59078a377261aeffbc3c8c 100644 (file)
--- 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 b57acd49b6d497ce84e9ae00f2dd5a786f6ebe9b..382d492ca838aa6b93636e380cf5f731579d0a52 100644 (file)
--- 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 95ce8520d93f2d39f9aef534e979e62acfd30217..3b85816df5df35179d7f4d5a9936c1de07c698c6 100644 (file)
--- 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 24d192cc0924171dd554e726a2f961f5a3172d02..e5b8454633e315498f0cf7915c111fdfd487e98c 100644 (file)
--- 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 8c19fa8eec0f023d3bb12c651d373cc8d31e2f15..d6bdf651fe18de7717c0af1008f94f5f8fc446c6 100644 (file)
--- 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 e81a4ae04c261c4735cfaedadd0efb6b81b102ec..77727955df8c150e9ac7fdeb600f4340aea61ceb 100644 (file)
--- 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 5689d8febd4f3eadc419eadfa17e3ff9a5b9555c..9462c822c4a851f3934c6bd443905fe68973e5f7 100644 (file)
--- 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 e43de6facfca564f33d8603bb47fdec169ce48d4..f18d3730165f33e8742230575208aab10dda37ec 100644 (file)
--- 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 30214687a20d44c62aecad49ff00a9303448aea6..817f20fd82a5d4a703496539a7130da750efdc3f 100644 (file)
--- 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 b6d74e5bbe17b92413219e6a2047141a237380d1..77409976a53187cb35ec314c30806f5bff010894 100644 (file)
--- 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 9a69580d3dbd5caa3c2fdaa888187a54567323c2..86f5abe72d50c3c1e04fb80a2e4bb00ac3ca389d 100644 (file)
--- 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 85d4f258694d2c3f382551db9ed4f2adcd62371c..89bd6a42a2c9a6c0f92496742d68f66de43a7cf0 100644 (file)
--- 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 de9282a11bb684071596f79dcbb79c542f631086..9cbf8027361ebfbe24fe00399ee53f571735f9d1 100644 (file)
--- 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 7e611322f049a2849bb0510c6d60028d03eb36a3..24cbd66b9c83b92a8dc1d86eb4f16c4ddb55e991 100644 (file)
--- 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 cd8bd27f863c7241f04afec2f56ffa867c83728b..b327dd045691c81234e8ccf63b1c6f3de926b70b 100644 (file)
--- 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 97796f9a11a26b0e0dc7020dde7e4c22abad2f2f..b73170cd7dc96348daa811a5bf89ef48803a197e 100644 (file)
--- 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 4dcf8bc088a0b091b0cb3ab2011008bc65970fcb..8c234a623887d294286fc951edd84a4bb1f37216 100644 (file)
--- 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 4286f3bcf6288adf0794085e68913f5d78ab6c1e..e2006c21da0904c5265b6a11641decd4546e2159 100644 (file)
--- 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 579fc4db64be4cf77d29ce45c1d1f7e1739eaff6..d6f6620946715e9956ac150437f5762621b3b2ea 100644 (file)
--- 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 71927a9bca77ecbbf954270e8ed6bd11f11fc644..394b21ce54914235efc2e83aef65ae55fd1eafd6 100644 (file)
--- 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 cc4b0fe48564f483a7dd3c734dc2c2e84739cf40..5f68bfc045789b36469209aba82dbe1707b227a7 100644 (file)
--- 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 ac1be1d3b4c671b5e17faceaad93407e8374a7fc..02ac184897bc35833c33629ff1feb3f60f89f91d 100644 (file)
--- 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 dcd9fffc74d1a9267e15e09edba8b396355c8311..1b92e979afd31d16cbf0c071fc51119810e36fe3 100644 (file)
--- 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 bd7e57974183c33909b7d295d454d16d039ecbf6..20e08f21cc469e5bb4f18b845ea93e1cf5ddf65f 100644 (file)
--- 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 3685aa327316b87ecac028345adb957bcafc5231..4314e859e781f1d6627a73cfe6aef6ad7b8d3745 100644 (file)
--- 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 436f2f463ca393c0fb02c4101cb68f27dd813710..8617de349c61cf742fe616f5f4fbd3173bc27f0a 100644 (file)
--- 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 df482f55cd345fa192e211afeedc31c40f72e81e..74b53ea613a59a9d358420dae67ca3dab4f855da 100644 (file)
--- 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 05604378e400fc05109b6ee10960ad475094875e..e3852962694ad3b4f050918103e6dcd2acaf359f 100644 (file)
--- 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 e4b4aacd143570ad3ac14ca6d5ad777a5f5f5723..4208a734b6fe0b2a9e3f154c58a9f4480fef0abf 100644 (file)
--- 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>