X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=0a11e345052a7c8d5d3164e1eb0948ad8d4c977a;hb=5a9c951f51ecd05b0192ade978616b118e8872ca;hp=b14e5e14bf27d7d82c8f685c09a267cde6a0064b;hpb=a06a930e945e767e04f20486711a666d86d85e4c;p=packetcable.git

diff --git a/pom.xml b/pom.xml
index b14e5e1..0a11e34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,18 +2,21 @@
 <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>
+    <!-- FIXME: Do not use sal-parent, use odlparent:odlparent or mdsal:binding-parent intstead. -->
     <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal-parent</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath />
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent</artifactId>
+        <version>2.0.0</version>
+        <relativePath/>
     </parent>
     <groupId>org.opendaylight.packetcable</groupId>
     <artifactId>packetcable</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
     <name>packetcable</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
     <properties>
-        <openflowplugin.version>0.2.0-SNAPSHOT</openflowplugin.version>
+        <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
+        <controller.model.version>1.6.0-SNAPSHOT</controller.model.version>
     </properties>
     <distributionManagement>
         <!-- OpenDayLight Released artifact -->
@@ -27,6 +30,26 @@
             <url>${nexusproxy}/repositories/opendaylight.snapshot</url>
         </snapshotRepository>
     </distributionManagement>
+
+    <dependencyManagement>
+      <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-artifacts</artifactId>
+            <version>2.3.0-SNAPSHOT</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>mdsal-model-artifacts</artifactId>
+            <version>0.11.0-SNAPSHOT</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+      </dependencies>
+    </dependencyManagement>
+
     <modules>
         <module>packetcable-driver</module>
         <!-- New modules for the new Arris API -->
@@ -54,21 +77,10 @@
             <artifactId>model-flow-service</artifactId>
             <version>${openflowplugin.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>ietf-inet-types</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>ietf-yang-types</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-inventory</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>opendaylight-l2-types</artifactId>
+            <version>${controller.model.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.model</groupId>
@@ -76,14 +88,4 @@
             <version>${openflowplugin.version}</version>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>