diff --git a/Jenkinsfile b/Jenkinsfile index 86d4fa286..673bc6639 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 f346a0db1..7ae2edb55 100755 --- a/pom.xml +++ b/pom.xml @@ -204,9 +204,9 @@ 2.5 4.3.0 3.1.0 - 0.8.3 1.21 1.5 + 2.7 @@ -237,12 +237,6 @@ ${jmh.version} test - - org.openjdk.jmh - jmh-generator-annprocess - ${jmh.version} - test - @@ -479,25 +473,12 @@ coveralls-maven-plugin ${coveralls-maven-plugin.version} - xFwR2GqmxcMxV7tGEpW2NfwIrbCD4cQCS + ${COVERALLS_REPO_TOKEN} ${project.build.sourceDirectory} - - org.jacoco - jacoco-maven-plugin - ${jacoco-maven-plugin.version} - - - prepare-agent - - prepare-agent - - - - maven-checkstyle-plugin ${maven-checkstyle-plugin.version} @@ -518,6 +499,7 @@ **/*.xml + **/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 @@ + + org.codehaus.mojo + cobertura-maven-plugin + ${cobertura-maven-plugin.version} + + + true + ${project.build.sourceEncoding} + true + xml + + true + + lombok.Generated + + + org/apache/skywalking/**/*Test.class + org/apache/skywalking/**/Test*.class + **/generated-sources/** + + + +