KubernetesManifestV0: Updating from [email protected] to azure-pip…

…[email protected] - Also moved KubernetesManifestV0 - from 'kubernetes-common' to 'kubernetes-common-v2' - from 'docker-common' to 'docker-common-v2' - Removed dependency on 'utility-common' as it was unused. - Bumped up patch version
microsoft · Jun 13, 2019 · d9bcaf8 · d9bcaf8
1 parent 8ae8988
commit d9bcaf8
Show file tree

Hide file tree

Showing 26 changed files with 190 additions and 193 deletions.
diff --git a/Tasks/Common/kubernetes-common-v2/package-lock.json b/Tasks/Common/kubernetes-common-v2/package-lock.json
diff --git a/Tasks/KubernetesManifestV0/Tests/L0.ts b/Tasks/KubernetesManifestV0/Tests/L0.ts
@@ -1,7 +1,7 @@
 import * as path from 'path';
 import * as assert from 'assert';
-import * as ttm from 'vsts-task-lib/mock-test';
-import * as tl from 'vsts-task-lib';
+import * as ttm from 'azure-pipelines-task-lib/mock-test';
+import * as tl from 'azure-pipelines-task-lib';
 import * as shared from './TestShared';
 
 describe('Kubernetes Manifests Suite', function () {

diff --git a/Tasks/KubernetesManifestV0/Tests/TestSetup.ts b/Tasks/KubernetesManifestV0/Tests/TestSetup.ts
@@ -1,5 +1,5 @@
-import * as ma from 'vsts-task-lib/mock-answer';
-import * as tmrm from 'vsts-task-lib/mock-run';
+import * as ma from 'azure-pipelines-task-lib/mock-answer';
+import * as tmrm from 'azure-pipelines-task-lib/mock-run';
 import * as path from 'path';
 
 import * as shared from './TestShared';
@@ -250,7 +250,7 @@ if (process.env[shared.TestEnvVars.arguments]) {
 }
 
 tr.setAnswers(<any>a);
-tr.registerMock('vsts-task-lib/toolrunner', require('vsts-task-lib/mock-toolrunner'));
+tr.registerMock('azure-pipelines-task-lib/toolrunner', require('azure-pipelines-task-lib/mock-toolrunner'));
 
 // Create mock for fs module
 import * as fs from 'fs';

diff --git a/Tasks/KubernetesManifestV0/ThirdPartyNotices.txt b/Tasks/KubernetesManifestV0/ThirdPartyNotices.txt
@@ -59,7 +59,7 @@ The Kubernetes task for Azure Pipelines or Team Foundation Server incorporates c
 45.	typed-rest-client  (https://github.com/Microsoft/typed-rest-client)
 46.	underscore (https://github.com/jashkenas/underscore)
 47.	vso-node-api (https://github.com/Microsoft/vsts-node-api)
-48.	VSTS-Task-Lib (https://github.com/Microsoft/vsts-task-lib)
+48.	Azure-Pipelines-Task-Lib (https://github.com/Microsoft/azure-pipelines-task-lib)
 49.	wrappy (https://github.com/npm/wrappy)
 50. xtend (https://github.com/Raynos/xtend)
 
@@ -1596,7 +1596,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
 END OF vso-node-api NOTICES, INFORMATION, AND LICENSE
 
-%% VSTS-Task-Lib NOTICES, INFORMATION, AND LICENSE BEGIN HERE
+%% Azure-Pipelines-Task-Lib NOTICES, INFORMATION, AND LICENSE BEGIN HERE
 =========================================
 The MIT License (MIT)
 
@@ -1621,7 +1621,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 =========================================
-END OF VSTS-Task-Lib NOTICES, INFORMATION, AND LICENSE
+END OF Azure-Pipelines-Task-Lib NOTICES, INFORMATION, AND LICENSE
 
 %% wrappy NOTICES, INFORMATION, AND LICENSE BEGIN HERE
 =========================================

diff --git a/Tasks/KubernetesManifestV0/make.json b/Tasks/KubernetesManifestV0/make.json
@@ -1,19 +1,13 @@
 {
 	"common": [
     {
-		"module": "../Common/utility-common",
-		"type": "node",
-		"dest" : "./",
-		"compile" : true
-    },
-    {
-		"module": "../Common/kubernetes-common",
+		"module": "../Common/kubernetes-common-v2",
 		"type": "node",
 		"dest" : "./",
 		"compile" : true
 	},
 	{
-		"module": "../Common/docker-common",
+		"module": "../Common/docker-common-v2",
 		"type": "node",
 		"dest" : "./",
 		"compile" : true
@@ -22,9 +16,8 @@
 	"rm": [
         {
             "items": [
-				"node_modules/kubernetes-common/node_modules/vsts-task-lib",
-				"node_modules/docker-common/node_modules/vsts-task-lib",
-                "node_modules/utility-common/node_modules/vsts-task-lib",
+				"node_modules/kubernetes-common-v2/node_modules/azure-pipelines-task-lib",
+				"node_modules/docker-common-v2/node_modules/azure-pipelines-task-lib",
 				"node_modules/vsts-task-tool-lib/node_modules/vsts-task-lib"
             ],
             "options": "-Rf"