SONAR-17593 Rename gradle task and extension from 'sonarqube' to 'sonar'

build.gradle

@@ -10,7 +10,7 @@ plugins {
   id "de.undercouch.download" version "5.0.1" apply false
   id 'io.spring.dependency-management' version '1.0.11.RELEASE'
   id "org.cyclonedx.bom" version "1.6.1" apply false
-  id 'org.sonarqube' version '3.4.0.2513'
+  id 'org.sonarqube' version '3.5.0.2730'
 }
 
 if (!JavaVersion.current().java11Compatible) {
@@ -123,7 +123,7 @@ allprojects {
 }
 
 apply plugin: 'org.sonarqube'
-sonarqube {
+sonar {
     properties {
         property 'sonar.projectName', projectTitle
         property 'sonar.projectVersion', "${versionInSources}-SNAPSHOT"
@@ -158,7 +158,7 @@ subprojects {
     protobufVersion = '3.21.7'
   }
 
-  sonarqube {
+  sonar {
     properties {
       property 'sonar.moduleKey', project.group + ':' + project.name
     }

plugins/build.gradle

@@ -1,3 +1,3 @@
-sonarqube {
+sonar {
   skipProject = true
 }

server/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Server :: Parent"
   }

server/sonar-ce-common/build.gradle

@@ -1,6 +1,6 @@
 description = 'Code relating to the Compute Engine shared between the Compute Engine and the Web Server'
 
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Compute Engine :: Common"
   }

server/sonar-ce-task-projectanalysis/build.gradle

@@ -1,6 +1,6 @@
 description = 'Code of the Compute Engine task processing project analysis reports'
 
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Compute Engine :: Task :: Project Analysis"
   }

server/sonar-ce-task/build.gradle

@@ -1,6 +1,6 @@
 description = 'Definition of a Compute Engine task and utility "framework" and classes to code one'
 
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Compute Engine :: Task"
   }

server/sonar-ce/build.gradle

@@ -1,6 +1,6 @@
 description = 'Compute Engine JVM application'
 
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Compute Engine"
   }

server/sonar-db-core/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Database Core"
   }

server/sonar-db-dao/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: DAO"
   }

server/sonar-db-migration/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Database Migration"
   }

server/sonar-docs/build.gradle

@@ -8,7 +8,7 @@ Pattern PLUGIN_NAME_PATTERN = Pattern.compile("(sonar-.*-plugin)(.*)")
  * This module is building the zip file containing the static web site
  */
 
-sonarqube {
+sonar {
   skipProject = true
 }
 

server/sonar-docs/src/pages/analysis/bitbucket-cloud-integration.md

@@ -104,7 +104,7 @@ Click the scanner you're using below to expand the example configuration:
 |           - gradle
 |           - sonar
 |         script:
-|           - bash ./gradlew sonarqube
+|           - bash ./gradlew sonar
 |   caches:
 |     sonar: ~/.sonar
 |
@@ -301,4 +301,4 @@ SonarQube can also report your Quality Gate status to Bitbucket Cloud pull reque
 
 ## Authenticating with Bitbucket Cloud
 
-See [Authenticating with Bitbucket Cloud](/instance-administration/authentication/bitbucket-cloud/) 
+See [Authenticating with Bitbucket Cloud](/instance-administration/authentication/bitbucket-cloud/) 

server/sonar-docs/src/pages/analysis/github-integration.md

@@ -216,7 +216,7 @@ Click the scanner you're using below to expand the example configuration:
 |           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
 |           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 |           SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
-|         run: ./gradlew build sonarqube --info 
+|         run: ./gradlew build sonar --info 
 | ```
 
 
@@ -416,4 +416,3 @@ Initially, all issues marked **Open** on SonarQube are marked **Open** on GitHub
 |Dismiss: Used in tests|Resolve (Won't Fix)|
 |Dismiss: Won't fix|Resolve (Won't Fix)|
 	
-	

server/sonar-docs/src/pages/analysis/scan/sonarscanner-for-gradle.md

@@ -11,9 +11,9 @@ url: /analysis/scan/sonarscanner-for-gradle/
 | See the [online documentation](https://redirect.sonarsource.com/doc/download-scanner-gradle.html) to get more details on the latest version of the scanner and how to download it.
 <!-- /embedded -->
 
-The SonarScanner for Gradle provides an easy way to start SonarQube analysis of a Gradle project.
+The SonarScanner for Gradle provides an easy way to start the scan of a Gradle project.
 
-The ability to execute the SonarQube analysis via a regular Gradle task makes it available anywhere Gradle is available (developer build, CI server, etc.), without the need to manually download, setup, and maintain a SonarQube Runner installation. The Gradle build already has much of the information needed for SonarQube to successfully analyze a project. By preconfiguring the analysis based on that information, the need for manual configuration is reduced significantly. 
+The ability to execute the SonarScanner analysis via a regular Gradle task makes it available anywhere Gradle is available (developer build, CI server, etc.), without the need to manually download, setup, and maintain a SonarScanner CLI installation. The Gradle build already has much of the information needed for the SonarScanner to successfully analyze a project. By preconfiguring the analysis based on that information, the need for manual configuration is reduced significantly. 
 
 ## Prerequisites
 * Gradle versions 5+
@@ -42,14 +42,14 @@ Ensure that you declare the plugins in the correct sequence required by Gradle,
 
 Assuming a local SonarQube server with out-of-the-box settings is up and running, no further configuration is required.
 
-You need to pass an [authentication token](/user-guide/user-token/) using the `sonar.login` property in your command line or you configure it as part of your `gradle.properties` file. Execute `gradle sonarqube -Dsonar.login=yourAuthenticationToken` and wait until the build has completed, then open the web page indicated at the bottom of the console output. You should now be able to browse the analysis results. 
+You need to pass an [authentication token](/user-guide/user-token/) using the `sonar.login` property in your command line or you configure it as part of your `gradle.properties` file. Execute `gradle sonar -Dsonar.login=yourAuthenticationToken` and wait until the build has completed, then open the web page indicated at the bottom of the console output. You should now be able to browse the analysis results. 
 
 ## Analyzing Multi-Project Builds
-To analyze a project hierarchy, apply the SonarQube plugin to the root project of the hierarchy. Typically (but not necessarily) this will be the root project of the Gradle build. Information pertaining to the analysis as a whole has to be configured in the sonarqube block of this project. Any properties set on the command line also apply to this project.
+To analyze a project hierarchy, apply the SonarQube plugin to the root project of the hierarchy. Typically (but not necessarily) this will be the root project of the Gradle build. Information pertaining to the analysis as a whole has to be configured in the sonar block of this project. Any properties set on the command line also apply to this project.
 
 ```
 // build.gradle
-sonarqube {
+sonar {
     properties {
         property "sonar.sourceEncoding", "UTF-8"
     }
@@ -60,7 +60,7 @@ Configuration shared between subprojects can be configured in a subprojects bloc
 ```
 // build.gradle
 subprojects {
-    sonarqube {
+    sonar {
         properties {
             property "sonar.sources", "src"
         }
@@ -68,35 +68,35 @@ subprojects {
 }
 ```
 
-Project-specific information is configured in the `sonarqube` block of the corresponding project.
+Project-specific information is configured in the `sonar` block of the corresponding project.
 ```
 // build.gradle
 project(":project1") {
-    sonarqube {
+    sonar {
         properties {
             property "sonar.branch", "Foo"
         }
     }}
 ```
 
-To skip SonarQube analysis for a particular subproject, set sonarqube.skipProject to true.
+To skip SonarScanner analysis for a particular subproject, set sonar.skipProject to true.
 ```
 // build.gradle
 project(":project2") {
-    sonarqube {
+    sonar {
         skipProject = true
     }
 }
 ```
 
 ## Task dependencies
-All tasks that produce output that should be included in the SonarQube analysis need to be executed before the `sonarqube` task runs. Typically, these are compile tasks, test tasks, and [code coverage](/analysis/coverage/) tasks. 
+All tasks that produce output that should be included in the SonarScanner analysis need to be executed before the `sonar` task runs. Typically, these are compile tasks, test tasks, and [code coverage](/analysis/coverage/) tasks. 
 
 Starting with v3.0 of the SonarScanner for Gradle, task dependencies are no longer added automatically. Instead, the SonarScanner plugin enforces the correct order of tasks with `mustRunAfter`. You need to be either manually run the tasks that produce output before `sonarqube`, or you can add a dependency to the build script: 
 
 ```
 // build.gradle
-project.tasks["sonarqube"].dependsOn "anotherTask"
+project.tasks["sonar"].dependsOn "anotherTask"
 ```
 
 ## Sample project
@@ -107,7 +107,7 @@ https://github.com/SonarSource/sonar-scanning-examples/tree/master/sonarqube-sca
 ## Analysis property defaults
 The SonarScanner for Gradle uses information contained in Gradle's object model to provide smart defaults for most of the standard [analysis parameters](/analysis/analysis-parameters/), as listed below.
 
-Gradle defaults for standard SonarQube properties: 
+Gradle defaults for standard Sonar properties: 
 
 Property|Gradle default
 ---|---
@@ -152,7 +152,7 @@ By default the first variant of type "debug" will be used to configure the analy
  
 ```
 build.gradle
-sonarqube {
+sonar {
     androidVariant 'fullDebug'
 }
 ```
@@ -168,23 +168,23 @@ Property|	Gradle default
 
 
 ## Passing manual properties / overriding defaults
-The SonarScanner for Gradle adds a SonarQubeExtension extension to project and its subprojects, which allows you to configure/override the analysis properties.
+The SonarScanner for Gradle adds a SonarExtension extension to project and its subprojects, which allows you to configure/override the analysis properties.
 ```
 // in build.gradle
-sonarqube {
+sonar {
     properties {
         property "sonar.exclusions", "**/*Generated.java"
     }
 }
 ```
-SonarQube properties can also be set from the command line, or by setting a system property named exactly like the SonarQube property in question. This can be useful when dealing with sensitive information (e.g. credentials), environment information, or for ad-hoc configuration.
+Sonar properties can also be set from the command line, or by setting a system property named exactly like the Sonar property in question. This can be useful when dealing with sensitive information (e.g. credentials), environment information, or for ad-hoc configuration.
  
 ```
-gradle sonarqube -Dsonar.host.url=http://sonar.mycompany.com -Dsonar.verbose=true
+gradle sonar -Dsonar.host.url=http://sonar.mycompany.com -Dsonar.verbose=true
 ```
 
 While certainly useful at times, we recommend keeping the bulk of the configuration in a (versioned) build script, readily available to everyone.
-A SonarQube property value set via a system property overrides any value set in a build script (for the same property). When analyzing a project hierarchy, values set via system properties apply to the root project of the analyzed hierarchy. Each system property starting with `sonar.` will be taken into account.
+A Sonar property value set via a system property overrides any value set in a build script (for the same property). When analyzing a project hierarchy, values set via system properties apply to the root project of the analyzed hierarchy. Each system property starting with `sonar.` will be taken into account.
 
 
 
@@ -193,7 +193,7 @@ By default, the SonarScanner for Gradle passes on the project's main source set
 
 ```
 // build.gradle
-sonarqube {
+sonar {
     properties {
         properties["sonar.sources"] += sourceSets.custom.allSource.srcDirs
         properties["sonar.tests"] += sourceSets.integTest.allSource.srcDirs
@@ -202,8 +202,8 @@ sonarqube {
 ```
 
 ## Advanced topics
-### More on configuring SonarQube properties
-Let's take a closer look at the `sonarqube.properties` `{}` block. As we have already seen in the examples, the `property()` method allows you to set new properties or override existing ones. Furthermore, all properties that have been configured up to this point, including all properties preconfigured by Gradle, are available via the properties accessor.
+### More on configuring Sonar properties
+Let's take a closer look at the `sonar.properties` `{}` block. As we have already seen in the examples, the `property()` method allows you to set new properties or override existing ones. Furthermore, all properties that have been configured up to this point, including all properties preconfigured by Gradle, are available via the properties accessor.
 
 Entries in the properties map can be read and written with the usual Groovy syntax. To facilitate their manipulation, values still have their “idiomatic” type (File, List, etc.). After the sonarProperties block has been evaluated, values are converted to Strings as follows: Collection values are (recursively) converted to comma-separated Strings, and all other values are converted by calling their `toString()` methods.
 

server/sonar-main/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Main Process"
   }

server/sonar-process/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Process"
   }

server/sonar-server-common/build.gradle

@@ -1,6 +1,6 @@
 description = 'Code shared between the Web Server and the Compute Engine'
 
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Server :: Common"
   }

server/sonar-web/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property "sonar.projectName", "${projectTitle} :: Web"
     property "sonar.sources", "src/main/js"

server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/__tests__/__snapshots__/PreambuleYaml-test.tsx.snap

@@ -61,7 +61,7 @@ exports[`should render correctly for gradle 1`] = `
   id \\"org.sonarqube\\" version \\"3.5.0.2730\\"
 }
 
-sonarqube {
+sonar {
   properties {
     property \\"sonar.projectKey\\", \\"my-project\\"
   }

server/sonar-web/src/main/js/components/tutorials/github-action/commands/__tests__/__snapshots__/Gradle-test.tsx.snap

@@ -33,7 +33,7 @@ exports[`should render correctly 1`] = `
   id \\"org.sonarqube\\" version \\"3.5.0.2730\\"
 }
 
-sonarqube {
+sonar {
   properties {
     property \\"sonar.projectKey\\", \\"my-project\\"
   }
@@ -121,7 +121,7 @@ exports[`should render correctly: without branch enabled 1`] = `
   id \\"org.sonarqube\\" version \\"3.5.0.2730\\"
 }
 
-sonarqube {
+sonar {
   properties {
     property \\"sonar.projectKey\\", \\"my-project\\"
   }

server/sonar-web/src/main/js/components/tutorials/gitlabci/ProjectKeyStep.tsx

@@ -49,7 +49,7 @@ const gradleSnippet = (key: string) => `plugins {
   id "org.sonarqube" version "${GRADLE_SCANNER_VERSION}"
 }
 
-sonarqube {
+sonar {
   properties {
     property "sonar.projectKey", "${key}"
     property "sonar.qualitygate.wait", true 

server/sonar-web/src/main/js/components/tutorials/gitlabci/__tests__/__snapshots__/ProjectKeyStep-test.tsx.snap

@@ -148,7 +148,7 @@ exports[`should render correctly for build tool gradle 1`] = `
   id \\"org.sonarqube\\" version \\"3.5.0.2730\\"
 }
 
-sonarqube {
+sonar {
   properties {
     property \\"sonar.projectKey\\", \\"my-project\\"
     property \\"sonar.qualitygate.wait\\", true 

server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/__tests__/__snapshots__/Gradle-test.tsx.snap

@@ -14,7 +14,7 @@ exports[`should render correctly 1`] = `
   id \\"org.sonarqube\\" version \\"3.5.0.2730\\"
 }
 
-sonarqube {
+sonar {
   properties {
     property \\"sonar.projectKey\\", \\"my-project\\"
   }

server/sonar-web/src/main/js/components/tutorials/utils.ts

@@ -31,7 +31,7 @@ export function buildGradleSnippet(key: string) {
   id "org.sonarqube" version "${GRADLE_SCANNER_VERSION}"
 }
 
-sonarqube {
+sonar {
   properties {
     property "sonar.projectKey", "${key}"
   }

server/sonar-webserver-api/build.gradle

@@ -1,6 +1,6 @@
 description = 'SonarQube WebServer internal APIs, used by other Web Server modules or Core Extensions'
 
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: WebServer :: API"
   }

server/sonar-webserver-auth/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: WebServer :: Authentification and Identity"
   }

server/sonar-webserver-core/build.gradle

@@ -1,6 +1,6 @@
 description = 'SonarQube WebServer-only code'
 
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Web Server :: Core"
   }

server/sonar-webserver-es/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: WebServer :: ES"
   }

server/sonar-webserver-pushapi/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
     properties {
         property 'sonar.projectName', "${projectTitle} :: WebServer :: PushAPI"
     }

server/sonar-webserver-webapi/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: WebServer :: WebAPI"
   }

server/sonar-webserver-ws/build.gradle

@@ -1,6 +1,6 @@
 description = 'WebServer "API" to write Web Services'
 
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: WebServer :: WS"
   }

server/sonar-webserver/build.gradle

@@ -1,6 +1,6 @@
 description = 'SonarQube WebServer executable and Tomcat directly related code'
 
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: WebServer"
   }

sonar-application/build.gradle

@@ -9,7 +9,7 @@ plugins {
   id "org.cyclonedx.bom"
 }
 
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Application"
   }

sonar-check-api/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Check API"
   }

sonar-core/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Core"
   }

sonar-duplications/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Duplications"
   }

sonar-markdown/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Markdown"
   }

sonar-plugin-api-impl/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Plugin API Implementation"
   }

sonar-scanner-engine-shaded/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Scanner Engine Shaded"
   }

sonar-scanner-engine/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Scanner Engine"
   }

sonar-scanner-protocol/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Scanner :: Protocol"
     property 'sonar.exclusions', 'src/main/java/org/sonar/scanner/protocol/viewer/**'

sonar-shutdowner/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Shutdowner"
   }

sonar-testing-harness/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Testing Harness"
   }

sonar-testing-ldap/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
     properties {
         property 'sonar.projectName', "${projectTitle} :: LDAP Testing"
     }

sonar-ws-generator/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   skipProject = true
 }
 

sonar-ws/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
   properties {
     property 'sonar.projectName', "${projectTitle} :: Web Service"
     property 'sonar.exclusions', 'src/main/java/org/sonarqube/ws/client/*/*.java'

ut-monitoring/build.gradle

@@ -1,4 +1,4 @@
-sonarqube {
+sonar {
     properties {
         property 'sonar.projectName', "${projectTitle} :: Java UT Monitoring"
     }
@@ -14,6 +14,6 @@ dependencies {
     compileOnly 'org.aspectj:aspectjtools'
 }
 
-sonarqube {
+sonar {
     skipProject = true
 }