summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryangyan <yangyanyj@chinamobile.com>2020-02-20 16:05:06 +0800
committerYan Yang <yangyanyj@chinamobile.com>2020-02-20 08:07:19 +0000
commit709202fb8c86450570dc5b21a8e2ccff80ba1734 (patch)
tree7b91f84e4051220b8cbda21480b9caf603a8e873
parent8cad60f58560528993601cd1d76fe769678dbfff (diff)
Fix error about coverage
Change-Id: I5ddbd7846350b3f0c79906331db1f933e43f2711 Issue-ID: VFC-1619 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
-rw-r--r--zte/sfc-driver/plugin-standalone/pom.xml28
-rw-r--r--zte/sfc-driver/sfc-driver/pom.xml27
2 files changed, 28 insertions, 27 deletions
diff --git a/zte/sfc-driver/plugin-standalone/pom.xml b/zte/sfc-driver/plugin-standalone/pom.xml
index 50c6f09..b87bb53 100644
--- a/zte/sfc-driver/plugin-standalone/pom.xml
+++ b/zte/sfc-driver/plugin-standalone/pom.xml
@@ -38,11 +38,6 @@
<properties>
<packagename>sfc-driver</packagename>
- <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
- <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
- <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
- <sonar.projectVersion>${project.version}</sonar.projectVersion>
- <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
</properties>
<build>
@@ -141,28 +136,7 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>report</id>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <dataFile>${project.build.directory}/code-coverage/jacoco.exec</dataFile>
- <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
+
<!--<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/zte/sfc-driver/sfc-driver/pom.xml b/zte/sfc-driver/sfc-driver/pom.xml
index 41d01d2..dbf1e74 100644
--- a/zte/sfc-driver/sfc-driver/pom.xml
+++ b/zte/sfc-driver/sfc-driver/pom.xml
@@ -36,6 +36,11 @@
<swagger.version>1.5.3</swagger.version>
<junit.version>4.11</junit.version>
<powermock.version>1.6.6</powermock.version>
+ <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+ <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+ <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
+ <sonar.projectVersion>${project.version}</sonar.projectVersion>
+ <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
</properties>
@@ -261,6 +266,28 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>report</id>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <dataFile>${project.build.directory}/code-coverage/jacoco.exec</dataFile>
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>