X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=8c100ea8e749a7371907ec9dd50ee8cb395f6889;hb=922ebccb9435eb0d476f758a94b9b46516be6cef;hp=e669b698928b2428b225b621d228d36509c8cb3a;hpb=84afc03f38c7b7c9b98e157a42b95e2f67840663;p=packetcable.git

diff --git a/pom.xml b/pom.xml
index e669b69..8c100ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,18 +1,22 @@
 <?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.2.0-SNAPSHOT</version>
-	</parent>
-
-	<groupId>org.opendaylight.packetcable</groupId>
-	<artifactId>packetcable</artifactId>
-	<packaging>pom</packaging>
-
-   <distributionManagement>
+    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 />
+    </parent>
+    <groupId>org.opendaylight.packetcable</groupId>
+    <artifactId>packetcable</artifactId>
+    <name>packetcable</name> <!-- Used by Sonar to set project name -->
+    <packaging>pom</packaging>
+    <properties>
+        <openflowplugin.version>0.2.0-SNAPSHOT</openflowplugin.version>
+    </properties>
+    <distributionManagement>
         <!-- OpenDayLight Released artifact -->
         <repository>
             <id>opendaylight-release</id>
@@ -25,121 +29,82 @@
         </snapshotRepository>
     </distributionManagement>
 
-	<modules>
-		<module>packetcable-driver</module>
-		<module>packetcable-model</module>
-		<module>packetcable-provider</module>
-		<module>packetcable-consumer</module>
-		<module>features-packetcable</module>
-		<module>packetcable-config</module>
-		<module>packetcable-karaf</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>
-	<repositories>
-		<!-- OpenDaylight releases -->
-		<repository>
-			<id>opendaylight-mirror</id>
-			<name>opendaylight-mirror</name>
-			<url>http://nexus.opendaylight.org/content/groups/public/</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-		</repository>
-		<!-- OpenDaylight snapshots -->
-		<repository>
-			<id>opendaylight-snapshot</id>
-			<name>opendaylight-snapshot</name>
-			<url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</repository>
-	</repositories>
-	<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>
-		<dependency>
-			<groupId>org.opendaylight.controller.model</groupId>
-			<artifactId>model-flow-statistics</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>
-
+    <dependencyManagement>
+      <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-artifacts</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>mdsal-model-artifacts</artifactId>
+            <version>0.8.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.mdsal.model</groupId>
+            <artifactId>ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>ietf-yang-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller.model</groupId>
+            <artifactId>model-inventory</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>opendaylight-l2-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-statistics</artifactId>
+            <version>${openflowplugin.version}</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>