diff --git a/README.md b/README.md index 0c0bbc83..de590117 100644 --- a/README.md +++ b/README.md @@ -17,16 +17,16 @@ git://github.com/SonarSource/sonar-scanner-jenkins.git With this plugin, you can configure SonarQube instances and run a SonarQube Scanner analysis in several ways: * By injecting the SonarQube configuration as environment variables and using them in any job step (such as Maven, Ant, Gradle, ...); * Using the Sonar Scanner job; -* Using SonarQube Scanner for MSBuild's 'begin analysis' and 'end analysis' jobs; +* Using SonarScanner for MSBuild's 'begin analysis' and 'end analysis' jobs; -'SonarQube Scanner' and 'SonarQube Scanner for MSBuild' are managed as installable tools. List of available versions is retrieved +'SonarQube Scanner' and 'SonarScanner for MSBuild' are managed as installable tools. List of available versions is retrieved automatically by Jenkins/Hudson from a json file hosted on their respective update site: * http://hudson-ci.org/updates/hudson.plugins.sonar.SonarRunnerInstaller.json * http://mirrors.jenkins-ci.org/updates/updates/hudson.plugins.sonar.SonarRunnerInstaller.json * http://mirrors.jenkins-ci.org/updates/updates/hudson.plugins.sonar.MsBuildSonarQubeRunnerInstaller.json -For Jenkins, the files are automatically updated when a new version of Sonar Scanner or SonarQube Scanner for MSBuild is published, +For Jenkins, the files are automatically updated when a new version of Sonar Scanner or SonarScanner for MSBuild is published, thanks to crawlers written in groovy: * https://github.com/jenkinsci/backend-crawler/blob/master/sonarrunner.groovy * https://github.com/jenkinsci/backend-crawler/blob/master/msbuildsonarquberunner.groovy diff --git a/its/src/test/java/com/sonar/it/jenkins/orchestrator/JenkinsOrchestrator.java b/its/src/test/java/com/sonar/it/jenkins/orchestrator/JenkinsOrchestrator.java index 479201e2..1ad538b9 100644 --- a/its/src/test/java/com/sonar/it/jenkins/orchestrator/JenkinsOrchestrator.java +++ b/its/src/test/java/com/sonar/it/jenkins/orchestrator/JenkinsOrchestrator.java @@ -313,7 +313,7 @@ public JenkinsOrchestrator newFreestyleJobWithScannerForMsBuild(String jobName, newFreestyleJobConfig(jobName, projectPath); findElement(buttonByText("Add build step")).click(); - findElement(By.linkText("SonarQube Scanner for MSBuild - Begin Analysis")).click(); + findElement(By.linkText("SonarScanner for MSBuild - Begin Analysis")).click(); setTextValue(findElement(By.name("_.projectKey")), projectKey); setTextValue(findElement(By.name("_.projectName")), projectName); @@ -335,7 +335,7 @@ public JenkinsOrchestrator newFreestyleJobWithScannerForMsBuild(String jobName, } findElement(buttonByText("Add build step")).click(); - findElement(By.linkText("SonarQube Scanner for MSBuild - End Analysis")).click(); + findElement(By.linkText("SonarScanner for MSBuild - End Analysis")).click(); findElement(buttonByText("Save")).click(); return this; @@ -461,7 +461,7 @@ private String getSQScannerInstallName(String version) { public JenkinsOrchestrator configureMsBuildSQScanner_installation(String version, int index) { openConfigureToolsPage(); - String toolName = "SonarQube Scanner for MSBuild"; + String toolName = "SonarScanner for MSBuild"; if (index > 0) { findElement(buttonByText(toolName + " installations...")).click(); diff --git a/src/main/java/hudson/plugins/sonar/MsBuildSQRunnerInstallation.java b/src/main/java/hudson/plugins/sonar/MsBuildSQRunnerInstallation.java index 184feece..f436b5bf 100644 --- a/src/main/java/hudson/plugins/sonar/MsBuildSQRunnerInstallation.java +++ b/src/main/java/hudson/plugins/sonar/MsBuildSQRunnerInstallation.java @@ -86,7 +86,7 @@ public MsBuildSQRunnerInstallation newInstance(StaplerRequest req, JSONObject fo @Override public String getDisplayName() { - return "SonarQube Scanner for MSBuild"; + return "SonarScanner for MSBuild"; } @Override diff --git a/src/main/resources/hudson/plugins/sonar/Messages.properties b/src/main/resources/hudson/plugins/sonar/Messages.properties index 5e20c33f..000bc3bb 100644 --- a/src/main/resources/hudson/plugins/sonar/Messages.properties +++ b/src/main/resources/hudson/plugins/sonar/Messages.properties @@ -26,9 +26,9 @@ SonarBuildWrapper.DisplayName=Prepare SonarQube Scanner environment SonarBuildWrapper.MaskingPasswords=Masking SonarQube passwords SonarBuildWrapper.Injecting=Injecting SonarQube environment variables using the configuration: {0} -MsBuildScannerBegin.DisplayName=SonarQube Scanner for MSBuild - Begin Analysis -MsBuildScannerEnd.DisplayName=SonarQube Scanner for MSBuild - End Analysis +MsBuildScannerBegin.DisplayName=SonarScanner for MSBuild - Begin Analysis +MsBuildScannerEnd.DisplayName=SonarScanner for MSBuild - End Analysis MsBuildScannerEnd.NoBeginStep=Missing parameters in the build environment. Was the begin step invoked before? -MsBuildScanner.NoInstallation=No SonarQube Scanner for MSBuild installation found, trying to execute from PATH -MsBuildScanner.ExecutableNotFound=SonarQube Scanner for MSBuild executable was not found for {0} -MSBuildScanner.ExecFailed=Execution of SonarQube Scanner for MSBuild failed (exit code {0}) +MsBuildScanner.NoInstallation=No SonarScanner for MSBuild installation found, trying to execute from PATH +MsBuildScanner.ExecutableNotFound=SonarScanner for MSBuild executable was not found for {0} +MSBuildScanner.ExecFailed=Execution of SonarScanner for MSBuild failed (exit code {0}) diff --git a/src/main/resources/hudson/plugins/sonar/MsBuildSQRunnerBegin/config.properties b/src/main/resources/hudson/plugins/sonar/MsBuildSQRunnerBegin/config.properties index 88709d0d..224eb0ae 100644 --- a/src/main/resources/hudson/plugins/sonar/MsBuildSQRunnerBegin/config.properties +++ b/src/main/resources/hudson/plugins/sonar/MsBuildSQRunnerBegin/config.properties @@ -8,7 +8,7 @@ ProjectVersionTitle=Project version AdditionalArguments=Additional arguments AdditionalArgumentsDesc=Additional command line arguments -MsBuildScannerTitle=SonarQube Scanner for MSBuild -MsBuildScanner.error.1=There are no SonarQube Scanners for MSBuild installed. +MsBuildScannerTitle=SonarScanner for MSBuild +MsBuildScanner.error.1=There are no SonarScanners for MSBuild installed. MsBuildScanner.error.2=Please configure one in the global tool configuration. MsBuildScanner.error.2.beforeV2=Please configure one in the system configuration. diff --git a/src/main/resources/hudson/plugins/sonar/MsBuildSQRunnerBegin/config_fr.properties b/src/main/resources/hudson/plugins/sonar/MsBuildSQRunnerBegin/config_fr.properties index 2ebad6b0..170b449c 100644 --- a/src/main/resources/hudson/plugins/sonar/MsBuildSQRunnerBegin/config_fr.properties +++ b/src/main/resources/hudson/plugins/sonar/MsBuildSQRunnerBegin/config_fr.properties @@ -8,7 +8,7 @@ ProjectVersionTitle=Version du projet AdditionalArguments=Arguments supplémentaires AdditionalArgumentsDesc=Arguments de ligne de commande supplémentaires -MsBuildScannerTitle=SonarQube Scanner for MSBuild -MsBuildScanner.error.1=Il n''y a pas de SonarQube Scanner for MSBuild installé. +MsBuildScannerTitle=SonarScanner for MSBuild +MsBuildScanner.error.1=Il n''y a pas de SonarScanner for MSBuild installé. MsBuildScanner.error.2=Veuillez le faire dans la configuration globale des outils. MsBuildScanner.error.2.beforeV2=Veuillez le faire dans la configuration du système. diff --git a/src/main/webapp/help-buildWrapper.html b/src/main/webapp/help-buildWrapper.html index dc2f18e3..046f603a 100644 --- a/src/main/webapp/help-buildWrapper.html +++ b/src/main/webapp/help-buildWrapper.html @@ -11,6 +11,6 @@
These variables are useful when configuring a SonarQube analysis using standard build steps such as Maven, Gradle, Ant, and command line scripts. - This feature is not needed if you're using "SonarQube Scanner" or "SonarQube Scanner for MSBuild" build steps. + This feature is not needed if you're using "SonarQube Scanner" or "SonarScanner for MSBuild" build steps.

\ No newline at end of file diff --git a/src/main/webapp/help-ms-build-sq-scanner-begin.html b/src/main/webapp/help-ms-build-sq-scanner-begin.html index e1201f37..a8374ae1 100644 --- a/src/main/webapp/help-ms-build-sq-scanner-begin.html +++ b/src/main/webapp/help-ms-build-sq-scanner-begin.html @@ -1,7 +1,7 @@

Fetch analysis settings from SonarQube.
After rebuilding the - project, it should be followed by an invocation of SonarQube Scanner for MSBuild End Analysis.
For more information, check the + project, it should be followed by an invocation of SonarScanner for MSBuild End Analysis.
For more information, check the documentation.

diff --git a/src/main/webapp/help-ms-build-sq-scanner-end.html b/src/main/webapp/help-ms-build-sq-scanner-end.html index 7694146e..c6f30c37 100644 --- a/src/main/webapp/help-ms-build-sq-scanner-end.html +++ b/src/main/webapp/help-ms-build-sq-scanner-end.html @@ -1,7 +1,7 @@

Upload analysis results to SonarQube.
It should be preceded by - an invocation of SonarQube Scanner for MSBuild End Analysis and a + an invocation of SonarScanner for MSBuild End Analysis and a rebuild of the project.
For more information, check the documentation.

diff --git a/src/test/java/hudson/plugins/sonar/MsBuildSQRunnerBeginTest.java b/src/test/java/hudson/plugins/sonar/MsBuildSQRunnerBeginTest.java index 25dcc851..df794635 100644 --- a/src/test/java/hudson/plugins/sonar/MsBuildSQRunnerBeginTest.java +++ b/src/test/java/hudson/plugins/sonar/MsBuildSQRunnerBeginTest.java @@ -107,7 +107,7 @@ public void testNoMsBuildInst() throws Exception { FreeStyleProject proj = createFreeStyleProjectWithMSBuild("default", "non-existing"); Run r = build(proj, Result.FAILURE); - assertLogContains("No SonarQube Scanner for MSBuild installation found", r); + assertLogContains("No SonarScanner for MSBuild installation found", r); } private void addEnvVar(String key, String value) {