Remove features-flow from dependencies.

[integration/distribution.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 732d0d4a257ac5e5801ad0fc8ea5545127bc4321..7d88b463fec04e3ee58be3e7aa12ab5020a755fd 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../odlparent/odlparent</relativePath>
+    <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.integration</groupId>
@@ -38,9 +38,12 @@
     <feature.snbi.version>1.1.0-SNAPSHOT</feature.snbi.version>
     <feature.ttp.version>0.1.0-SNAPSHOT</feature.ttp.version>
     <feature.usc.version>1.0-SNAPSHOT</feature.usc.version>
+    <feature.capwap.version>0.1.0-SNAPSHOT</feature.capwap.version>
     <feature.vtn-manager.version>0.3.0-SNAPSHOT</feature.vtn-manager.version>
     <feature.bgpcep.version>0.4.0-SNAPSHOT</feature.bgpcep.version>
+<!--
     <feature.packetcable.version>1.2.0-SNAPSHOT</feature.packetcable.version>
+-->
     <feature.plugin2oc.version>0.2.0-SNAPSHOT</feature.plugin2oc.version>
     <feature.tcpmd5.version>1.1.0-SNAPSHOT</feature.tcpmd5.version>
     <feature.topoprocessing.version>0.0.1-SNAPSHOT</feature.topoprocessing.version>
@@ -50,6 +53,8 @@
     <enforcer.version>1.3.1</enforcer.version>
     <snmp.plugin.version>1.0-SNAPSHOT</snmp.plugin.version>
     <didm.version>0.1.0-SNAPSHOT</didm.version>
+    <feature.vpnservice.version>1.0-SNAPSHOT</feature.vpnservice.version>
+    <feature.lacp.version>1.0.0-SNAPSHOT</feature.lacp.version>
   </properties>
   <modules>
     <module>distributions/</module>
@@ -160,13 +165,6 @@
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>features-flow</artifactId>
-          <version>${feature.flow.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
         <!-- AD-SAL Related Features -->
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
@@ -258,7 +256,7 @@
           <type>xml</type>
         </dependency>
 
-        <!-- packetcable Related Features -->
+        <!-- packetcable Related Features
         <dependency>
            <groupId>org.opendaylight.packetcable</groupId>
            <artifactId>features-packetcable</artifactId>
@@ -266,6 +264,7 @@
            <classifier>features</classifier>
           <type>xml</type>
         </dependency>
+         -->
       </dependencies>
   </dependencyManagement>
   <build>