X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fpom.xml;h=68f37ab3ee8bd392fbceeef183cec1c60f06cf01;hb=f145ef664ce4d617ac836d1f95ba37e4bfb50ccf;hp=4fd4b2c9999fd7ae6bd50780f0c5eaa722a96bb9;hpb=5eaaaddffa1676af062d85b527995e01236c062e;p=netvirt.git

diff --git a/features/pom.xml b/features/pom.xml
index 4fd4b2c999..68f37ab3ee 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -18,10 +18,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <relativePath/>
   </parent>
 
-  <groupId>org.opendaylight.ovsdb</groupId>
-  <artifactId>features-ovsdb</artifactId>
+  <groupId>org.opendaylight.netvirt</groupId>
+  <artifactId>features-netvirt</artifactId>
   <version>1.3.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
+  <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>
@@ -38,46 +38,29 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </developer>
   </developers>
   <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</developerConnection>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/netvirt.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/netvirt.git</developerConnection>
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
   </scm>
 
   <properties>
-    <odl.karaf.base.version>1.7.0-SNAPSHOT</odl.karaf.base.version>
-    <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
+    <dlux.version>0.4.0-SNAPSHOT</dlux.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>
+    <odl.karaf.base.version>1.7.0-SNAPSHOT</odl.karaf.base.version>
     <openflowplugin.version>0.3.0-SNAPSHOT</openflowplugin.version>
+    <ovsdb.version>1.3.0-SNAPSHOT</ovsdb.version>
+    <restconf.version>1.4.0-SNAPSHOT</restconf.version>
     <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
-    <dlux.version>0.4.0-SNAPSHOT</dlux.version>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools-artifacts</artifactId>
-        <version>${yangtools.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
   <dependencies>
-    <!-- controller dependencies -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-mdsal</artifactId>
+      <version>${controller.mdsal.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
@@ -87,7 +70,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${mdsal.model.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
-      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
@@ -95,9 +77,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${restconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
-      <scope>runtime</scope>
     </dependency>
-    <!-- external dependencies -->
     <!-- TODO clean up based on what is provided by odlparent -->
     <dependency>
       <groupId>org.osgi</groupId>
@@ -129,6 +109,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>
@@ -161,7 +145,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
     </dependency>
-    <!-- neutron dependencies -->
     <dependency>
       <groupId>org.opendaylight.neutron</groupId>
       <artifactId>features-neutron</artifactId>
@@ -169,7 +152,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <!-- openflowplugin dependencies -->
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>features-openflowplugin</artifactId>
@@ -184,8 +166,6 @@ 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>
@@ -200,8 +180,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-
-    <!-- project specific dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>openstack.net-virt</artifactId>
@@ -227,14 +205,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <classifier>config</classifier>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>schema.openvswitch</artifactId>
-      <version>${project.version}</version>
+      <version>${ovsdb.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>schema.hardwarevtep</artifactId>
-      <version>${project.version}</version>
+      <version>${ovsdb.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -246,43 +224,59 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>utils.mdsal-utils</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>utils.mdsal-utils</artifactId>
+      <version>${ovsdb.version}</version>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>ovsdb-ui-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>southbound-features</artifactId>
-      <version>${project.version}</version>
+      <version>${ovsdb.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>library-features</artifactId>
+      <artifactId>netvirt-api</artifactId>
       <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>netvirt-api</artifactId>
+      <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>
+      <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>hwvtepsouthbound-features</artifactId>
-      <version>${project.version}</version>
+      <version>${ovsdb.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
-    <!-- DLUX dependency for the UI -->
+    <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>
     <dependency>
       <groupId>org.opendaylight.dlux</groupId>
       <artifactId>features-dlux</artifactId>
@@ -290,5 +284,17 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>utils.netvirt-it-utils</artifactId>
+      <version>${project.version}</version>
+      <!--<scope>test</scope>-->
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>utils.ovsdb-it-utils</artifactId>
+      <version>${ovsdb.version}</version>
+      <!--<scope>test</scope>-->
+    </dependency>
   </dependencies>
 </project>