From: Andreas Beeker <kiwiwings@apache.org>
Date: Tue, 12 Nov 2019 22:50:30 +0000 (+0000)
Subject: migrate to sonarcloud.io
X-Git-Tag: REL_4_1_2~141
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a77baf31dc22e10ad536177abdbc1ddabe588d0b;p=poi.git

migrate to sonarcloud.io

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1869712 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build.gradle b/build.gradle
index 85faeb64e2..c95eae0360 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,8 +20,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.2'	// 2.x requires Gradle >=4
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.5"
+        classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.2.8'	// 2.x requires Gradle >=4
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8"
     }
 }
 
diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy
index c1c3c58246..b130deb5aa 100644
--- a/jenkins/create_jobs.groovy
+++ b/jenkins/create_jobs.groovy
@@ -135,6 +135,8 @@ 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> -
@@ -297,7 +299,9 @@ poijobs.each { poijob ->
                 */
                 maven {
                     if(poijob.sonar) {
-                        goals('compile $SONAR_MAVEN_GOAL -Dsonar.host.url=$SONAR_HOST_URL')
+                        withCredentials([string(credentialsId: 'sonarcloud-poi', variable: 'SONAR_TOKEN')]) {
+                            goals('compile sonar:sonar -Dsonar.login=${SONAR_TOKEN} ' + sonarOptions)
+                        }
                     } else {
                         goals('package')
                     }
@@ -364,11 +368,13 @@ poijobs.each { poijob ->
         } else if(poijob.sonar) {
             steps {
                 shellEx(delegate, shellcmds, poijob)
-                gradle {
-                    switches('-PenableSonar')
-                    switches('-Dsonar.host.url=$SONAR_HOST_URL')
-                    tasks('sonarqube')
-                    useWrapper(false)
+                withCredentials([string(credentialsId: 'sonarcloud-poi', variable: 'SONAR_TOKEN')]) {
+                    gradle {
+                        switches('-PenableSonar')
+                        switches('-Dsonar.login=${SONAR_TOKEN} ' + sonarOptions)
+                        tasks('sonarqube')
+                        useWrapper(false)
+                    }
                 }
             }
             publishers {