Checkstyle: no space inside parentheses

[odlparent.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index bc6f67a26c6f39954aa9961554ba5cea38b6e690..c70bb16ccf38097ec82f8e35f8bff481a370c317 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?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.
+ 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,
@@ -11,13 +11,11 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>odlparent-lite</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-aggregator</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
     <name>odlparent</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
 
@@ -31,27 +29,94 @@
     <modules>
         <!-- odlparent tools -->
         <module>checkstyle</module>
+        <module>findbugs</module>
         <module>license</module>
+        <module>bundles-test</module>
+        <module>bundles4-test</module>
+        <module>features-test</module>
+        <module>features4-test</module>
+
+        <!-- Karaf integration -->
+        <module>karaf</module>
+        <module>karaf-plugin</module>
+        <module>karaf4-plugin</module>
 
-        <!-- odlparent core -->
+        <!-- Parent POMs -->
         <module>bundle-parent</module>
         <module>features-parent</module>
-        <module>features-test</module>
+        <module>single-feature3-parent</module>
+        <module>single-feature-parent</module>
+        <module>feature3-repo-parent</module>
+        <module>feature-repo-parent</module>
         <module>odlparent</module>
         <module>odlparent-lite</module>
-        <module>karaf-plugin</module>
+
+        <!-- Features -->
+        <module>features</module>
+        <module>features4</module>
+
+        <!-- Artifacts -->
+        <module>odlparent-artifacts</module>
     </modules>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.2</version>
                 <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>2.10.4</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>