Cleanup dependencies

The movement of {Yin,Yang}TextSource has implications on dependencies,
clean them up.

JIRA: YANGTOOLS-1561
Change-Id: I4bdc5522b8a4135352a8de494f36ecbf3a11531d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/plugin/plugin-generator-api/pom.xml b/plugin/plugin-generator-api/pom.xml
index dcd59024b63c4b65a40bdc08a161fcacc6c58518..d846ebe3c855817e4575cb604628f2de5124b5f6 100644 (file)
--- a/plugin/plugin-generator-api/pom.xml
+++ b/plugin/plugin-generator-api/pom.xml
@@ -38,10 +38,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.kohsuke.metainf-services</groupId>

diff --git a/plugin/plugin-generator-api/src/main/java/module-info.java b/plugin/plugin-generator-api/src/main/java/module-info.java
index 9d83c314d57defb5046fa459802fdfe0cb5587f6..fa9aab74218d9ab2e45e4871fe9528b978fa963a 100644 (file)
--- a/plugin/plugin-generator-api/src/main/java/module-info.java
+++ b/plugin/plugin-generator-api/src/main/java/module-info.java
@@ -10,7 +10,6 @@ module org.opendaylight.yangtools.plugin.generator.api {
 
     requires transitive com.google.common;
     requires transitive org.opendaylight.yangtools.yang.model.api;
-    requires transitive org.opendaylight.yangtools.yang.model.spi;
     requires transitive org.opendaylight.yangtools.concepts;
 
     // Annotations

diff --git a/tools/yang-validation-tool/pom.xml b/tools/yang-validation-tool/pom.xml
index b5519b63c43525cacd645048cd7feb743f92c710..fd6d5cfc02b57aa6a49630f358e1e4ea3908bca7 100644 (file)
--- a/tools/yang-validation-tool/pom.xml
+++ b/tools/yang-validation-tool/pom.xml
@@ -34,25 +34,25 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-test-util</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.argparse4j</groupId>
             <artifactId>argparse4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-test-util</artifactId>
             <scope>compile</scope>
         </dependency>
     </dependencies>