Author: centic
Date: Tue Feb 20 21:09:44 2024
New Revision: 1915908

URL: http://svn.apache.org/viewvc?rev=1915908&view=rev
Log:
Jenkins DSL: Use sonar-task and sonar.token instead of sonar.login

This removes some build-warnings

Modified:
    poi/trunk/build.gradle
    poi/trunk/jenkins/create_jobs.groovy

Modified: poi/trunk/build.gradle
URL: 
http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1915908&r1=1915907&r2=1915908&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Tue Feb 20 21:09:44 2024
@@ -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

Modified: poi/trunk/jenkins/create_jobs.groovy
URL: 
http://svn.apache.org/viewvc/poi/trunk/jenkins/create_jobs.groovy?rev=1915908&r1=1915907&r2=1915908&view=diff
==============================================================================
--- poi/trunk/jenkins/create_jobs.groovy (original)
+++ poi/trunk/jenkins/create_jobs.groovy Tue Feb 20 21:09:44 2024
@@ -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)
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to