Cleanup run-time dependencies

We should not depend on yang-parser-impl, but rather the model-api/util
packages. The yang-parser-impl dependency has only test scope.

Change-Id: I223bfd831e8ee77757a83f6f532c67a8374f9e7c
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml
index a4e2ef8a82d9688e664e5f7b32e1772b4f721cd3..013bbcc357a2b9974c5915c0705c698172c88b9b 100644 (file)
--- a/yang/yang-data-impl/pom.xml
+++ b/yang/yang-data-impl/pom.xml
@@ -62,17 +62,15 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>yang-binding</artifactId>
+            <artifactId>yang-model-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>yang-parser-impl</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
+            <artifactId>yang-model-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -107,10 +105,15 @@
             <version>1.5</version>
             <scope>test</scope>
         </dependency>
-      <dependency>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
-        <version>2.6</version>
-      </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>yang-parser-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
     </dependencies>
 </project>

diff --git a/yang/yang-data-json/pom.xml b/yang/yang-data-json/pom.xml
index e75f05ffaa3a9c6e553ce98c735f21f67d1af6f5..9327cf847d9922f6e8971ce452232ae08067661b 100644 (file)
--- a/yang/yang-data-json/pom.xml
+++ b/yang/yang-data-json/pom.xml
@@ -36,6 +36,11 @@
           <artifactId>junit</artifactId>
           <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>yang-parser-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>