diff options
| author |   Sai Gandham <sg481n@att.com> | 2018-04-01 16:42:58 -0500 |
|---|---|---|
| committer | Sai Gandham <sg481n@att.com> | 2018-04-01 17:00:10 -0500 |
| commit | 372e251380abf42627b72d939aba5e5e310bd31f (patch) | |
| tree | c5ff267463f1b37f6c434895a6e5bbd1b92d428f /misc/xgen | |
| parent | 1eb6678db673759f0f95b1aedfcb4fe55c7152a2 (diff) | |
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>
Diffstat (limited to 'misc/xgen')
| -rw-r--r-- | misc/xgen/pom.xml | 104 |
1 files changed, 64 insertions, 40 deletions
diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml index 439b0f76..a3bceb10 100644 --- 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> |