Merge "Ignore testGetOpenflowVersion: it is no longer applicable"

[netvirt.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 85161a514b00a6919de48b3121dd65fc062bbe58..9e132a90574b6e08da3da6d84f77d9fc6e1f8287 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -1,33 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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>
-  <prerequisites>
-    <maven>3.0</maven>
-  </prerequisites>
 
   <parent>
     <groupId>org.opendaylight.ovsdb</groupId>
-    <artifactId>commons.ovsdb</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <artifactId>commons</artifactId>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>commons/parent</relativePath>
   </parent>
-  <groupId>org.opendaylight.ovsdb</groupId>
-  <artifactId>ovsdb.project</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+
+  <artifactId>ovsdb</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
+
+  <prerequisites>
+    <maven>3.0</maven>
+  </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>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>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/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>
+
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</developerConnection>
-    <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
     <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
   </scm>
-  <modules>
-    <module>ovsdb</module>
-    <module>northbound/ovsdb</module>
-    <module>neutron</module>
-    <module>commons/parent</module>
-    <module>distribution/opendaylight</module>
-  </modules>
 
 </project>