Do not pull in yang-parser-impl

Parser is used only in tests and only via test-utils,
hence this project should not be pulling it in.

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

diff --git a/binding/mdsal-binding-dom-codec/pom.xml b/binding/mdsal-binding-dom-codec/pom.xml
index 5bca8f9bd4d8c28cc6b0d1d2d0ae630ca8f7bb34..41b9ba2392a670fc3696a8910cd07513fe5f8831 100644 (file)
--- a/binding/mdsal-binding-dom-codec/pom.xml
+++ b/binding/mdsal-binding-dom-codec/pom.xml
@@ -50,10 +50,6 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-generator-impl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-parser-impl</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>

diff --git a/binding/mdsal-binding-generator-impl/pom.xml b/binding/mdsal-binding-generator-impl/pom.xml
index 5f1767b4978797bded099e977913e8238ffaf981..17b3db4b1b10b7c0098db2d89b969cd799f331d4 100644 (file)
--- a/binding/mdsal-binding-generator-impl/pom.xml
+++ b/binding/mdsal-binding-generator-impl/pom.xml
@@ -59,6 +59,10 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-generator-util</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-parser-impl</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>junit</groupId>

diff --git a/binding/mdsal-binding-generator-util/pom.xml b/binding/mdsal-binding-generator-util/pom.xml
index 04828554265c133375de677276f5d3f4247a93be..f70183ea4774cf61a7e790111f5411aa3fc4f526 100644 (file)
--- a/binding/mdsal-binding-generator-util/pom.xml
+++ b/binding/mdsal-binding-generator-util/pom.xml
@@ -43,20 +43,20 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-generator-api</artifactId>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-model-api</artifactId>
+            <artifactId>yang-model-util</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>yang-binding</artifactId>
+            <artifactId>mdsal-binding-generator-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-parser-impl</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>yang-binding</artifactId>
         </dependency>
 
         <dependency>

diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BindingGeneratorUtilTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BindingGeneratorUtilTest.java
index 099eea05a8001ec02edf7517a441518f3c0ff3ef..318fd4efca12847670cf19930038e6d1aefbfcb6 100644 (file)
--- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BindingGeneratorUtilTest.java
+++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/generator/util/BindingGeneratorUtilTest.java
@@ -19,7 +19,6 @@ import static org.mockito.Mockito.mock;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import java.io.File;
-import java.io.IOException;
 import java.io.Serializable;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
@@ -48,8 +47,6 @@ import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
 import org.opendaylight.yangtools.yang.model.util.type.DerivedTypes;
 import org.opendaylight.yangtools.yang.model.util.type.RestrictedTypes;
 import org.opendaylight.yangtools.yang.model.util.type.StringTypeBuilder;
-import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
-import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public class BindingGeneratorUtilTest {
@@ -80,11 +77,9 @@ public class BindingGeneratorUtilTest {
      * </ul>
      * <li>packageNameForTypeDefinition</li> <li>moduleNamespaceToPackageName</li>
      * - without revision </ul>
-     * @throws ReactorException Reactor exception
-     * @throws SourceException Source exception
      */
     @Test
-    public void testBindingGeneratorUtilMethods() throws IOException, SourceException, ReactorException {
+    public void testBindingGeneratorUtilMethods() throws Exception {
         List<File> testModels = loadTestResources("/module.yang");
 
         final Set<Module> modules = YangParserTestUtils.parseYangSources(testModels).getModules();