Minor fix in flow IP Matching

[controller.git] / opendaylight / md-sal / pom.xml

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index d383162748b327a8dc794621099f3b282caaf126..17797dd56c414013fd5de28c5b37ec17e68a118f 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -1,6 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>commons.opendaylight</artifactId>
+        <version>1.4.1-SNAPSHOT</version>
+        <relativePath>../commons/opendaylight</relativePath>
+    </parent>
+
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
@@ -104,7 +112,7 @@
 
         <!-- Dependency Versions -->
         <slf4j.version>1.7.2</slf4j.version>
-        <yang.codegen.version>0.6.0-SNAPSHOT</yang.codegen.version>
+       <yang.codegen.version>${yangtools.version}</yang.codegen.version>
         <guava.version>14.0.1</guava.version>
         <osgi.core.version>5.0.0</osgi.core.version>
         <junit.version>4.8.1</junit.version>
@@ -300,12 +308,12 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-generator-impl</artifactId>
-                <version>0.6.0-SNAPSHOT</version>
+               <version>${yangtools.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-parser-impl</artifactId>
-                <version>0.6.0-SNAPSHOT</version>
+               <version>${yangtools.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -470,6 +478,17 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <!-- FIXME: BUG-272: remove this configuration override -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>${checkstyle.version}</version>
+                <executions>
+                  <execution>
+                    <phase>none</phase>
+                  </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <reporting>