From 2a4ae3a1454b77bd6725827f4ece1f27e9e9e244 Mon Sep 17 00:00:00 2001
From: Andreas Beeker <kiwiwings@apache.org>
Date: Sun, 1 Dec 2019 11:42:09 +0000
Subject: Update Jacoco version and activate it again in the Sonar run

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1870671 13f79535-47bb-0310-9956-ffa450edef68
---
 jenkins/create_jobs.groovy | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'jenkins')

diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy
index a21eae3480..5ce9bf7e1c 100644
--- a/jenkins/create_jobs.groovy
+++ b/jenkins/create_jobs.groovy
@@ -128,8 +128,6 @@ def apicheckDesc = '''
 </p>
 '''
 
-def sonarOptions = '-Dsonar.projectKey=poi-parent -Dsonar.organization=apache -Dsonar.host.url=https://sonarcloud.io '
-
 def sonarDesc = '''
 <p>
 <b><a href="lastSuccessfulBuild/findbugsResult/" target="_blank">Findbugs report of latest build</a></b> -
@@ -295,7 +293,11 @@ poijobs.each { poijob ->
                 */
                 maven {
                     if (poijob.sonar) {
-                        goals('compile sonar:sonar -Dsonar.login=${POI_SONAR_TOKEN} ' + sonarOptions)
+                        goals('clean package sonar:sonar')
+                        property('sonar.host.url', 'https://sonarcloud.io')
+                        property('sonar.login', '${POI_SONAR_TOKEN}')
+                        property('sonar.projectKey', 'poi-parent')
+                        property('sonar.organization', 'apache')
                     } else {
                         goals('package')
                     }
@@ -365,7 +367,10 @@ poijobs.each { poijob ->
 
                 gradle {
                     switches('-PenableSonar')
-                    switches('-Dsonar.login=${POI_SONAR_TOKEN} ' + sonarOptions)
+                    switches('-Dsonar.host.url=https://sonarcloud.io')
+                    switches('-Dsonar.login=${POI_SONAR_TOKEN}')
+                    switches('-Dsonar.projectKey=poi-parent')
+                    switches('-Dsonar.organization=apache')
                     tasks('sonarqube')
                     useWrapper(false)
                 }
-- 
cgit v1.2.3