[jspwiki] branch master updated: jacoco report generation must be run after tests

[juanpablo]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git


The following commit(s) were added to refs/heads/master by this push:
     new 53f18f1  jacoco report generation must be run after tests
53f18f1 is described below

commit 53f18f1e79754f7cee674c142abc7abf46e0437a
Author: Juan Pablo Santos Rodríguez <juanpa...@apache.org>
AuthorDate: Fri Jan 10 13:58:25 2020 +0100

    jacoco report generation must be run after tests
    
    and before sonarqube analysis
---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 71e3202..8e21904 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,7 +39,7 @@ try {
                     withCredentials( [ string( credentialsId: 
'sonarcloud-jspwiki', variable: 'SONAR_TOKEN' ) ] ) {
                         def sonarOptions = "-Dsonar.projectKey=jspwiki-builder 
-Dsonar.organization=apache -Dsonar.host.url=https://sonarcloud.io 
-Dsonar.login=$SONAR_TOKEN"
                         echo 'Will use SonarQube instance at 
https://sonarcloud.io'
-                        sh "mvn clean 
org.jacoco:jacoco-maven-plugin:prepare-agent 
org.jacoco:jacoco-maven-plugin:report install -Pattach-additional-artifacts 
sonar:sonar -up $sonarOptions"
+                        sh "mvn clean 
org.jacoco:jacoco-maven-plugin:prepare-agent install 
org.jacoco:jacoco-maven-plugin:report -Pattach-additional-artifacts sonar:sonar 
-up $sonarOptions"
                     }
                     pom = readMavenPom file: 'pom.xml'
                     writeFile file: 'target/classes/apidocs.txt', text: 'file 
created in order to allow aggregated javadoc generation, target/classes is 
needed for all modules'
@@ -101,4 +101,4 @@ try {
                  to: 'commits@jspwiki.apache.org',
                  subject: "[${env.JOB_NAME}] build ${env.BUILD_DISPLAY_NAME} - 
${currentBuild.result}"
     }
-}
\ No newline at end of file
+}