aboutsummaryrefslogtreecommitdiffstats
path: root/jenkins
diff options
context:
space:
mode:
authorAndreas Beeker <kiwiwings@apache.org>2019-12-01 11:42:09 +0000
committerAndreas Beeker <kiwiwings@apache.org>2019-12-01 11:42:09 +0000
commit2a4ae3a1454b77bd6725827f4ece1f27e9e9e244 (patch)
tree49021983f6434f03a1c7b68cf2168462bcfb1265 /jenkins
parenta17a9168b112a1d7df99d3aa4bc054528c680133 (diff)
downloadpoi-2a4ae3a1454b77bd6725827f4ece1f27e9e9e244.tar.gz
poi-2a4ae3a1454b77bd6725827f4ece1f27e9e9e244.zip
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
Diffstat (limited to 'jenkins')
-rw-r--r--jenkins/create_jobs.groovy13
1 files changed, 9 insertions, 4 deletions
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)
}