Merge "Make MD-SAL use opendaylight parent"
authorGiovanni Meo <gmeo@cisco.com>
Fri, 24 Jan 2014 15:17:26 +0000 (15:17 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 24 Jan 2014 15:17:26 +0000 (15:17 +0000)
1  2 
opendaylight/md-sal/pom.xml

index d56259daf8aeb6ddfa1c9869b24081a6e525f8ae,d2bb92f63aa01217ed68751fdc6075b96606e39d..17797dd56c414013fd5de28c5b37ec17e68a118f
@@@ -1,6 -1,14 +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>
  
          <!-- 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>
              <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>
                      </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>