aboutsummaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2020-01-20 15:26:22 +0000
committerGerrit Code Review <gerrit@onap.org>2020-01-20 15:26:22 +0000
commit8c9a29a362e29db4ba81107b1c75c0aba467b7ae (patch)
treeda8f97a614cb70055f1f7ea99436c3e17155cc2c /pom.xml
parentcd581961a71e2723e66d77adce8a74819a2b15b1 (diff)
parentbc03dc1edf6016cf6d6dafdb531c27ccd0dfb348 (diff)
Merge "Update sonar config"
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml78
1 files changed, 2 insertions, 76 deletions
diff --git a/pom.xml b/pom.xml
index 9bd490ea..c01fb43f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,12 +40,8 @@
<description>Code that implements our integration with SDC service distribution API.</description>
<properties>
- <!-- sonar/jacoco overrides -->
- <!-- Overriding oparent default sonar/jacoco settings Combine all our reports
- into one file shared across sub-modules -->
- <sonar.jacoco.reportPath>${project.basedir}/../target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
- <sonar.jacoco.itReportPath>${project.basedir}/../target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
- <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
+ <!-- Default Sonar configuration -->
+ <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
<policy.common.version>1.6.1</policy.common.version>
<policy.engine.version>1.6.0-SNAPSHOT</policy.engine.version>
@@ -92,32 +88,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>pre-unit-test</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <destFile>${sonar.jacoco.reportPath}</destFile>
- <append>true</append>
- </configuration>
- </execution>
- <execution>
- <id>post-unit-test</id>
- <phase>test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <dataFile>${sonar.jacoco.reportPath}</dataFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<executions>
<execution>
@@ -154,49 +124,5 @@
</dependencies>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco.version}</version>
- <configuration>
- <!-- Note: This exclusion list should match <sonar.exclusions> property
- above -->
- <excludes>
- <exclude>**/gen/**</exclude>
- <exclude>**/generated-sources/**</exclude>
- <exclude>**/yang-gen/**</exclude>
- <exclude>**/pax/**</exclude>
- </excludes>
- </configuration>
- <executions>
- <!-- Prepares the property pointing to the JaCoCo runtime agent which
- is passed as VM argument when Maven the Surefire plugin is executed. -->
- <execution>
- <id>pre-unit-test</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <destFile>${sonar.jacoco.reportPath}</destFile>
- </configuration>
- </execution>
- <!-- Ensures that the code coverage report for unit tests is created
- after unit tests have been run. -->
- <execution>
- <id>post-unit-test</id>
- <phase>test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <dataFile>${sonar.jacoco.reportPath}</dataFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>