From b07777dc040f24a2e70d6fc02a5a6353ecbc2f4a Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Mon, 29 Jan 2018 08:42:19 +0100 Subject: [PATCH] Commit files generated during the build --- .../resources.resjson/en-US/resources.resjson | 4 ++-- Tasks/Gradle/package.json | 4 ++++ Tasks/Gradle/task.loc.json | 2 +- .../resources.resjson/en-US/resources.resjson | 8 +++----- Tasks/Maven/package.json | 19 ++++++++++++------- Tasks/Maven/task.loc.json | 16 +--------------- 6 files changed, 23 insertions(+), 30 deletions(-) diff --git a/Tasks/Gradle/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Gradle/Strings/resources.resjson/en-US/resources.resjson index e38b703e3219..5679124db474 100644 --- a/Tasks/Gradle/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/Gradle/Strings/resources.resjson/en-US/resources.resjson @@ -3,7 +3,7 @@ "loc.helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?LinkID=613720)", "loc.description": "Build using a Gradle wrapper script", "loc.instanceNameFormat": "gradlew $(tasks)", - "loc.releaseNotes": "Configuration of the SonarQube analysis was moved to the SonarQube extension, in task `Prepare Analysis Configuration`", + "loc.releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`", "loc.group.displayName.junitTestResults": "JUnit Test Results", "loc.group.displayName.codeCoverage": "Code Coverage", "loc.group.displayName.advanced": "Advanced", @@ -39,7 +39,7 @@ "loc.input.label.gradleOpts": "Set GRADLE_OPTS", "loc.input.help.gradleOpts": "Sets the GRADLE_OPTS environment variable, which is used to send command-line arguments to start the JVM. The xmx flag specifies the maximum memory available to the JVM.", "loc.input.label.sqAnalysisEnabled": "Run SonarQube or SonarCloud Analysis", - "loc.input.help.sqAnalysisEnabled": "Run a [SonarQube or SonarCloud analysis](http://redirect.sonarsource.com/doc/install-configure-scanner-tfs-ts.html) after executing the current goals. 'install' or 'package' goals should be executed first.", + "loc.input.help.sqAnalysisEnabled": "Run a [SonarQube or SonarCloud analysis](http://redirect.sonarsource.com/doc/install-configure-scanner-tfs-ts.html) after executing the current tasks. You have to add the `Prepare Analysis Configuration` task of the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions in your build definition before this Gradle task.", "loc.input.label.sqGradlePluginVersionChoice": "SonarQube Scanner for Gradle version", "loc.input.help.sqGradlePluginVersionChoice": "The SonarQube Gradle plugin version to use. You can declare it in your Gradle configuration file, or specify a version here.", "loc.input.label.sqGradlePluginVersion": "SonarQube Scanner for Gradle Plugin Version", diff --git a/Tasks/Gradle/package.json b/Tasks/Gradle/package.json index d2dcdd779a58..b03458539b37 100644 --- a/Tasks/Gradle/package.json +++ b/Tasks/Gradle/package.json @@ -8,8 +8,12 @@ "url": "https://github.com/Microsoft/vso-agent-tasks/issues" }, "dependencies": { + "codeanalysis-common": "file:../../_build/Tasks/Common/codeanalysis-common", + "codecoverage-tools": "file:../../_build/Tasks/Common/codecoverage-tools", "glob": "7.1.0", + "java-common": "file:../../_build/Tasks/Common/java-common", "request": "^2.74.0", + "utility-common": "file:../../_build/Tasks/Common/utility-common", "vsts-task-lib": "1.1.0", "xml2js": "^0.4.16" } diff --git a/Tasks/Gradle/task.loc.json b/Tasks/Gradle/task.loc.json index fc80d37d7d50..619b53dc2cd4 100644 --- a/Tasks/Gradle/task.loc.json +++ b/Tasks/Gradle/task.loc.json @@ -15,7 +15,7 @@ "author": "Microsoft Corporation", "version": { "Major": 2, - "Minor": 0, + "Minor": 130, "Patch": 0 }, "releaseNotes": "ms-resource:loc.releaseNotes", diff --git a/Tasks/Maven/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Maven/Strings/resources.resjson/en-US/resources.resjson index cdf25b6d0cb1..8601c3fded4e 100644 --- a/Tasks/Maven/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/Maven/Strings/resources.resjson/en-US/resources.resjson @@ -3,7 +3,7 @@ "loc.helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?LinkID=613723)", "loc.description": "Build with Apache Maven", "loc.instanceNameFormat": "Maven $(mavenPOMFile)", - "loc.releaseNotes": "Configuration of the SonarQube analysis was moved to the SonarQube extension, in task `Prepare Analysis Configuration`", + "loc.releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`", "loc.group.displayName.junitTestResults": "JUnit Test Results", "loc.group.displayName.codeCoverage": "Code Coverage", "loc.group.displayName.advanced": "Advanced", @@ -47,11 +47,9 @@ "loc.input.label.mavenFeedAuthenticate": "Authenticate built-in Maven feeds", "loc.input.help.mavenFeedAuthenticate": "Automatically authenticate built-in Maven feeds from the TFS/VSTS [Package Management](https://marketplace.visualstudio.com/items?itemName=ms.feed) extension. If built-in Maven feeds are not in use, deselect this option for faster builds.", "loc.input.label.sqAnalysisEnabled": "Run SonarQube or SonarCloud Analysis", - "loc.input.help.sqAnalysisEnabled": "Run a [SonarQube or SonarCloud analysis](http://redirect.sonarsource.com/doc/install-configure-scanner-tfs-ts.html) after executing the current goals. 'install' or 'package' goals should be executed first.", + "loc.input.help.sqAnalysisEnabled": "Run a [SonarQube or SonarCloud analysis](http://redirect.sonarsource.com/doc/install-configure-scanner-tfs-ts.html) after executing the current goals. `install` or `package` goals should be executed first. You have to add the `Prepare Analysis Configuration` task of the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions in your build definition before this Maven task.", "loc.input.label.sqMavenPluginVersionChoice": "SonarQube Scanner for Maven version", - "loc.input.help.sqMavenPluginVersionChoice": "The SonarQube Maven plugin version to use. You can use latest version, fix version here or in your pom.xml.", - "loc.input.label.sqMavenPluginVersion": "SonarQube Scanner for Maven Plugin Version", - "loc.input.help.sqMavenPluginVersion": "Refer to http://repo1.maven.org/maven2/org/sonarsource/scanner/maven/sonar-maven-plugin/ for all available versions.", + "loc.input.help.sqMavenPluginVersionChoice": "The SonarQube Maven plugin version to use. You can use latest version, or rely on the version in your pom.xml.", "loc.input.label.checkstyleAnalysisEnabled": "Run Checkstyle", "loc.input.help.checkstyleAnalysisEnabled": "Run the Checkstyle tool with the default Sun checks. Results are uploaded as build artifacts.", "loc.input.label.pmdAnalysisEnabled": "Run PMD", diff --git a/Tasks/Maven/package.json b/Tasks/Maven/package.json index c1ab9db60cd3..2ba03b495204 100644 --- a/Tasks/Maven/package.json +++ b/Tasks/Maven/package.json @@ -8,16 +8,21 @@ "url": "https://github.com/Microsoft/vso-agent-tasks/issues" }, "dependencies": { - "glob": "7.1.0", - "request": "^2.74.0", - "vsts-task-lib": "1.1.0", - "xml2js": "^0.4.16", "base-64": "^0.1.0", - "utf8": "^2.1.0", "cheerio": "^0.22.0", - "strip-bom": "^3.0.0", + "codeanalysis-common": "file:../../_build/Tasks/Common/codeanalysis-common", + "codecoverage-tools": "file:../../_build/Tasks/Common/codecoverage-tools", "fs-extra": "^0.30.0", + "glob": "7.1.0", + "java-common": "file:../../_build/Tasks/Common/java-common", + "nuget-task-common": "file:../../_build/Tasks/Common/nuget-task-common", + "request": "^2.74.0", + "strip-bom": "^3.0.0", + "utf8": "^2.1.0", + "utility-common": "file:../../_build/Tasks/Common/utility-common", + "uuid": "^3.0.1", "vso-node-api": "6.0.1-preview", - "uuid": "^3.0.1" + "vsts-task-lib": "1.1.0", + "xml2js": "^0.4.16" } } diff --git a/Tasks/Maven/task.loc.json b/Tasks/Maven/task.loc.json index b508f866a8fc..ff35ba3c373b 100644 --- a/Tasks/Maven/task.loc.json +++ b/Tasks/Maven/task.loc.json @@ -16,7 +16,7 @@ "author": "Microsoft Corporation", "version": { "Major": 2, - "Minor": 0, + "Minor": 130, "Patch": 0 }, "releaseNotes": "ms-resource:loc.releaseNotes", @@ -319,26 +319,12 @@ "defaultValue": "latest", "options": { "latest": "Use latest release", - "specify": "Specify version number", "pom": "Use version declared in your pom.xml" }, "helpMarkDown": "ms-resource:loc.input.help.sqMavenPluginVersionChoice", "groupName": "CodeAnalysis", "visibleRule": "sqAnalysisEnabled = true" }, - { - "name": "sqMavenPluginVersion", - "aliases": [ - "sonarQubeGradlePluginVersion" - ], - "type": "string", - "label": "ms-resource:loc.input.label.sqMavenPluginVersion", - "required": true, - "defaultValue": "3.4.0.905", - "helpMarkDown": "ms-resource:loc.input.help.sqMavenPluginVersion", - "groupName": "CodeAnalysis", - "visibleRule": "sqAnalysisEnabled = true && sqMavenPluginVersionChoice = specify" - }, { "name": "checkstyleAnalysisEnabled", "aliases": [