Clean up yang-repo-fs dependencies

Update module requires and pom.xml to spell out things we actually use.

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

diff --git a/yang/yang-repo-fs/pom.xml b/yang/yang-repo-fs/pom.xml
index d0c822bcaecb6dcc2b9c359f4b92ed20b3dae504..f81c945c3b74a31acfd3b179ea537729e09fc96f 100644 (file)
--- a/yang/yang-repo-fs/pom.xml
+++ b/yang/yang-repo-fs/pom.xml
@@ -22,9 +22,17 @@
     <description>${project.artifactId}</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-model-api</artifactId>
+            <artifactId>util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -40,6 +48,16 @@
             <artifactId>mockito-configuration</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-parser-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-parser-rfc7950</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-test-util</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 069107a7704ace67e37aaafc07ec3a1e1f9cc59a..05604378e400fc05109b6ee10960ad475094875e 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,6 +13,5 @@ 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.api;
     requires org.slf4j;
 }