X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fpom.xml;h=fd0ff8789975f6104367e68b938da70bbb63f181;hb=661f8b5325e29691af54aa0994362d4f20345ca0;hp=e85dcea5750b73a3b8050142460d2d164bb59edd;hpb=3d1afacef2f17d057e995de56d28d629bb7e42c8;p=netvirt.git

diff --git a/features/pom.xml b/features/pom.xml
index e85dcea575..fd0ff87899 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -14,14 +14,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.ovsdb</groupId>
   <artifactId>features-ovsdb</artifactId>
-  <version>1.2.1-SNAPSHOT</version>
-  <packaging>pom</packaging>
+  <version>1.3.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
   <description>The OVSDB Plugin integration project is a project for OpenDaylight that will implement the Open vSwitch Database RFC 7047 management protocol allowing the Southbound configuration of vSwitches and a network virtualization implementation.</description>
   <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
   <licenses>
@@ -45,14 +45,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   </scm>
 
   <properties>
-    <odl.karaf.base.version>1.6.0-SNAPSHOT</odl.karaf.base.version>
-    <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
-    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
-    <restconf.version>1.3.0-SNAPSHOT</restconf.version>
-    <neutron.version>0.6.0-SNAPSHOT</neutron.version>
-    <openflowplugin.version>0.2.0-SNAPSHOT</openflowplugin.version>
-    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
-    <dlux.version>0.3.0-SNAPSHOT</dlux.version>
+    <odl.karaf.base.version>1.7.0-SNAPSHOT</odl.karaf.base.version>
+    <controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
+    <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
+    <restconf.version>1.4.0-SNAPSHOT</restconf.version>
+    <neutron.version>0.7.0-SNAPSHOT</neutron.version>
+    <openflowplugin.version>0.3.0-SNAPSHOT</openflowplugin.version>
+    <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
+    <dlux.version>0.4.0-SNAPSHOT</dlux.version>
   </properties>
 
   <dependencyManagement>
@@ -67,7 +67,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -129,6 +129,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
@@ -157,54 +161,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>io.netty</groupId>
       <artifactId>netty-transport</artifactId>
     </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>javax.servlet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>javax.servlet.jsp</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.apache.felix.gogo.command</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.apache.felix.gogo.runtime</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.apache.felix.gogo.shell</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.eclipse.equinox.cm</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.eclipse.equinox.console</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.eclipse.equinox.ds</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.eclipse.equinox.launcher</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.eclipse.equinox.util</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.eclipse.osgi.services</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
@@ -216,11 +172,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${neutron.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
-    </dependency>
-     <dependency>
-      <groupId>org.opendaylight.neutron</groupId>
-      <artifactId>dummyprovider</artifactId>
-      <version>${neutron.version}</version>
     </dependency>
     <!-- openflowplugin dependencies -->
     <dependency>
@@ -237,6 +188,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+
+    <!-- openflowplugin dependencies for net-virt clustering-->
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin-li</artifactId>
+      <version>${openflowplugin.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin-extension-li</artifactId>
+      <version>${openflowplugin.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+
     <!-- project specific dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -311,6 +279,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>hwgw</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>hwgw</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>hwvtepsouthbound-features</artifactId>
@@ -318,6 +293,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>neutron</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>neutron</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
     <!-- DLUX dependency for the UI -->
     <dependency>
       <groupId>org.opendaylight.dlux</groupId>