X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=11f3e77bc1073669d58146218cd2ed9f8ef964f1;hb=fb24b109e791745ed83ce3d7e4aa6dd9f0566287;hp=c9e70203949df72c09fef29ab02389c1c6b3a06c;hpb=46e2f8c99f01a96e1c3d349f6db2dcf8a577fb1c;p=odlparent.git

diff --git a/pom.xml b/pom.xml
index c9e702039..11f3e77bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+<!-- vi: set et smarttab sw=4 tabstop=4: --><!--
+ Copyright (c) 2014, 2015 Cisco Systems, 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">
-
+--><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>
 
-    <groupId>org.opendaylight.odlparent</groupId>
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>aggregator-parent</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>aggregator-parent</relativePath>
+    </parent>
+
     <artifactId>odlparent-aggregator</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <name>odlparent</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
-    <prerequisites>
-        <maven>3.0.4</maven>
-    </prerequisites>
+
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/odlparent.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/odlparent.git</developerConnection>
@@ -26,21 +27,87 @@
     </scm>
 
     <modules>
-        <module>bundle-parent</module>
-        <module>features-parent</module>
+        <!-- odlparent tools -->
+        <module>checkstyle</module>
+        <module>findbugs</module>
+        <module>license</module>
+
+        <!-- Features test (SFT) -->
+        <module>bundles-test-lib</module>
+        <module>bundles4-test</module>
         <module>features-test</module>
+
+        <!-- Karaf integration -->
+        <module>karaf</module>
+        <module>karaf-plugin</module>
+        <module>karaf-util</module>
+
+        <!-- Parent POMs -->
+        <module>aggregator-parent</module>
+        <module>bundle-parent</module>
+        <module>untested-single-feature-parent</module>
+        <module>single-feature-parent</module>
+        <module>feature-repo-parent</module>
         <module>odlparent</module>
+        <module>odlparent-lite</module>
+
+        <!-- Features -->
+        <module>features</module>
+
+        <!-- Artifacts -->
+        <module>odlparent-artifacts</module>
+
+        <!-- Self-tests -->
+        <module>odlparent-dependency-check</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </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>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>3.0.0-M1</version>
+                        <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>