Remove uneeded version property from distribution pom

[ovsdb.git] / pom.xml

diff --git a/pom.xml b/pom.xml
old mode 100755 (executable)
new mode 100644 (file)
index f25ef53..1054e7a
--- a/pom.xml
+++ b/pom.xml
@@ -1,59 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<!--
+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
+-->
+<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.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>
+  <name>${project.artifactId}</name> <!-- Used by Sonar to set project name -->
   <packaging>pom</packaging>
 
   <prerequisites>
-    <maven>3.0</maven>
+    <maven>3.1.1</maven>
   </prerequisites>
 
   <modules>
     <!-- Parent POM files -->
     <module>commons/parent</module>
     <module>commons/integrationtest</module>
+    <module>distribution/opendaylight-karaf</module>
+    <module>features/ovsdb</module>
+    <module>features/ovs-sfc</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/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>
+    <module>plugin</module>
+    <module>ovsdb-plugin-compatibility-layer</module>
+    <module>plugin-shell</module>
+    <module>schemas/hardwarevtep</module>
+    <module>schemas/openvswitch</module>
+    <module>southbound</module>
+    <module>utils</module>
     <!-- Integration Tests -->
     <module>integrationtest</module>
-    <!-- Config Files -->
-    <module>of-extension/openflowjava-nx-config</module>
-    <module>of-extension/openflowjava-nx-api-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>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <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>