X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fcommons%2Fopendaylight%2Fpom.xml;h=38d9ac2ce103ea8e98f76d06786f1585f9a1af3f;hb=678b2e0c2cf9f7b149bad013bcce5845fd521ebf;hp=c97a10243fb11ef96e3c5c8555d97eb574def6dc;hpb=f3636c112694d6327ead720cf243bf025a464430;p=controller.git

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index c97a10243f..38d9ac2ce1 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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.odlparent</groupId>
     <artifactId>odlparent</artifactId>
@@ -10,11 +11,9 @@
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.opendaylight</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
-    <mdsal.version>2.1.0-SNAPSHOT</mdsal.version>
     <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
     <appauth.version>0.7.0-SNAPSHOT</appauth.version>
     <archetype-app-northbound>0.3.0-SNAPSHOT</archetype-app-northbound>
@@ -81,18 +80,22 @@
     <hosttracker_new.api.version>0.7.0-SNAPSHOT</hosttracker_new.api.version>
     <hosttracker_new.implementation.version>0.7.0-SNAPSHOT</hosttracker_new.implementation.version>
     <httpservice-bridge.northbound.version>0.3.0-SNAPSHOT</httpservice-bridge.northbound.version>
-    <ietf-inet-types.version>2010.09.24.9-SNAPSHOT</ietf-inet-types.version>
+    <ietf-inet-types.version>1.1.0-SNAPSHOT</ietf-inet-types.version>
     <ietf-restconf.version>2013.10.19.9-SNAPSHOT</ietf-restconf.version>
     <ietf-topology.version>2013.10.21.9-SNAPSHOT</ietf-topology.version>
-    <ietf-yang-types.version>2010.09.24.9-SNAPSHOT</ietf-yang-types.version>
+    <ietf-yang-types.version>2013.07.15.9-SNAPSHOT</ietf-yang-types.version>
     <jdepend.maven.plugin.version>2.0-beta-2</jdepend.maven.plugin.version>
+
+    <!-- Path prefix where we generate configuration subsystem bindings -->
     <jmxGeneratorPath>target/generated-sources/config-binding</jmxGeneratorPath>
+
     <jolokia-bridge.version>0.3.0-SNAPSHOT</jolokia-bridge.version>
-    <karaf.branding.version>1.3.0-SNAPSHOT</karaf.branding.version>
+    <karaf.branding.version>1.7.0-SNAPSHOT</karaf.branding.version>
     <karaf.shell.version>${karaf.version}</karaf.shell.version>
     <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
     <logging.bridge.version>0.7.0-SNAPSHOT</logging.bridge.version>
     <maven.plugin.api.version>3.0.5</maven.plugin.api.version>
+    <!-- mdsal version for controller, not mdsal -->
     <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
     <networkconfig.bridgedomain.northbound.version>0.3.0-SNAPSHOT</networkconfig.bridgedomain.northbound.version>
     <!-- ODL repository / plugin repository -->
@@ -110,7 +113,11 @@
     <sal.implementation.version>0.7.0-SNAPSHOT</sal.implementation.version>
     <sal.networkconfiguration.version>0.3.0-SNAPSHOT</sal.networkconfiguration.version>
     <sal.version>0.11.0-SNAPSHOT</sal.version>
-    <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
+
+    <!-- Path prefix where we generate YANG Java Bindings. This really should be inherited
+         from mdsal's binding-parent -->
+    <salGeneratorPath>target/generated-sources/mdsal-binding</salGeneratorPath>
+
     <samples.loadbalancer>0.8.0-SNAPSHOT</samples.loadbalancer>
     <samples.loadbalancer.northbound.version>0.7.0-SNAPSHOT</samples.loadbalancer.northbound.version>
     <samples.simpleforwarding.version>0.7.0-SNAPSHOT</samples.simpleforwarding.version>
@@ -435,7 +442,7 @@
       </dependency>
       <!-- Karaf Dependencies -->
       <dependency>
-        <groupId>org.opendaylight.controller</groupId>
+        <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf.branding</artifactId>
         <version>${karaf.branding.version}</version>
       </dependency>
@@ -913,19 +920,6 @@
                     </execute>
                   </action>
                 </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <versionRange>[2.0,)</versionRange>
-                    <goals>
-                      <goal>check</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore></ignore>
-                  </action>
-                </pluginExecution>
                 <pluginExecution>
                   <pluginExecutionFilter>
                     <groupId>org.opendaylight.yangtools</groupId>
@@ -1196,6 +1190,7 @@
       </plugin>
     </plugins>
   </reporting>
+
   <scm>
     <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>