Merge "Added per-flow TEP and per-port TEP example in SW schema IT"

[ovsdb.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index bf1db3bb8a40f9519fda62c293df9a2d235d42df..63eb3fc46c37e18d717098319f35b15d01241020 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -4,28 +4,33 @@
 
   <parent>
     <groupId>org.opendaylight.ovsdb</groupId>
-    <artifactId>ovsdb_commons</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <artifactId>commons</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>commons/parent</relativePath>
   </parent>
-  <groupId>org.opendaylight.ovsdb</groupId>
-  <artifactId>ovsdb_project</artifactId>
+
+  <artifactId>ovsdb</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
+
   <prerequisites>
     <maven>3.0</maven>
   </prerequisites>
+
   <modules>
     <module>library</module>
-    <module>schemas/Open_vSwitch</module>
-    <module>schemas/hardware_vtep</module>
+    <module>schemas/openvswitch</module>
+    <module>schemas/hardwarevtep</module>
     <module>plugin</module>
     <module>commons/parent</module>
-    <module>commons/integrationtest</module>
     <module>northbound</module>
-    <module>neutron</module>
+    <module>openstack/net-virt</module>
+    <module>openstack/net-virt-providers</module>
     <module>distribution/opendaylight</module>
+    <!-- Karaf Distribution -->
+    <module>features</module>
   </modules>
+
   <profiles>
     <profile>
       <id>integrationtest</id>
@@ -33,15 +38,20 @@
         <activeByDefault>false</activeByDefault>
       </activation>
       <modules>
-          <module>integrationtest</module>
+        <module>commons/integrationtest</module>
+        <module>integrationtest</module>
       </modules>
+      <properties>
+        <skip.integrationtest>false</skip.integrationtest>
+      </properties>
     </profile>
   </profiles>
+
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</developerConnection>
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
   </scm>
-
+  
 </project>