Remove ${karaf.version} property from pom.xml

[lispflowmapping.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index b0a8477ee0b7e7d428c77663b408beeb36f14af2..fcf835a9a5876d814c4b7a14b5816e4c291a4deb 100644 (file)
--- 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>
 <?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>
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>lispflowmapping-commons</artifactId>

-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>

     <relativePath>commons/parent</relativePath>
   </parent>
 
     <relativePath>commons/parent</relativePath>
   </parent>
 


@@ -13,40 +14,87 @@
   <!-- Used by Sonar to set project name -->
   <name>lispflowmapping</name>
 
   <!-- 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>
   <modules>
     <module>commons/parent</module>
     <module>commons/build_tools</module>
     <module>commons/unittest_tools</module>

+    <module>artifacts</module>

     <module>mappingservice</module>
     <module>mappingservice</module>

-    <module>distribution</module>
+    <module>ui</module>

     <module>features</module>
     <module>distribution-karaf</module>
     <module>features</module>
     <module>distribution-karaf</module>

+    <module>integrationtest</module>

   </modules>
 
   <build>
   </modules>
 
   <build>

-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <!-- we are overriding the default version of this plugin here... not sure why. -->
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.8</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>

     <plugins>
     <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
              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>
         <groupId>com.google.code.sortpom</groupId>
         <artifactId>maven-sortpom-plugin</artifactId>

-      </plugin>
+      </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>
         <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>
+
+  <!--
+      Maven Site Configuration
+
+      The following configuration is necessary for maven-site-plugin to
+      correctly identify the correct deployment path for OpenDaylight Maven
+      sites.
+  -->
+  <url>${odl.site.url}/${project.groupId}/${stream}/</url>
+
+  <distributionManagement>
+    <site>
+      <id>opendaylight-site</id>
+      <url>${nexus.site.url}/</url>
+    </site>
+  </distributionManagement>
+

 </project>
 </project>