Merge "Ignore testGetOpenflowVersion: it is no longer applicable"

[netvirt.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 63eb3fc46c37e18d717098319f35b15d01241020..9e132a90574b6e08da3da6d84f77d9fc6e1f8287 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.opendaylight.ovsdb</groupId>
     <artifactId>commons</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>commons/parent</relativePath>
   </parent>
 
   <artifactId>ovsdb</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <prerequisites>
@@ -18,40 +18,47 @@
   </prerequisites>
 
   <modules>
+    <!-- Parent POM files -->
+    <module>commons/parent</module>
+    <module>commons/integrationtest</module>
+    <!-- OVSDB Components -->
     <module>library</module>
     <module>schemas/openvswitch</module>
     <module>schemas/hardwarevtep</module>
     <module>plugin</module>
-    <module>commons/parent</module>
+    <module>plugin-shell</module>
+    <module>plugin-mdsal-adapter</module>
     <module>northbound</module>
+    <module>utils/config</module>
+    <module>utils/mdsal-openflow</module>
     <module>openstack/net-virt</module>
     <module>openstack/net-virt-providers</module>
-    <module>distribution/opendaylight</module>
+    <module>of-extension/nx-ofjava</module>
+    <module>of-extension/nx-sal</module>
+    <module>ovs-sfc</module>
+    <!-- Integration Tests -->
+    <module>integrationtest</module>
+    <!-- Config Files -->
+    <module>of-extension/openflowjava-nx-config</module>
+    <module>of-extension/openflowjava-nx-api-config</module>
+    <module>of-extension/nicira-extension-config</module>
+    <module>of-extension/ovs-nx-api-config</module>
+    <module>of-extension/ovs-nx-config</module>
+    <module>of-extension/nx-sal-config</module>
     <!-- Karaf Distribution -->
-    <module>features</module>
+    <module>features/ovsdb</module>
+    <module>features/of-nxm-extensions</module>
+    <module>features/ovs-sfc</module>
+    <!-- OVSDB Distribution -->
+    <module>distribution/opendaylight</module>
+    <module>distribution/opendaylight-karaf</module>
   </modules>
 
-  <profiles>
-    <profile>
-      <id>integrationtest</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <modules>
-        <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>