Bump org.eclipse.jdt.annotation to 2.2.600

[odlparent.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index bc6f67a26c6f39954aa9961554ba5cea38b6e690..fb997f23ceea12abd28318b9c4ae6ec6f6155128 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>9.0.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>
 
@@ -25,33 +23,127 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/odlparent.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/odlparent.git</developerConnection>
         <tag>HEAD</tag>
-        <url>https://wiki.opendaylight.org/view/ODL_Root_Parent:Main</url>
+        <url>https://wiki.opendaylight.org/display/ODL/ODL+Root+Parent</url>
     </scm>
 
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
+
     <modules>
         <!-- odlparent tools -->
         <module>checkstyle</module>
+        <module>spotbugs</module>
         <module>license</module>
 
-        <!-- odlparent core -->
-        <module>bundle-parent</module>
-        <module>features-parent</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>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>
-        <module>karaf-plugin</module>
+
+        <!-- Manifest filtering plugin -->
+        <module>filter-manifest-plugin</module>
+
+        <!-- Logging Markers -->
+        <module>logging-markers</module>
+
+        <!-- Features -->
+        <module>features</module>
+
+        <!-- Artifacts -->
+        <module>odlparent-artifacts</module>
+
+        <!-- Aggragated javadocs -->
+        <module>docs</module>
+
+        <!-- Self-tests -->
+        <module>odlparent-bundle-check</module>
+        <module>odlparent-dependency-check</module>
+        <module>tests</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>3.0.1</version>
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
+                                <id>aggregate</id>
+                                <goals>
+                                    <goal>aggregate</goal>
+                                </goals>
+                                <phase>package</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>sonar-jacoco-aggregate</id>
+            <activation>
+                <property>
+                    <name>odl.jacoco.aggregateFile</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>merge</id>
+                                <goals>
+                                    <goal>merge</goal>
+                                </goals>
+                                <phase>generate-resources</phase>
+                                <configuration>
+                                    <destFile>${odl.jacoco.aggregateFile}</destFile>
+                                    <fileSets>
+                                        <fileSet>
+                                            <directory>${project.basedir}</directory>
+                                            <includes>
+                                                <include>**/target/code-coverage/*.exec</include>
+                                            </includes>
+                                        </fileSet>
+                                    </fileSets>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>