Merge "Clean up pom files"

[ovsdb.git] / utils / pom.xml

diff --git a/utils/pom.xml b/utils/pom.xml
index 2d57c9aa9aac49558bb09fbba3b301ee6abdef0b..12749b9364329909c1fe35b6f64a1905122e583b 100644 (file)
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -12,12 +12,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <artifactId>commons</artifactId>
-    <groupId>org.opendaylight.ovsdb</groupId>
-    <version>1.4.0-SNAPSHOT</version>
-    <relativePath>../commons/parent/pom.xml</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.opendaylight.ovsdb</groupId>
   <artifactId>utils</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <name>${project.artifactId}</name>
@@ -51,7 +51,29 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <module>config</module>
     <module>mdsal-node</module>
     <module>mdsal-openflow</module>
-    <module>servicehelper</module>
     <module>mdsal-utils</module>
+    <module>neutron-utils</module>
+    <module>servicehelper</module>
+    <module>southbound-utils</module>
   </modules>
+
+<!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-install-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>