X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=pom.xml;h=5ea7eefc5ae15dfe1d5c04f2e40d1966d36f5d08;hb=6fd43c68d7255bf8e16491a68e4e6cea2905d629;hp=7e27b02b632e7749c1e279e0f1a60da494060bb1;hpb=66beb69a9032219c6cbee621071111e555982381;p=packetcable.git

diff --git a/pom.xml b/pom.xml
index 7e27b02..5ea7eef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,16 +1,23 @@
 <?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">
+<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>
+		<version>1.2.0-SNAPSHOT</version>
+        <relativePath/>
 	</parent>
 
 	<groupId>org.opendaylight.packetcable</groupId>
-	<artifactId>packetcable-parent</artifactId>
+	<artifactId>packetcable</artifactId>
+	<name>packetcable</name> <!-- Used by Sonar to set project name -->
 	<packaging>pom</packaging>
 
+    <properties>
+      <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
+    </properties>
+
    <distributionManagement>
         <!-- OpenDayLight Released artifact -->
         <repository>
@@ -27,51 +34,28 @@
 	<modules>
 		<module>packetcable-driver</module>
 		<module>packetcable-model</module>
-		<module>packetcable-consumer</module>
 		<module>packetcable-provider</module>
-                <module>features-packetcable</module>
-        </modules>
+		<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>
+			<groupId>org.opendaylight.openflowplugin.model</groupId>
 			<artifactId>model-flow-base</artifactId>
+            <version>${openflowplugin.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.opendaylight.controller.model</groupId>
+			<groupId>org.opendaylight.openflowplugin.model</groupId>
 			<artifactId>model-flow-service</artifactId>
+            <version>${openflowplugin.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.opendaylight.yangtools.model</groupId>
@@ -89,28 +73,33 @@
 			<groupId>org.opendaylight.yangtools.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>
+		<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> -->
+	<!-- <profiles> -->
+	<!-- <profile> -->
+	<!-- <id>integrationtests</id> -->
+	<!-- <activation> -->
+	<!-- <activeByDefault>false</activeByDefault> -->
+	<!-- </activation> -->
+	<!-- <modules> -->
+	<!-- <module>packetcable-it</module> -->
+	<!-- </modules> -->
+	<!-- </profile> -->
+	<!-- </profiles> -->
 </project>