[MavenV3] [MavenV2 ]Added logic for avoid copying settings file to it…

…self (#14377) * [MavenV3] Added logic for avoid copying settings file to itself * [MavenV2] Added logic for avoid copying settings file to itself
microsoft · Feb 12, 2021 · ac62063 · ac62063
1 parent 7ee4c5d
commit ac62063
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 11 deletions.
diff --git a/Tasks/MavenV2/maventask.ts b/Tasks/MavenV2/maventask.ts
@@ -182,8 +182,13 @@ async function execBuild() {
                         for (let i = 0; i < options.length; ++i) {
                             if ((options[i] === '--settings' || options[i] === '-s') && (i + 1) < options.length) {
                                 i++; // increment to the file name
-                                let suppliedSettingsXml: string = options[i];
-                                tl.cp(path.resolve(tl.cwd(), suppliedSettingsXml), settingsXmlFile, '-f');
+                                let suppliedSettingsXml: string = path.resolve(tl.cwd(), options[i]);
+                                // Avoid copying settings file to itself
+                                if (path.relative(suppliedSettingsXml, settingsXmlFile) !== '') {
+                                    tl.cp(suppliedSettingsXml, settingsXmlFile, '-f');
+                                } else {
+                                    tl.debug('Settings file is already in the correct location. Copying skipped.');    
+                                }
                                 tl.debug('using settings file: ' + settingsXmlFile);
                             } else {
                                 if (mavenOptions) {

diff --git a/Tasks/MavenV2/task.json b/Tasks/MavenV2/task.json
@@ -17,7 +17,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 2,
-        "Minor": 181,
+        "Minor": 183,
         "Patch": 0
     },
     "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`",

diff --git a/Tasks/MavenV2/task.loc.json b/Tasks/MavenV2/task.loc.json
@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 181,
+    "Minor": 183,
     "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",

diff --git a/Tasks/MavenV3/maventask.ts b/Tasks/MavenV3/maventask.ts
@@ -193,8 +193,13 @@ async function execBuild() {
                         for (let i = 0; i < options.length; ++i) {
                             if ((options[i] === '--settings' || options[i] === '-s') && (i + 1) < options.length) {
                                 i++; // increment to the file name
-                                let suppliedSettingsXml: string = options[i];
-                                tl.cp(path.resolve(tl.cwd(), suppliedSettingsXml), settingsXmlFile, '-f');
+                                let suppliedSettingsXml: string = path.resolve(tl.cwd(), options[i]);
+                                // Avoid copying settings file to itself
+                                if (path.relative(suppliedSettingsXml, settingsXmlFile) !== '') {
+                                    tl.cp(suppliedSettingsXml, settingsXmlFile, '-f');
+                                } else {
+                                    tl.debug('Settings file is already in the correct location. Copying skipped.');    
+                                }
                                 tl.debug('using settings file: ' + settingsXmlFile);
                             } else {
                                 if (mavenOptions) {

diff --git a/Tasks/MavenV3/package-lock.json b/Tasks/MavenV3/package-lock.json
diff --git a/Tasks/MavenV3/task.json b/Tasks/MavenV3/task.json
@@ -17,8 +17,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 3,
-        "Minor": 181,
-        "Patch": 1
+        "Minor": 183,
+        "Patch": 0
     },
     "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`",
     "demands": [

diff --git a/Tasks/MavenV3/task.loc.json b/Tasks/MavenV3/task.loc.json
@@ -17,8 +17,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 3,
-    "Minor": 181,
-    "Patch": 1
+    "Minor": 183,
+    "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "demands": [