summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2020-01-20 09:41:21 -0500
committerPamela Dragosh <pdragosh@research.att.com>2020-01-20 09:41:26 -0500
commit37da84e2a40f7f39fe73fa2ceb6a7166618e9ddb (patch)
tree00db85bba572fb59a61193e405ea2cd0b489b508
parentc759d77215e443f766b1bb2fb4b904153d397e57 (diff)
First sonar update
Just updating this way gets apex to around 79%, which passes. Previously around 80%, when JDK11 is done I will fix it up and hopefully we will get it back to over 80%. Issue-ID: POLICY-2321 Change-Id: If3440e8c8c71f858adcc3f1b349da4e1048f8464 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
-rw-r--r--pom.xml83
1 files changed, 2 insertions, 81 deletions
diff --git a/pom.xml b/pom.xml
index 08123f770..2801f5543 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,12 +50,8 @@
<version.jgroups>4.1.5.Final</version.jgroups>
<version.commons-codec>20041127.091804</version.commons-codec>
<version.caffeine>2.8.0</version.caffeine>
- <!-- 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>
</properties>
<distributionManagement>
@@ -759,81 +755,6 @@
</profile>
</profiles>
- <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>
- </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>
-
<modules>
<module>model</module>
<module>context</module>