Jenkins DSL: Use sonar-task and sonar.token instead of sonar.login

This removes some build-warnings

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

diff --git a/build.gradle b/build.gradle
index a65d17c6a6834f4bf192e341282369d40eab9bc7..e9ed362c54566c1650ac4d5ceb857b68cab7a147 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -468,7 +468,7 @@ subprojects {
         //
         // Some additional properties are currently set in the Jenkins-DSL, see jenkins/create_jobs.groovy
         //
-        sonarqube {
+        sonar {
             properties {
                 // as we currently use build/<module>/ as project-basedir, we need to tell Sonar to use
                 // the root-folder as "basedir" for the projects

diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy
index 7182db18529b473cee0ea29913d9758f362a600f..e2b6ad63d76564b935eaa88777ad54a12b8828f0 100644 (file)
--- a/jenkins/create_jobs.groovy
+++ b/jenkins/create_jobs.groovy
@@ -366,7 +366,7 @@ poijobs.each { poijob ->
 
                 gradle {
                     switches('-PenableSonar')
-                    switches('-Dsonar.login=${POI_SONAR_TOKEN}')
+                    switches('-Dsonar.token=${POI_SONAR_TOKEN}')
                     switches('-Dsonar.organization=apache')
                     switches('-Dsonar.projectKey=poi-parent')
                     switches('-Dsonar.host.url=https://sonarcloud.io')
@@ -377,7 +377,7 @@ poijobs.each { poijob ->
                     tasks('clean')
                     tasks('check')
                     tasks('jacocoTestReport')
-                    tasks('sonarqube')
+                    tasks('sonar')
                     useWrapper(true)
                 }
             }
@@ -564,7 +564,7 @@ xmlbeansjobs.each { xjob ->
             gradle {
                 if (xjob.sonar) {
                     switches('-PenableSonar')
-                    switches('-Dsonar.login=${POI_SONAR_TOKEN}')
+                    switches('-Dsonar.token=${POI_SONAR_TOKEN}')
                     switches('-Dsonar.organization=apache')
                     switches('-Dsonar.projectKey=apache_xmlbeans')
                     switches('-Dsonar.host.url=https://sonarcloud.io')
@@ -577,7 +577,7 @@ xmlbeansjobs.each { xjob ->
                 tasks('jenkins')
                 tasks('jacocoTestReport')
                 if (xjob.sonar) {
-                    tasks('sonarqube')
+                    tasks('sonar')
                 }
                 useWrapper(true)
             }