X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=6d310206ccf7591f79989cc2107cb964d9560ffd;hb=refs%2Fchanges%2F43%2F106543%2F3;hp=591144c3c2e3ae147538fd7785a0acf235547dac;hpb=4f0f6f3a97b17d1e6914149c4c999d8801596c41;p=netconf.git

diff --git a/pom.xml b/pom.xml
index 591144c3c2..6d310206cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,22 +13,78 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>4.0.2</version>
+        <version>12.0.6</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-aggregator</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
 
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
+
     <modules>
+        <module>artifacts</module>
+        <module>parent</module>
         <module>features</module>
         <module>karaf</module>
+        <module>karaf-static</module>
+        <module>model</module>
+        <module>transport</module>
+        <module>protocol</module>
+        <module>plugins</module>
+        <module>apps</module>
+        <module>third-party</module>
+
+        <!-- Legacy layout -->
         <module>netconf</module>
-        <module>protocol-framework</module>
         <module>restconf</module>
+
+        <module>keystore</module>
+        <module>truststore</module>
     </modules>
 
+    <profiles>
+        <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>