Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-core-apiservice/pom.xml

@@ -227,6 +227,41 @@
                     <useDefaultDelimiters>true</useDefaultDelimiters>
                 </configuration>
             </plugin>
+
+            <!-- TestNG 单元测试相关插件 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </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-aggregate</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>report-aggregate</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
         <!-- 资源文件位置描述 -->
         <sourceDirectory>src/main/java</sourceDirectory>

pom.xml

@@ -33,6 +33,7 @@
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
         <maven-scm-plugin.version>1.9.5</maven-scm-plugin.version>
+        <jacoco.version>0.8.4</jacoco.version>
         <skipTests>true</skipTests>
         <app.charset>UTF-8</app.charset>
         <app.jdk.version>1.8</app.jdk.version>
@@ -325,9 +326,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <skip>${skipTests}</skip>
-                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco.version}</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

sonar-project.properties

@@ -14,4 +14,10 @@ sonar.projectVersion=1.0-DEV-SNAPSHOT
 #sonar.java.binaries=target
  
 # Encoding of the source code. Default is default system encoding
-sonar.sourceEncoding=UTF-8
+sonar.sourceEncoding=UTF-8
+
+sonar.java.coveragePlugin=jacoco
+sonar.jacoco.reportPaths=$WORKSPACE/modules/i3plus-core-apiservice/target/jacoco.exec
+sonar.junit.reportPaths=$WORKSPACE/modules/i3plus-core-apiservice/target/surefire-reports
+sonar.surefire.reportsPath=$WORKSPACE/modules/i3plus-core-apiservice/target/surefire-reports
+sonar.dynamicAnalysis=reuseReports