diff options
| author |   Sai Gandham <sg481n@att.com> | 2018-04-03 01:57:59 -0500 |
|---|---|---|
| committer | Sai Gandham <sg481n@att.com> | 2018-04-03 02:18:22 -0500 |
| commit | d97041c12ad87a4861557200f502b094e1b08535 (patch) | |
| tree | c3fff6d6008ace360c81036ab6c7de9c166394df /cadi/pom.xml | |
| parent | d568474a9f0876e813fbb911d2508fb6ed9aa111 (diff) | |
Fix sonar issues & modify deploy property
Added oparent on submodule parent pom's.
Add license to missing java files.
Issue-ID: AAF-208
Change-Id: I1d5efe8f91e2bc60af8b2cec67f31d511b44b62c
Signed-off-by: Sai Gandham <sg481n@att.com>
Diffstat (limited to 'cadi/pom.xml')
| -rw-r--r-- | cadi/pom.xml | 121 |
1 files changed, 69 insertions, 52 deletions
diff --git a/cadi/pom.xml b/cadi/pom.xml index 81708a4d..5c72f5bc 100644 --- a/cadi/pom.xml +++ b/cadi/pom.xml @@ -31,7 +31,11 @@ </organization> <packaging>pom</packaging> - + <parent> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>1.1.0</version> + </parent> <properties> <skipSigning>true</skipSigning> @@ -330,7 +334,7 @@ <artifactId>maven-deploy-plugin</artifactId> <version>2.8.1</version> <configuration> - <skip>true</skip> + <skip>false</skip> </configuration> </plugin> @@ -393,56 +397,69 @@ </configuration> </plugin> <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> - <executions> - <execution> - <id>pre-unit-test</id> - <goals> - <goal>prepare-agent</goal> - </goals> - <configuration> - <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile> - <!-- <append>true</append> --> - </configuration> - </execution> - <execution> - <id>pre-integration-test</id> - <phase>pre-integration-test</phase> - <goals> - <goal>prepare-agent</goal> - </goals> - <configuration> - <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile> - <!-- <append>true</append> --> - </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> + <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> + </plugin> </plugins> </pluginManagement> </build> |