X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=6aa115da072c4e4d1590181896c2d53b39aba083;hb=c877054a927c0aedf484afbf05615b063b8fda7f;hp=a5c94cea0da7172a8a79cced00e2994090e615f4;hpb=6af5111b29fcbe6238e3b78b5f67cb33d52c65d2;p=lispflowmapping.git

diff --git a/pom.xml b/pom.xml
index a5c94cea0..6aa115da0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,11 @@
 <?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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>lispflowmapping-commons</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath>commons/parent</relativePath>
   </parent>
 
@@ -13,30 +14,70 @@
   <!-- Used by Sonar to set project name -->
   <name>lispflowmapping</name>
 
+  <prerequisites>
+    <maven>3.1.1</maven>
+  </prerequisites>
+
   <modules>
     <module>commons/parent</module>
     <module>commons/build_tools</module>
     <module>commons/unittest_tools</module>
+    <module>artifacts</module>
     <module>mappingservice</module>
+    <module>ui</module>
     <module>features</module>
-    <module>artifacts</module>
-    <module>distribution-karaf</module>
+    <module>lispflowmapping-karaf</module>
+    <module>integrationtest</module>
   </modules>
 
   <build>
     <plugins>
-      <plugin>
-        <!-- In this project we want to automatically sort all poms, thus we
+<!--       <plugin>
+        In this project we want to automatically sort all poms, thus we
              add the invocation of this plugin to the root parent. Configuration is in
-             the ODL parent. -->
+             odlparent.
         <groupId>com.google.code.sortpom</groupId>
         <artifactId>maven-sortpom-plugin</artifactId>
-      </plugin>
+      </plugin> -->
       <plugin>
-        <!-- Check for coding style violations.  Configuration in the parent pom. -->
+        <!-- Check for coding style violations.  Configuration in odlparent. -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <!--
+          This profile is to ensure we only build javadocs reports
+          when we plan to deploy Maven site for our project.
+      -->
+      <id>maven-site</id>
+      <activation>
+        <file>
+          <exists>${user.dir}/deploy-site.xml</exists>
+        </file>
+      </activation>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <inherited>false</inherited>
+            <executions>
+              <execution>
+                <id>aggregate</id>
+                <goals>
+                  <goal>aggregate</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>