Modify pom files & fix AAF sonar issues

Modified Misc Pom files and testing SONAR

Issue-ID: AAF-199
Change-Id: Ifea9566009936648314c08d52a2cc638c99c9e07
Signed-off-by: Sai Gandham <sg481n@att.com>

diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml
index 2813a55..8969de0 100644 (file)
--- a/auth/auth-batch/pom.xml
+++ b/auth/auth-batch/pom.xml
@@ -71,7 +71,7 @@
        </developers>
 
        <properties>
-       <skipTests>true</skipTests>
+       
 
 
                <maven.test.failure.ignore>false</maven.test.failure.ignore>

diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml
index 429a122..4154088 100644 (file)
--- a/auth/auth-cass/pom.xml
+++ b/auth/auth-cass/pom.xml
@@ -71,7 +71,7 @@
        </developers>
 
        <properties>
-       <skipTests>true</skipTests>
+       
 
 
                <!--  SONAR  -->

diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml
index c67e849..87ff363 100644 (file)
--- a/auth/auth-cmd/pom.xml
+++ b/auth/auth-cmd/pom.xml
@@ -36,9 +36,6 @@
        <packaging>jar</packaging>
 
        <properties>
-       <skipTests>true</skipTests>
-
-
                <maven.test.failure.ignore>false</maven.test.failure.ignore>
                <!--  SONAR  -->
                 <jacoco.version>0.7.7.201606060606</jacoco.version>

diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml
index f194874..65f333b 100644 (file)
--- a/auth/auth-core/pom.xml
+++ b/auth/auth-core/pom.xml
@@ -72,9 +72,6 @@
 
 
        <properties>
-       <skipTests>true</skipTests>
-
-
                <!--  SONAR  -->
                 <jacoco.version>0.7.7.201606060606</jacoco.version>
            <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>

diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml
index 2e02120..ed9c591 100644 (file)
--- a/auth/auth-deforg/pom.xml
+++ b/auth/auth-deforg/pom.xml
@@ -72,9 +72,6 @@
 
 
        <properties>
-       <skipTests>true</skipTests>
-
-
                <maven.test.failure.ignore>false</maven.test.failure.ignore>
                <!--  SONAR  -->
                 <jacoco.version>0.7.7.201606060606</jacoco.version>

diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml
index 31f2c33..c1af6e4 100644 (file)
--- a/auth/auth-fs/pom.xml
+++ b/auth/auth-fs/pom.xml
@@ -34,9 +34,6 @@
        <description>Independent FileServer Component via HTTP (not S) for Public Files (i.e. CRLs) for AAF Auth</description>
 
        <properties>
-       <skipTests>true</skipTests>
-
-
                <maven.test.failure.ignore>true</maven.test.failure.ignore>
                <!--  SONAR  -->
                 <jacoco.version>0.7.7.201606060606</jacoco.version>

diff --git a/auth/pom.xml b/auth/pom.xml
index 9089291..7142554 100644 (file)
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -30,7 +30,6 @@
        <packaging>pom</packaging>
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <skipTests>true</skipTests>
                <project.interfaceVersion>2.10-SNAPSHOT</project.interfaceVersion>
                <project.miscVersion>1.3.0-SNAPSHOT</project.miscVersion>
                <project.cadiVersion>1.5.0-SNAPSHOT</project.cadiVersion>
@@ -116,7 +115,7 @@
                                        <artifactId>maven-surefire-plugin</artifactId>
                                        <version>2.17</version>
                                        <configuration>
-                                               <skipTests>true</skipTests>
+                                               <skipTests>false</skipTests>
 
                                                <includes>
                                                        <include>**/JU*.java</include>
@@ -132,7 +131,7 @@
                                        <artifactId>maven-failsafe-plugin</artifactId>
                                        <version>2.17</version>
                                        <configuration>
-                                               <skipTests>true</skipTests>
+                                               <skipTests>flase</skipTests>
                                        </configuration>
                                        <executions>
                                                <execution>

diff --git a/cadi/pom.xml b/cadi/pom.xml
index 56cf399..361c375 100644 (file)
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -31,11 +31,6 @@
        </organization>
        <packaging>pom</packaging>
 
-       <parent>             
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
-    </parent>
 
        
        <properties>

diff --git a/misc/env/pom.xml b/misc/env/pom.xml
index c4790d4..0a8309d 100644 (file)
--- a/misc/env/pom.xml
+++ b/misc/env/pom.xml
@@ -70,15 +70,13 @@
        </developers>
        
        <properties>
-               <!--  SONAR  -->
-                <jacoco.version>0.7.7.201606060606</jacoco.version>
-           <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-           <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-           <!-- Default Sonar configuration -->
-           <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-           <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+       <jacocoVersion>0.7.6.201602180812</jacocoVersion>
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <encoding>UTF-8</encoding>
+               <sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
+               <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
+               <enforcer.skip>true</enforcer.skip>
+               
                <nexusproxy>https://nexus.onap.org</nexusproxy>
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -99,57 +97,82 @@
                                        <serverId>ecomp-staging</serverId>
                                </configuration>
                        </plugin>               
+               <plugin>
+            <groupId>org.sonarsource.scanner.maven</groupId>
+            <artifactId>sonar-maven-plugin</artifactId>
+            <version>3.2</version>
+        </plugin>
+               <!-- Jacoco -->
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.7.201606060606</version>
-                               <configuration>
-                                       <dumpOnExit>true</dumpOnExit>
-                                       <includes>
-                                               <include>org.onap.aaf.*</include>
-                                       </includes>
-                               </configuration>
+                               <!-- Override OParent version -->
+                               <version>${jacocoVersion}</version>
                                <executions>
+                                       <!-- disable jacoco executions from oparent -->
                                        <execution>
                                                <id>pre-unit-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>post-unit-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>pre-integration-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>post-integration-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <!-- Order matters -->
+                                       <execution>
+                                               <id>portal-prepare-agent</id>
                                                <goals>
                                                        <goal>prepare-agent</goal>
                                                </goals>
                                                <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-                                                       <!-- <append>true</append> -->
+                                                       <destFile>${sonar.jacoco.reportPath}</destFile>
                                                </configuration>
                                        </execution>
+                                       <!-- offline instrumentation for PowerMock -->
                                        <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>pre-integration-test</phase>
+                                               <id>portal-offline-instrument</id>
                                                <goals>
-                                                       <goal>prepare-agent</goal>
+                                                       <goal>instrument</goal>
+                                               </goals>
+                                       </execution>
+                                       <execution>
+                                               <id>portal-restore-instrumented-classes</id>
+                                               <phase>test</phase>
+                                               <goals>
+                                                       <goal>restore-instrumented-classes</goal>
+                                               </goals>
+                                       </execution>
+                                       <execution>
+                                               <id>portal-post-unit-test</id>
+                                               <phase>test</phase>
+                                               <goals>
+                                                       <goal>report</goal>
                                                </goals>
                                                <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
-                                                       <!-- <append>true</append> -->
+                                                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
+                                                       <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
                                                </configuration>
                                        </execution>
-                                       <execution>
-                        <goals>
-                            <goal>merge</goal>
-                        </goals>
-                        <phase>post-integration-test</phase>
-                        <configuration>
-                            <fileSets>
-                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
-                                    <directory>${project.build.directory}/coverage-reports</directory>
-                                    <includes>
-                                        <include>*.exec</include>
-                                    </includes>
-                                </fileSet>
-                            </fileSets>
-                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
-                        </configuration>
-                    </execution>
                                </executions>
                        </plugin>
+
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <configuration>
+                                       <systemPropertyVariables>
+                                               <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
+                                       </systemPropertyVariables>
+                               </configuration>
+                       </plugin>
        </plugins>
        </build>
        

diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml
index f8e60bd..d6c4a7e 100644 (file)
--- a/misc/log4j/pom.xml
+++ b/misc/log4j/pom.xml
@@ -70,15 +70,13 @@
        </developers>
        
        <properties>
-               <!--  SONAR  -->
-                <jacoco.version>0.7.7.201606060606</jacoco.version>
-           <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-           <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-           <!-- Default Sonar configuration -->
-           <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-           <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+       <jacocoVersion>0.7.6.201602180812</jacocoVersion>
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <encoding>UTF-8</encoding>
+               <sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
+               <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
+               <enforcer.skip>true</enforcer.skip>
+               
                <nexusproxy>https://nexus.onap.org</nexusproxy>
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -123,57 +121,82 @@
                                        <serverId>ecomp-staging</serverId>
                                </configuration>
                        </plugin>               
+               <plugin>
+            <groupId>org.sonarsource.scanner.maven</groupId>
+            <artifactId>sonar-maven-plugin</artifactId>
+            <version>3.2</version>
+        </plugin>
+               <!-- Jacoco -->
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.7.201606060606</version>
-                               <configuration>
-                                       <dumpOnExit>true</dumpOnExit>
-                                       <includes>
-                                               <include>org.onap.aaf.*</include>
-                                       </includes>
-                               </configuration>
+                               <!-- Override OParent version -->
+                               <version>${jacocoVersion}</version>
                                <executions>
+                                       <!-- disable jacoco executions from oparent -->
                                        <execution>
                                                <id>pre-unit-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>post-unit-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>pre-integration-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>post-integration-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <!-- Order matters -->
+                                       <execution>
+                                               <id>portal-prepare-agent</id>
                                                <goals>
                                                        <goal>prepare-agent</goal>
                                                </goals>
                                                <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-                                                       <!-- <append>true</append> -->
+                                                       <destFile>${sonar.jacoco.reportPath}</destFile>
                                                </configuration>
                                        </execution>
+                                       <!-- offline instrumentation for PowerMock -->
                                        <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>pre-integration-test</phase>
+                                               <id>portal-offline-instrument</id>
                                                <goals>
-                                                       <goal>prepare-agent</goal>
+                                                       <goal>instrument</goal>
+                                               </goals>
+                                       </execution>
+                                       <execution>
+                                               <id>portal-restore-instrumented-classes</id>
+                                               <phase>test</phase>
+                                               <goals>
+                                                       <goal>restore-instrumented-classes</goal>
+                                               </goals>
+                                       </execution>
+                                       <execution>
+                                               <id>portal-post-unit-test</id>
+                                               <phase>test</phase>
+                                               <goals>
+                                                       <goal>report</goal>
                                                </goals>
                                                <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
-                                                       <!-- <append>true</append> -->
+                                                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
+                                                       <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
                                                </configuration>
                                        </execution>
-                                       <execution>
-                        <goals>
-                            <goal>merge</goal>
-                        </goals>
-                        <phase>post-integration-test</phase>
-                        <configuration>
-                            <fileSets>
-                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
-                                    <directory>${project.build.directory}/coverage-reports</directory>
-                                    <includes>
-                                        <include>*.exec</include>
-                                    </includes>
-                                </fileSet>
-                            </fileSets>
-                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
-                        </configuration>
-                    </execution>
                                </executions>
                        </plugin>
+
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <configuration>
+                                       <systemPropertyVariables>
+                                               <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
+                                       </systemPropertyVariables>
+                               </configuration>
+                       </plugin>
                        </plugins>
                </pluginManagement>
        </build>

diff --git a/misc/pom.xml b/misc/pom.xml
index c1a4a6d..ff5b49e 100644 (file)
--- a/misc/pom.xml
+++ b/misc/pom.xml
@@ -28,24 +28,18 @@
        <version>1.3.0-SNAPSHOT</version>
        <packaging>pom</packaging>
        
-       <parent>             
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
-    </parent>
+       
 
        <properties>
+       <jacocoVersion>0.7.6.201602180812</jacocoVersion>
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <encoding>UTF-8</encoding>
+               <sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
+               <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
+               <enforcer.skip>true</enforcer.skip>
+               
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <powermock.version>1.5.1</powermock.version>
-               <!--  SONAR  -->
-                <jacoco.version>0.7.7.201606060606</jacoco.version>
-           <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-           <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-           <!-- Default Sonar configuration -->
-           <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-           <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -153,57 +147,82 @@
                                        <serverId>ecomp-staging</serverId>
                                </configuration>
                        </plugin>               
+               <plugin>
+            <groupId>org.sonarsource.scanner.maven</groupId>
+            <artifactId>sonar-maven-plugin</artifactId>
+            <version>3.2</version>
+        </plugin>
+               <!-- Jacoco -->
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.7.201606060606</version>
-                               <configuration>
-                                       <dumpOnExit>true</dumpOnExit>
-                                       <includes>
-                                               <include>org.onap.aaf.*</include>
-                                       </includes>
-                               </configuration>
+                               <!-- Override OParent version -->
+                               <version>${jacocoVersion}</version>
                                <executions>
+                                       <!-- disable jacoco executions from oparent -->
                                        <execution>
                                                <id>pre-unit-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>post-unit-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>pre-integration-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>post-integration-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <!-- Order matters -->
+                                       <execution>
+                                               <id>portal-prepare-agent</id>
                                                <goals>
                                                        <goal>prepare-agent</goal>
                                                </goals>
                                                <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-                                                       <!-- <append>true</append> -->
+                                                       <destFile>${sonar.jacoco.reportPath}</destFile>
                                                </configuration>
                                        </execution>
+                                       <!-- offline instrumentation for PowerMock -->
                                        <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>pre-integration-test</phase>
+                                               <id>portal-offline-instrument</id>
                                                <goals>
-                                                       <goal>prepare-agent</goal>
+                                                       <goal>instrument</goal>
+                                               </goals>
+                                       </execution>
+                                       <execution>
+                                               <id>portal-restore-instrumented-classes</id>
+                                               <phase>test</phase>
+                                               <goals>
+                                                       <goal>restore-instrumented-classes</goal>
+                                               </goals>
+                                       </execution>
+                                       <execution>
+                                               <id>portal-post-unit-test</id>
+                                               <phase>test</phase>
+                                               <goals>
+                                                       <goal>report</goal>
                                                </goals>
                                                <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
-                                                       <!-- <append>true</append> -->
+                                                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
+                                                       <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
                                                </configuration>
                                        </execution>
-                                       <execution>
-                        <goals>
-                            <goal>merge</goal>
-                        </goals>
-                        <phase>post-integration-test</phase>
-                        <configuration>
-                            <fileSets>
-                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
-                                    <directory>${project.build.directory}/coverage-reports</directory>
-                                    <includes>
-                                        <include>*.exec</include>
-                                    </includes>
-                                </fileSet>
-                            </fileSets>
-                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
-                        </configuration>
-                    </execution>
                                </executions>
                        </plugin>
+
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <configuration>
+                                       <systemPropertyVariables>
+                                               <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
+                                       </systemPropertyVariables>
+                               </configuration>
+                       </plugin>
                        </plugins>
                </pluginManagement>
        </build>

diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml
index d9a77ee..8178a75 100644 (file)
--- a/misc/rosetta/pom.xml
+++ b/misc/rosetta/pom.xml
@@ -70,15 +70,13 @@
        </developers>
 
        <properties>
-               <!--  SONAR  -->
-                <jacoco.version>0.7.7.201606060606</jacoco.version>
-           <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-           <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-           <!-- Default Sonar configuration -->
-           <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-           <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+       <jacocoVersion>0.7.6.201602180812</jacocoVersion>
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <encoding>UTF-8</encoding>
+               <sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
+               <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
+               <enforcer.skip>true</enforcer.skip>
+               
                <nexusproxy>https://nexus.onap.org</nexusproxy>
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -123,56 +121,81 @@
                                </configuration>
                        </plugin>               
                        <plugin>
+            <groupId>org.sonarsource.scanner.maven</groupId>
+            <artifactId>sonar-maven-plugin</artifactId>
+            <version>3.2</version>
+        </plugin>
+               <!-- Jacoco -->
+                       <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.7.201606060606</version>
-                               <configuration>
-                                       <dumpOnExit>true</dumpOnExit>
-                                       <includes>
-                                               <include>org.onap.aaf.*</include>
-                                       </includes>
-                               </configuration>
+                               <!-- Override OParent version -->
+                               <version>${jacocoVersion}</version>
                                <executions>
+                                       <!-- disable jacoco executions from oparent -->
                                        <execution>
                                                <id>pre-unit-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>post-unit-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>pre-integration-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>post-integration-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <!-- Order matters -->
+                                       <execution>
+                                               <id>portal-prepare-agent</id>
                                                <goals>
                                                        <goal>prepare-agent</goal>
                                                </goals>
                                                <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-                                                       <!-- <append>true</append> -->
+                                                       <destFile>${sonar.jacoco.reportPath}</destFile>
                                                </configuration>
                                        </execution>
+                                       <!-- offline instrumentation for PowerMock -->
                                        <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>pre-integration-test</phase>
+                                               <id>portal-offline-instrument</id>
                                                <goals>
-                                                       <goal>prepare-agent</goal>
+                                                       <goal>instrument</goal>
+                                               </goals>
+                                       </execution>
+                                       <execution>
+                                               <id>portal-restore-instrumented-classes</id>
+                                               <phase>test</phase>
+                                               <goals>
+                                                       <goal>restore-instrumented-classes</goal>
+                                               </goals>
+                                       </execution>
+                                       <execution>
+                                               <id>portal-post-unit-test</id>
+                                               <phase>test</phase>
+                                               <goals>
+                                                       <goal>report</goal>
                                                </goals>
                                                <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
-                                                       <!-- <append>true</append> -->
+                                                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
+                                                       <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
                                                </configuration>
                                        </execution>
-                                       <execution>
-                        <goals>
-                            <goal>merge</goal>
-                        </goals>
-                        <phase>post-integration-test</phase>
-                        <configuration>
-                            <fileSets>
-                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
-                                    <directory>${project.build.directory}/coverage-reports</directory>
-                                    <includes>
-                                        <include>*.exec</include>
-                                    </includes>
-                                </fileSet>
-                            </fileSets>
-                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
-                        </configuration>
-                    </execution>
                                </executions>
                        </plugin>
+
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <configuration>
+                                       <systemPropertyVariables>
+                                               <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
+                                       </systemPropertyVariables>
+                               </configuration>
+                       </plugin>
                </plugins>
 
        </build>

diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml
index 439b0f7..a3bceb1 100644 (file)
--- a/misc/xgen/pom.xml
+++ b/misc/xgen/pom.xml
@@ -70,15 +70,13 @@
        </developers>
 
        <properties>
-               <!--  SONAR  -->
-                <jacoco.version>0.7.7.201606060606</jacoco.version>
-           <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-           <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-           <!-- Default Sonar configuration -->
-           <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-           <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+               <jacocoVersion>0.7.6.201602180812</jacocoVersion>
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <encoding>UTF-8</encoding>
+               <sonar.exclusions>**/scripts/**/*,**.js</sonar.exclusions>
+               <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
+               <enforcer.skip>true</enforcer.skip>
+               
                <nexusproxy>https://nexus.onap.org</nexusproxy>
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -107,57 +105,83 @@
                                        <serverId>ecomp-staging</serverId>
                                </configuration>
                        </plugin>               
+               <plugin>
+            <groupId>org.sonarsource.scanner.maven</groupId>
+            <artifactId>sonar-maven-plugin</artifactId>
+            <version>3.2</version>
+        </plugin>
+               
+               <!-- Jacoco -->
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.7.201606060606</version>
-                               <configuration>
-                                       <dumpOnExit>true</dumpOnExit>
-                                       <includes>
-                                               <include>org.onap.aaf.*</include>
-                                       </includes>
-                               </configuration>
+                               <!-- Override OParent version -->
+                               <version>${jacocoVersion}</version>
                                <executions>
+                                       <!-- disable jacoco executions from oparent -->
                                        <execution>
                                                <id>pre-unit-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>post-unit-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>pre-integration-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>post-integration-test</id>
+                                               <phase>none</phase>
+                                       </execution>
+                                       <!-- Order matters -->
+                                       <execution>
+                                               <id>portal-prepare-agent</id>
                                                <goals>
                                                        <goal>prepare-agent</goal>
                                                </goals>
                                                <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-                                                       <!-- <append>true</append> -->
+                                                       <destFile>${sonar.jacoco.reportPath}</destFile>
                                                </configuration>
                                        </execution>
+                                       <!-- offline instrumentation for PowerMock -->
                                        <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>pre-integration-test</phase>
+                                               <id>portal-offline-instrument</id>
                                                <goals>
-                                                       <goal>prepare-agent</goal>
+                                                       <goal>instrument</goal>
+                                               </goals>
+                                       </execution>
+                                       <execution>
+                                               <id>portal-restore-instrumented-classes</id>
+                                               <phase>test</phase>
+                                               <goals>
+                                                       <goal>restore-instrumented-classes</goal>
+                                               </goals>
+                                       </execution>
+                                       <execution>
+                                               <id>portal-post-unit-test</id>
+                                               <phase>test</phase>
+                                               <goals>
+                                                       <goal>report</goal>
                                                </goals>
                                                <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
-                                                       <!-- <append>true</append> -->
+                                                       <dataFile>${sonar.jacoco.reportPath}</dataFile>
+                                                       <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
                                                </configuration>
                                        </execution>
-                                       <execution>
-                        <goals>
-                            <goal>merge</goal>
-                        </goals>
-                        <phase>post-integration-test</phase>
-                        <configuration>
-                            <fileSets>
-                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
-                                    <directory>${project.build.directory}/coverage-reports</directory>
-                                    <includes>
-                                        <include>*.exec</include>
-                                    </includes>
-                                </fileSet>
-                            </fileSets>
-                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
-                        </configuration>
-                    </execution>
                                </executions>
                        </plugin>
+
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <configuration>
+                                       <systemPropertyVariables>
+                                               <jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
+                                       </systemPropertyVariables>
+                               </configuration>
+                       </plugin>
        </plugins>
        </build>
        

diff --git a/pom.xml b/pom.xml
index ea71cee..d54be3c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -34,15 +34,6 @@
     </parent>
        
        <properties>
-       <!--  SONAR  -->
-                <jacoco.version>0.7.7.201606060606</jacoco.version>
-           <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-           <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-           <!-- Default Sonar configuration -->
-           <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-           <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -70,68 +61,9 @@
                                </configuration>
                        </plugin>               
                <plugin>
-          <groupId>org.jacoco</groupId>
-          <artifactId>jacoco-maven-plugin</artifactId>
-          <version>${jacoco.version}</version>
-          <configuration>
-            <excludes>
-              <exclude>**/gen/**</exclude>
-              <exclude>**/generated-sources/**</exclude>
-              <exclude>**/yang-gen/**</exclude>
-              <exclude>**/pax/**</exclude>
-            </excludes>
-          </configuration>
-          <executions>
-
-            <execution>
-              <id>pre-unit-test</id>
-              <goals>
-                <goal>prepare-agent</goal>
-              </goals>
-              <configuration>
-                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                <propertyName>surefireArgLine</propertyName>
-              </configuration>
-            </execution>
-            
-       
-            <execution>
-              <id>post-unit-test</id>
-              <phase>test</phase>
-              <goals>
-                <goal>report</goal>
-              </goals>
-              <configuration>
-                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-              </configuration>
-            </execution>
-            <execution>
-              <id>pre-integration-test</id>
-              <phase>pre-integration-test</phase>
-              <goals>
-                <goal>prepare-agent</goal>
-              </goals>
-              <configuration>
-                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-
-                <propertyName>failsafeArgLine</propertyName>
-              </configuration>
-            </execution>
-
-       
-            <execution>
-              <id>post-integration-test</id>
-              <phase>post-integration-test</phase>
-              <goals>
-                <goal>report</goal>
-              </goals>
-              <configuration>
-                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-              </configuration>
-            </execution>
-          </executions>
+            <groupId>org.sonarsource.scanner.maven</groupId>
+            <artifactId>sonar-maven-plugin</artifactId>
+            <version>3.2</version>
         </plugin>
                </plugins>
     </build>