You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/09/28 23:41:14 UTC
[skywalking] branch master updated: Try to bring coverall test
coverage comments back (#3503)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 116f50e Try to bring coverall test coverage comments back (#3503)
116f50e is described below
commit 116f50ee82b280e141b9bc47841e5742bcecc3e7
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Sun Sep 29 07:41:04 2019 +0800
Try to bring coverall test coverage comments back (#3503)
* Try to bring coverall test coverage comments back
* Remove suspicious rule
* Sync
* Try checkout submodule
* Update labeler.yml
* Update labeler.yml
* Update labeler.yml
* Update labeler.yml
* Rebase
* Remove jmh annotation processor
* Update README.md
* Replace with placeholder and remove Coverall badge in README
* Exclude generated classes from coverage analysis
---
Jenkinsfile | 2 +-
pom.xml | 47 ++++++++++++++++++++++++++---------------------
2 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 86d4fa2..673bc66 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -63,7 +63,7 @@ pipeline {
stage('Test & Report') {
steps {
- sh './mvnw -P"agent,backend,ui,dist,CI-with-IT" org.jacoco:jacoco-maven-plugin:0.8.3:prepare-agent clean install org.jacoco:jacoco-maven-plugin:0.8.3:report'
+ sh './mvnw -P"agent,backend,ui,dist,CI-with-IT" -DrepoToken=${COVERALLS_REPO_TOKEN} -DpullRequest=${ghprbPullLink} clean cobertura:cobertura verify coveralls:report install'
sh './mvnw javadoc:javadoc -Dmaven.test.skip=true'
}
}
diff --git a/pom.xml b/pom.xml
index f346a0d..7ae2edb 100755
--- a/pom.xml
+++ b/pom.xml
@@ -204,9 +204,9 @@
<versions-maven-plugin.version>2.5</versions-maven-plugin.version>
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
- <jacoco-maven-plugin.version>0.8.3</jacoco-maven-plugin.version>
<jmh.version>1.21</jmh.version>
<gmaven-plugin.version>1.5</gmaven-plugin.version>
+ <cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
</properties>
<dependencies>
@@ -237,12 +237,6 @@
<version>${jmh.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.openjdk.jmh</groupId>
- <artifactId>jmh-generator-annprocess</artifactId>
- <version>${jmh.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<dependencyManagement>
@@ -479,26 +473,13 @@
<artifactId>coveralls-maven-plugin</artifactId>
<version>${coveralls-maven-plugin.version}</version>
<configuration>
- <repoToken>xFwR2GqmxcMxV7tGEpW2NfwIrbCD4cQCS</repoToken>
+ <repoToken>${COVERALLS_REPO_TOKEN}</repoToken>
<sourceDirectories>
<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
</sourceDirectories>
</configuration>
</plugin>
<plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco-maven-plugin.version}</version>
- <executions>
- <execution>
- <id>prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven-checkstyle-plugin.version}</version>
<configuration>
@@ -518,6 +499,7 @@
**/*.xml
</resourceIncludes>
<excludes>
+ **/target/generated-test-sources/**,
org/apache/skywalking/apm/network/register/v2/**/*.java,
org/apache/skywalking/apm/network/common/**/*.java,
org/apache/skywalking/apm/network/servicemesh/**/*.java,
@@ -538,6 +520,29 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>${cobertura-maven-plugin.version}</version>
+ <configuration>
+ <check/>
+ <aggregate>true</aggregate>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <quiet>true</quiet>
+ <format>xml</format>
+ <instrumentation>
+ <ignoreTrivial>true</ignoreTrivial>
+ <ignoreMethodAnnotations>
+ <ignoreMethodAnnotation>lombok.Generated</ignoreMethodAnnotation>
+ </ignoreMethodAnnotations>
+ <excludes>
+ <exclude>org/apache/skywalking/**/*Test.class</exclude>
+ <exclude>org/apache/skywalking/**/Test*.class</exclude>
+ <exclude>**/generated-sources/**</exclude>
+ </excludes>
+ </instrumentation>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>