SONAR-17593 Update ./gradlew commands to use 'sonar'

diff --git a/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/__tests__/__snapshots__/AnalysisCommand-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/__tests__/__snapshots__/AnalysisCommand-test.tsx.snap
index c1c0ee6a435af3c1a82071476f73608b677013e8..795b1c6600cf25bb062150d0c212958906b4740b 100644 (file)
--- a/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/__tests__/__snapshots__/AnalysisCommand-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/__tests__/__snapshots__/AnalysisCommand-test.tsx.snap
@@ -289,7 +289,7 @@ definitions:
           - gradle
           - sonar
         script:
-          - bash ./gradlew sonarqube
+          - bash ./gradlew sonar
   caches:
     sonar: ~/.sonar
 
@@ -344,7 +344,7 @@ definitions:
           - gradle
           - sonar
         script:
-          - bash ./gradlew sonarqube
+          - bash ./gradlew sonar
   caches:
     sonar: ~/.sonar
 

diff --git a/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/commands/Gradle.ts b/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/commands/Gradle.ts
index cedaa641248c43c1885a123b0ea1f7ce5e45ea97..fb8e6a16466e25e2c7dad34befd8f4baf5f4908a 100644 (file)
--- a/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/commands/Gradle.ts
+++ b/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/commands/Gradle.ts
@@ -28,7 +28,7 @@ definitions:
           - gradle
           - sonar
         script:
-          - bash ./gradlew sonarqube
+          - bash ./gradlew sonar
   caches:
     sonar: ~/.sonar
 

diff --git a/server/sonar-web/src/main/js/components/tutorials/github-action/commands/Gradle.tsx b/server/sonar-web/src/main/js/components/tutorials/github-action/commands/Gradle.tsx
index 8c690c04d7ad6c217956d011441e4e6dd70e531b..a9b1e8921b82d956ce469935691ce14e00432e96 100644 (file)
--- a/server/sonar-web/src/main/js/components/tutorials/github-action/commands/Gradle.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/github-action/commands/Gradle.tsx
@@ -58,7 +58,7 @@ const GRADLE_YAML_STEPS = `
           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`;
 
 export default function Gradle(props: GradleProps) {
   const { component, branchesEnabled, mainBranchName } = props;

diff --git a/server/sonar-web/src/main/js/components/tutorials/github-action/commands/__tests__/__snapshots__/Gradle-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/github-action/commands/__tests__/__snapshots__/Gradle-test.tsx.snap
index 08060e05dfaf2c03eb51d6db786b732a87ba563f..30fbb0dd5d6b66920c9a0e585e6fff8bc8f112d1 100644 (file)
--- a/server/sonar-web/src/main/js/components/tutorials/github-action/commands/__tests__/__snapshots__/Gradle-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/github-action/commands/__tests__/__snapshots__/Gradle-test.tsx.snap
@@ -80,7 +80,7 @@ jobs:
           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"
   />
   <FinishButton
     onClick={[MockFunction]}
@@ -167,7 +167,7 @@ jobs:
           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"
   />
   <FinishButton
     onClick={[MockFunction]}

diff --git a/server/sonar-web/src/main/js/components/tutorials/gitlabci/commands/PipeCommand.tsx b/server/sonar-web/src/main/js/components/tutorials/gitlabci/commands/PipeCommand.tsx
index f8a3fabf444e322d955ea33913ef24cda4488468..a5170c8b5aba12a3163cfe1a91c8253cbdbb04e8 100644 (file)
--- a/server/sonar-web/src/main/js/components/tutorials/gitlabci/commands/PipeCommand.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/gitlabci/commands/PipeCommand.tsx
@@ -30,7 +30,7 @@ export interface PipeCommandProps {
 }
 
 const BUILD_TOOL_SPECIFIC = {
-  [BuildTools.Gradle]: { image: 'gradle:jre11-slim', script: () => 'gradle sonarqube' },
+  [BuildTools.Gradle]: { image: 'gradle:jre11-slim', script: () => 'gradle sonar' },
   [BuildTools.Maven]: {
     image: 'maven:3.6.3-jdk-11',
     script: (projectKey: string) => `

diff --git a/server/sonar-web/src/main/js/components/tutorials/gitlabci/commands/__tests__/__snapshots__/PipeCommand-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/gitlabci/commands/__tests__/__snapshots__/PipeCommand-test.tsx.snap
index 9b66a6ec41e3b7c1dabac71b3b807acd96cdb02f..920cdd263c7ad50c854766ee3f8d48ffa61a6373 100644 (file)
--- a/server/sonar-web/src/main/js/components/tutorials/gitlabci/commands/__tests__/__snapshots__/PipeCommand-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/gitlabci/commands/__tests__/__snapshots__/PipeCommand-test.tsx.snap
@@ -148,7 +148,7 @@ exports[`should render correctly for gradle: branches enabled 1`] = `
     key: \\"\${CI_JOB_NAME}\\"
     paths:
       - .sonar/cache
-  script: gradle sonarqube
+  script: gradle sonar
   allow_failure: true
   only:
     - merge_requests
@@ -171,7 +171,7 @@ exports[`should render correctly for gradle: branches not enabled 1`] = `
     key: \\"\${CI_JOB_NAME}\\"
     paths:
       - .sonar/cache
-  script: gradle sonarqube
+  script: gradle sonar
   allow_failure: true
   only:
     - merge_requests

diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/Gradle.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/Gradle.tsx
index 29755547ddc592d0646a3389461d9773d588ea58..be3551b9c10b6cd444c6e8c3602b3875abdf81f0 100644 (file)
--- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/Gradle.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/Gradle.tsx
@@ -31,7 +31,7 @@ const JENKINSFILE_SNIPPET = `node {
   }
   stage('SonarQube Analysis') {
     withSonarQubeEnv() {
-      sh "./gradlew sonarqube"
+      sh "./gradlew sonar"
     }
   }
 }`;

diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/__tests__/__snapshots__/Gradle-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/__tests__/__snapshots__/Gradle-test.tsx.snap
index a6458f4cf17f5dc068291f8ddbf0034e15d4eb17..dacb1238ea2719fbd40a9b3333c77eb22c207404 100644 (file)
--- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/__tests__/__snapshots__/Gradle-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/__tests__/__snapshots__/Gradle-test.tsx.snap
@@ -28,7 +28,7 @@ sonar {
   }
   stage('SonarQube Analysis') {
     withSonarQubeEnv() {
-      sh \\"./gradlew sonarqube\\"
+      sh \\"./gradlew sonar\\"
     }
   }
 }"

diff --git a/server/sonar-web/src/main/js/components/tutorials/other/commands/JavaGradle.tsx b/server/sonar-web/src/main/js/components/tutorials/other/commands/JavaGradle.tsx
index c53753f360bcfdf0604c02f4f44b2e5e78e7ab7e..11609d1fe67a978be6c9702e96183028b536d314 100644 (file)
--- a/server/sonar-web/src/main/js/components/tutorials/other/commands/JavaGradle.tsx
+++ b/server/sonar-web/src/main/js/components/tutorials/other/commands/JavaGradle.tsx
@@ -40,7 +40,7 @@ export default function JavaGradle(props: JavaGradleProps) {
 }`;
 
   const command = [
-    './gradlew sonarqube',
+    './gradlew sonar',
     `-Dsonar.projectKey=${component.key}`,
     `-Dsonar.host.url=${baseUrl}`,
     `-Dsonar.login=${token}`,

diff --git a/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/JavaGradle-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/JavaGradle-test.tsx.snap
index 1054fc3fccfc98266eb534e597490f677a9723db..d40117206ec6d760bd50271b9a82aa7045505c8a 100644 (file)
--- a/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/JavaGradle-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/JavaGradle-test.tsx.snap
@@ -46,7 +46,7 @@ exports[`renders correctly 1`] = `
   <CodeSnippet
     snippet={
       Array [
-        "./gradlew sonarqube",
+        "./gradlew sonar",
         "-Dsonar.projectKey=projectKey",
         "-Dsonar.host.url=host",
         "-Dsonar.login=token",