X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=c16099d74bc47cbfb520956aeae9dcc989f212e5;hb=b67669b68b89ec51443eedc33292cc969276a751;hp=87bbe622e0751151e0fad0e47f03e8b1643b790d;hpb=519c7aaa300ed58b8e316b1a9b0bca9ec067e22f;p=odlparent.git

diff --git a/pom.xml b/pom.xml
index 87bbe622e..c16099d74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,13 +11,11 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>7.0.2-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>
 
@@ -28,34 +26,52 @@
         <url>https://wiki.opendaylight.org/view/ODL_Root_Parent:Main</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>
-        <module>features-odlparent</module>
-        <module>odlparent-artifacts</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>
-    </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>
+        <!-- Manifest filtering plugin -->
+        <module>filter-manifest-plugin</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>
 
     <profiles>
         <profile>
@@ -73,8 +89,8 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>3.0.1</version>
                         <inherited>false</inherited>
                         <executions>
                             <execution>
@@ -89,21 +105,63 @@
                 </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>
+                                <!-- Step one:
+
+                                    merge all .exec files into a single file into this project's
+                                    ${project.build.directory}/jacoco.exec. Note we are being explicit so as
+                                    to override the odlparent/pom.xml override
+                                -->
+                                <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>
+                            <execution>
+                                <!-- Step two:
+
+                                    pick the merged execution file and produce a complete aggregate report,
+                                    including HTML/XML/CSV.
+                                 -->
+                                <id>report</id>
+                                <goals>
+                                    <goal>report-aggregate</goal>
+                                </goals>
+                                <phase>generate-resources</phase>
+                                <configuration>
+                                    <dataFileIncludes>${odl.jacoco.aggregateFile}</dataFileIncludes>
+                                </configuration>
+                            </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>