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

diff --git a/pom.xml b/pom.xml
index 11bb68f..0a11e34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,17 +1,24 @@
 <?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.controller</groupId>
-		<artifactId>sal-parent</artifactId>
-		<version>1.1-SNAPSHOT</version>
-	</parent>
-
-	<groupId>org.opendaylight.packetcable</groupId>
-	<artifactId>packetcable</artifactId>
-	<packaging>pom</packaging>
-
-   <distributionManagement>
+<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.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.5.0-SNAPSHOT</openflowplugin.version>
+        <controller.model.version>1.6.0-SNAPSHOT</controller.model.version>
+    </properties>
+    <distributionManagement>
         <!-- OpenDayLight Released artifact -->
         <repository>
             <id>opendaylight-release</id>
@@ -24,116 +31,61 @@
         </snapshotRepository>
     </distributionManagement>
 
-	<modules>
-		<module>packetcable-driver</module>
-		<module>packetcable-model</module>
-		<module>packetcable-consumer</module>
-		<module>packetcable-provider</module>
-                <module>features-packetcable</module>
-        </modules>
-	<scm>
-		<connection>scm:git:ssh://git.opendaylight.org:29418/packetcable.git</connection>
-		<developerConnection>scm:git:ssh://git.opendaylight.org:29418/packetcable.git</developerConnection>
-		<tag>HEAD</tag>
-		<url>https://wiki.opendaylight.org/view/PacketCablePCMM:Main</url>
-	</scm>
-	
-	
-	<dependencies>
-		<dependency>
-			<groupId>org.opendaylight.controller.model</groupId>
-			<artifactId>model-flow-base</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.opendaylight.controller.model</groupId>
-			<artifactId>model-flow-service</artifactId>
-		</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>
-		</dependency>
-	</dependencies>
-	<build>
-	<plugins>
-	 <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-        </plugin>
-        </plugins>
-        </build>
-
-
-<!-- 	<profiles> -->
-<!-- 		<profile> -->
-<!-- 			<id>integrationtests</id> -->
-<!-- 			<activation> -->
-<!-- 				<activeByDefault>false</activeByDefault> -->
-<!-- 			</activation> -->
-<!-- 			<modules> -->
-<!-- 				<module>packetcable-it</module> -->
-<!-- 			</modules> -->
-<!-- 		</profile> -->
-<!-- 	</profiles> -->
-	
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>opendaylight-central</id>
-            <name>opendaylight-central</name>
-            <url>${nexusproxy}/repositories/public</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>opendaylight-snapshot</id>
-            <name>central2</name>
-            <url>${nexusproxy}/repositories/opendaylight.snapshot</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </pluginRepository>
-    </pluginRepositories>
-    <repositories>
-		<!-- OpenDaylight releases -->
-        <repository>
-            <id>opendaylight-snapshot</id>
-            <name>opendaylight-snapshot</name>
-            <url>${nexusproxy}/repositories/opendaylight.snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-        <repository>
-            <id>public</id>
-            <name>public</name>
-            <url>${nexusproxy}/groups/public</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-
-
-
-
+    <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 -->
+        <module>packetcable-policy-model</module>
+        <module>packetcable-policy-server</module>
+        <module>features-packetcable-policy</module>
+        <module>packetcable-policy-karaf</module>
+        <!-- Jar module CMTS emulator for testing -->
+        <module>packetcable-emulator</module>
+    </modules>
+    <scm>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/packetcable.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/packetcable.git</developerConnection>
+        <tag>HEAD</tag>
+        <url>https://wiki.opendaylight.org/view/PacketCablePCMM:Main</url>
+    </scm>
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-base</artifactId>
+            <version>${openflowplugin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-service</artifactId>
+            <version>${openflowplugin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller.model</groupId>
+            <artifactId>model-inventory</artifactId>
+            <version>${controller.model.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-statistics</artifactId>
+            <version>${openflowplugin.version}</version>
+        </dependency>
+    </dependencies>
 </project>