Bump Netty to 4.1.49

[odlparent.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 965f046877e59af2369ea6e37347f66f4eb5b8be..c16099d74bc47cbfb520956aeae9dcc989f212e5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>7.0.2-SNAPSHOT</version>
         <relativePath>odlparent-lite</relativePath>
     </parent>
 
@@ -34,7 +34,6 @@
     <modules>
         <!-- odlparent tools -->
         <module>checkstyle</module>
-        <module>findbugs</module>
         <module>spotbugs</module>
         <module>license</module>
 
@@ -56,14 +55,22 @@
         <module>odlparent</module>
         <module>odlparent-lite</module>
 
+        <!-- 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>
@@ -83,7 +90,7 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.0.0</version>
+                        <version>3.0.1</version>
                         <inherited>false</inherited>
                         <executions>
                             <execution>
@@ -98,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>