summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryangyan <yangyanyj@chinamobile.com>2020-02-20 10:17:57 +0800
committeryangyan <yangyanyj@chinamobile.com>2020-02-20 10:18:12 +0800
commitff87f75be1da187ef512e16b369acf865e15739c (patch)
treeddf8c6acc7da2d0f5ff64d909fd0cbd86c84f3a5
parent41796d3b54f6aa26ad74218425ae4ed0337fbb63 (diff)
Fix error about coverage
Change-Id: I71fdf4bf7225c16eda7113597bc652bb14cfee3d Issue-ID: VFC-1619 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
-rw-r--r--ResmanagementService/deployment/pom.xml29
-rw-r--r--pom.xml32
2 files changed, 32 insertions, 29 deletions
diff --git a/ResmanagementService/deployment/pom.xml b/ResmanagementService/deployment/pom.xml
index a7c69b4..25bc52f 100644
--- a/ResmanagementService/deployment/pom.xml
+++ b/ResmanagementService/deployment/pom.xml
@@ -28,12 +28,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <sonar.language>java</sonar.language>
- <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>
@@ -120,29 +114,6 @@
</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>
diff --git a/pom.xml b/pom.xml
index cdc68be..1d4f03d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,15 @@
<version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>vfc-nfvo-resmanagement</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <sonar.language>java</sonar.language>
+ <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>
<description>vfc nfvo resmanagement</description>
<modules>
<module>ResmanagementService</module>
@@ -67,6 +76,29 @@
</instrumentation>
</configuration>
</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>