aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWouter Admiraal <wouter.admiraal@sonarsource.com>2022-11-11 14:06:48 +0100
committersonartech <sonartech@sonarsource.com>2022-11-15 20:02:59 +0000
commita9f83b6f7a9a8b0bb4a2d67a40ccbf61a9395ba5 (patch)
treeffefc2ba032236181059dcafe2d7493e256c23ea
parent3c8379f8dac6872ce030dd3b3c824e4e69b76fc2 (diff)
downloadsonarqube-a9f83b6f7a9a8b0bb4a2d67a40ccbf61a9395ba5.tar.gz
sonarqube-a9f83b6f7a9a8b0bb4a2d67a40ccbf61a9395ba5.zip
SONAR-17593 Update ./gradlew commands to use 'sonar'
-rw-r--r--server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/__tests__/__snapshots__/AnalysisCommand-test.tsx.snap4
-rw-r--r--server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/commands/Gradle.ts2
-rw-r--r--server/sonar-web/src/main/js/components/tutorials/github-action/commands/Gradle.tsx2
-rw-r--r--server/sonar-web/src/main/js/components/tutorials/github-action/commands/__tests__/__snapshots__/Gradle-test.tsx.snap4
-rw-r--r--server/sonar-web/src/main/js/components/tutorials/gitlabci/commands/PipeCommand.tsx2
-rw-r--r--server/sonar-web/src/main/js/components/tutorials/gitlabci/commands/__tests__/__snapshots__/PipeCommand-test.tsx.snap4
-rw-r--r--server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/Gradle.tsx2
-rw-r--r--server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/__tests__/__snapshots__/Gradle-test.tsx.snap2
-rw-r--r--server/sonar-web/src/main/js/components/tutorials/other/commands/JavaGradle.tsx2
-rw-r--r--server/sonar-web/src/main/js/components/tutorials/other/commands/__tests__/__snapshots__/JavaGradle-test.tsx.snap2
10 files changed, 13 insertions, 13 deletions
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 c1c0ee6a435..795b1c6600c 100644
--- 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 cedaa641248..fb8e6a16466 100644
--- 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 8c690c04d7a..a9b1e8921b8 100644
--- 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 08060e05dfa..30fbb0dd5d6 100644
--- 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 f8a3fabf444..a5170c8b5ab 100644
--- 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 9b66a6ec41e..920cdd263c7 100644
--- 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 29755547ddc..be3551b9c10 100644
--- 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 a6458f4cf17..dacb1238ea2 100644
--- 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 c53753f360b..11609d1fe67 100644
--- 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 1054fc3fccf..d40117206ec 100644
--- 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",