[jspwiki] branch master updated: Enable SonarQube multi-branch analysis

[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 5566318  Enable SonarQube multi-branch analysis
5566318 is described below

commit 55663183aef1eba1bcef3804f101f9e3684a0282
Author: Juan Pablo Santos Rodríguez <juanpablo.san...@gmail.com>
AuthorDate: Sat Apr 24 20:45:45 2021 +0200

    Enable SonarQube multi-branch analysis
---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c8e3bae..b059b7b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -118,7 +118,7 @@ def buildJSPWiki( buildOpts = '' ) {
     withMaven( jdk: buildJdk, maven: buildMvn, publisherStrategy: 'EXPLICIT', 
options: [ jacocoPublisher(), junitPublisher() ] ) {
         withCredentials( [ string( credentialsId: 'sonarcloud-jspwiki', 
variable: 'SONAR_TOKEN' ) ] ) {
             def masterBranchOptions = ""
-            def sonarOptions = "-Dsonar.projectKey=jspwiki-builder 
-Dsonar.organization=apache -Dsonar.host.url=https://sonarcloud.io 
-Dsonar.login=$SONAR_TOKEN"
+            def sonarOptions = "-Dsonar.projectKey=jspwiki-builder 
-Dsonar.organization=apache -Dsonar.branch.name=${env.BRANCH_NAME} 
-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 package 
org.jacoco:jacoco-maven-plugin:report sonar:sonar $sonarOptions $buildOpts"
         }