X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fpom.xml;h=89d050a7aa243dc94f91f45411d3e1d6ad604595;hb=073819fa1c920e2e759737de60175a08c7faa3aa;hp=2508f3ce053097137e5c51e81248524fed0a165a;hpb=39831f23f83aea03675c90bfcd2d3ce321fda05e;p=netvirt.git

diff --git a/features/pom.xml b/features/pom.xml
index 2508f3ce05..89d050a7aa 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -1,83 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2015 - 2016 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
+Copyright (C) 2014 Red Hat, Inc. and others. All rights reserved.
+
 This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
+and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<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.odlparent</groupId>
     <artifactId>features-parent</artifactId>
     <version>1.7.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
-  <groupId>org.opendaylight.vpnservice</groupId>
-  <artifactId>vpnservice-features</artifactId>
-  <version>0.3.0-SNAPSHOT</version>
-  <name>${project.artifactId}</name>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
+
+  <groupId>org.opendaylight.netvirt</groupId>
+  <artifactId>features-netvirt</artifactId>
+  <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>
+  <licenses>
+    <license>
+      <name>Eclipse Public License v1.0</name>
+      <url>http://www.eclipse.org/legal/epl-v10.html</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>Sam Hague</name>
+      <email>shague@gmail.com</email>
+      <url>https://github.com/shague</url>
+    </developer>
+  </developers>
+  <scm>
+    <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>
-    <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>
+    <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>
-    <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
-    <vpnservices.version>0.3.0-SNAPSHOT</vpnservices.version>
-    <ovsdb.version>1.3.0-SNAPSHOT</ovsdb.version>
-    <liblldp.version>0.11.0-SNAPSHOT</liblldp.version>
-    <neutron.version>0.7.0-SNAPSHOT</neutron.version>
-    <nic.version>1.2.0-SNAPSHOT</nic.version>
-    <arputil.version>${vpnservices.version}</arputil.version>
-    <mdsalutil.version>${vpnservices.version}</mdsalutil.version>
-    <vpnmanager.version>${vpnservices.version}</vpnmanager.version>
-    <interfacemgr.version>${vpnservices.version}</interfacemgr.version>
-    <elanmgr.version>${vpnservices.version}</elanmgr.version>
-    <nexthopmgr.version>${vpnservices.version}</nexthopmgr.version>
-    <fibmanager.version>${vpnservices.version}</fibmanager.version>
-    <lockmanager.version>${vpnservices.version}</lockmanager.version>
-    <idmanager.version>${vpnservices.version}</idmanager.version>
-    <itm.version>${vpnservices.version}</itm.version>
-    <neutronvpn.version>${vpnservices.version}</neutronvpn.version>
   </properties>
-  <dependencyManagement>
-    <dependencies>
-      <!-- project specific dependencies -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-artifacts</artifactId>
-        <version>${restconf.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
+
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <classifier>features</classifier>
-      <version>${yangtools.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
       <type>xml</type>
-      <scope>runtime</scope>
+      <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
@@ -85,323 +69,238 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <version>${mdsal.model.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.nic</groupId>
-      <artifactId>features-nic</artifactId>
-      <classifier>features</classifier>
-      <version>${nic.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>features-ovsdb</artifactId>
-      <version>${ovsdb.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>features-openflowplugin</artifactId>
-      <classifier>features</classifier>
-      <version>${openflowplugin.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>features-restconf</artifactId>
-      <classifier>features</classifier>
       <version>${restconf.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.neutron</groupId>
-      <artifactId>features-neutron</artifactId>
       <classifier>features</classifier>
-      <version>${neutron.version}</version>
       <type>xml</type>
-      <scope>runtime</scope>
     </dependency>
+    <!-- TODO clean up based on what is provided by odlparent -->
     <dependency>
-      <groupId>org.opendaylight.neutron</groupId>
-      <artifactId>dummyprovider</artifactId>
-      <version>${neutron.version}</version>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>vpnmanager-impl</artifactId>
-      <version>${vpnmanager.version}</version>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>vpnmanager-impl</artifactId>
-      <version>${vpnmanager.version}</version>
-      <classifier>config</classifier>
-      <type>xml</type>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.dependencymanager</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>mdsalutil-impl</artifactId>
-      <version>${mdsalutil.version}</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>arputil-api</artifactId>
-      <version>${arputil.version}</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>arputil-impl</artifactId>
-      <version>${arputil.version}</version>
-      <classifier>config</classifier>
-      <type>xml</type>
-    </dependency>
-     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>arputil-impl</artifactId>
-      <version>${arputil.version}</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>mdsalutil-impl</artifactId>
-      <version>${mdsalutil.version}</version>
-      <classifier>config</classifier>
-      <type>xml</type>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>mdsalutil-api</artifactId>
-      <version>${mdsalutil.version}</version>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>interfacemgr-impl</artifactId>
-      <version>${interfacemgr.version}</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>interfacemgr-impl</artifactId>
-      <version>${interfacemgr.version}</version>
-      <classifier>config</classifier>
-      <type>xml</type>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>interfacemgr-api</artifactId>
-      <version>${interfacemgr.version}</version>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>elanmanager-impl</artifactId>
-      <version>${elanmgr.version}</version>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec-http</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>elanmanager-impl</artifactId>
-      <version>${elanmgr.version}</version>
-      <classifier>config</classifier>
-      <type>xml</type>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>elanmanager-api</artifactId>
-      <version>${elanmgr.version}</version>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-handler</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>liblldp</artifactId>
-        <version>${liblldp.version}</version>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alivenessmonitor-impl</artifactId>
-      <version>${vpnservices.version}</version>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alivenessmonitor-impl</artifactId>
-      <version>${vpnservices.version}</version>
-      <classifier>config</classifier>
+      <groupId>org.opendaylight.neutron</groupId>
+      <artifactId>features-neutron</artifactId>
+      <version>${neutron.version}</version>
+      <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>alivenessmonitor-api</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>vpnmanager-api</artifactId>
-      <version>${vpnmanager.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>bgpmanager-impl</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>bgpmanager-impl</artifactId>
-      <version>${vpnservices.version}</version>
-      <classifier>config</classifier>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin</artifactId>
+      <version>${openflowplugin.version}</version>
+      <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>bgpmanager-api</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>model-bgp</artifactId>
-      <version>2013.07.15.9-SNAPSHOT</version>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin-extension</artifactId>
+      <version>${openflowplugin.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>fibmanager-impl</artifactId>
-      <version>${fibmanager.version}</version>
+      <artifactId>openstack.net-virt</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>fibmanager-impl</artifactId>
-      <version>${fibmanager.version}</version>
-      <classifier>config</classifier>
+      <artifactId>openstack.net-virt</artifactId>
+      <version>${project.version}</version>
       <type>xml</type>
+      <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>fibmanager-api</artifactId>
-      <version>${fibmanager.version}</version>
+      <artifactId>openstack.net-virt-providers</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>lockmanager-impl</artifactId>
-      <version>${lockmanager.version}</version>
+      <artifactId>openstack.net-virt-providers</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>lockmanager-impl</artifactId>
-      <version>${lockmanager.version}</version>
-      <classifier>config</classifier>
-      <type>xml</type>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>schema.openvswitch</artifactId>
+      <version>${ovsdb.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>lockmanager-api</artifactId>
-      <version>${lockmanager.version}</version>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>schema.hardwarevtep</artifactId>
+      <version>${ovsdb.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>idmanager-impl</artifactId>
-      <version>${idmanager.version}</version>
+      <artifactId>utils.servicehelper</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>idmanager-impl</artifactId>
-      <version>${idmanager.version}</version>
-      <classifier>config</classifier>
-      <type>xml</type>
+      <artifactId>utils.mdsal-utils</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>idmanager-api</artifactId>
-      <version>${idmanager.version}</version>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>utils.mdsal-utils</artifactId>
+      <version>${ovsdb.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>itm-impl</artifactId>
-      <version>${itm.version}</version>
+      <artifactId>ovsdb-ui-bundle</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>itm-impl</artifactId>
-      <version>${itm.version}</version>
-      <classifier>config</classifier>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>southbound-features</artifactId>
+      <version>${ovsdb.version}</version>
       <type>xml</type>
+      <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>itm-api</artifactId>
-      <version>${itm.version}</version>
+      <artifactId>netvirt-api</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>dhcpservice-impl</artifactId>
-      <version>${vpnservices.version}</version>
+      <artifactId>hwgw</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>dhcpservice-impl</artifactId>
-      <version>${vpnservices.version}</version>
-      <classifier>config</classifier>
+      <artifactId>hwgw</artifactId>
+      <version>${project.version}</version>
       <type>xml</type>
+      <classifier>config</classifier>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>dhcpservice-api</artifactId>
-      <version>${vpnservices.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>neutronvpn-api</artifactId>
-      <version>${neutronvpn.version}</version>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>hwvtepsouthbound-features</artifactId>
+      <version>${ovsdb.version}</version>
+      <type>xml</type>
+      <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>neutronvpn-impl</artifactId>
-      <version>${neutronvpn.version}</version>
+      <artifactId>neutron</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>neutronvpn-impl</artifactId>
-      <version>${neutronvpn.version}</version>
-      <classifier>config</classifier>
+      <artifactId>neutron</artifactId>
+      <version>${project.version}</version>
       <type>xml</type>
+      <classifier>config</classifier>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>neutronvpn-shell</artifactId>
-      <version>${neutronvpn.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.thrift</groupId>
-      <artifactId>libthrift</artifactId>
-      <version>0.9.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>features-openflowplugin-extension</artifactId>
+      <groupId>org.opendaylight.dlux</groupId>
+      <artifactId>features-dlux</artifactId>
+      <version>${dlux.version}</version>
       <classifier>features</classifier>
-      <version>${openflowplugin.version}</version>
       <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-net</groupId>
-      <artifactId>commons-net</artifactId>
-      <version>${commons.net.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>vpnintent-api</artifactId>
-      <version>${vpnservices.version}</version>
+      <artifactId>openstack.net-virt</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>vpnintent-impl</artifactId>
-      <version>${vpnservices.version}</version>
+      <artifactId>utils.netvirt-it-utils</artifactId>
+      <version>${project.version}</version>
+      <!--<scope>test</scope>-->
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>vpnintent-impl</artifactId>
-      <version>${vpnservices.version}</version>
-      <classifier>config</classifier>
-      <type>xml</type>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>utils.ovsdb-it-utils</artifactId>
+      <version>${ovsdb.version}</version>
+      <!--<scope>test</scope>-->
     </dependency>
   </dependencies>
+
+  <!--
+      Maven Site Configuration
+
+      The following configuration is necessary for maven-site-plugin to
+      correctly identify the correct deployment path for OpenDaylight Maven
+      sites.
+  -->
+  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+
+  <distributionManagement>
+    <site>
+      <id>opendaylight-site</id>
+      <url>${nexus.site.url}/${project.artifactId}/</url>
+    </site>
+  </distributionManagement>
 </project>