Merge "ClusterSingletonService cleaning FRM/FRS"

[openflowplugin.git] / samples / sample-consumer / pom.xml

diff --git a/samples/sample-consumer/pom.xml b/samples/sample-consumer/pom.xml
index 27223d784defb9df6296ba7c74ed359a6823f410..d6a688ff60ed654053dfc3af9e63e3f7dbd688a1 100644 (file)
--- a/samples/sample-consumer/pom.xml
+++ b/samples/sample-consumer/pom.xml
@@ -4,25 +4,19 @@
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
-        <version>0.0.1</version>
-        <relativePath>../../</relativePath>
+        <version>0.4.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <artifactId>sample-consumer</artifactId>
-    <version>0.0.1</version>
+    <version>0.4.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
-    <properties>
-        <yang.prototype.version>1.0</yang.prototype.version>
-    </properties>
-
-
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.6</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -40,20 +34,16 @@
     </build>
     <dependencies>
         <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-base</artifactId>
-            <groupId>org.opendaylight.controller.model</groupId>
         </dependency>
         <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-service</artifactId>
-            <groupId>org.opendaylight.controller.model</groupId>
         </dependency>
         <dependency>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
             <artifactId>model-flow-statistics</artifactId>
-            <groupId>org.opendaylight.controller.model</groupId>
-        </dependency>
-        <dependency>
-            <artifactId>model-flow-management</artifactId>
-            <groupId>org.opendaylight.controller.model</groupId>
         </dependency>
         <dependency>
             <artifactId>model-inventory</artifactId>
@@ -64,9 +54,12 @@
             <artifactId>sal-binding-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>0.6.1</version>
+        </dependency>
+        <dependency>
+          <groupId>org.osgi</groupId>
+          <artifactId>org.osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -76,7 +69,6 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
-            <version>${yang.prototype.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>