Skip to content

Commit

Permalink
[MavenV3] Migrated to Node 10 (#14064)
Browse files Browse the repository at this point in the history
  • Loading branch information
egor-bryzgalov authored Dec 28, 2020
1 parent f8b1911 commit e616883
Show file tree
Hide file tree
Showing 18 changed files with 362 additions and 769 deletions.
5 changes: 2 additions & 3 deletions Tasks/MavenV3/Tests/TestUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ import * as fs from "fs";
import * as path from "path";

import { TaskMockRunner } from "azure-pipelines-task-lib/mock-run";
import { FsOptions } from "azure-pipelines-task-lib/task";

import { registerLocationHelpersMock } from 'packaging-common/Tests/MockHelper';
import { registerLocationHelpersMock } from 'azure-pipelines-tasks-packaging-common/Tests/MockHelper';

export interface MavenTaskInputs {
mavenVersionSelection?: string;
Expand Down Expand Up @@ -88,6 +87,6 @@ export const initializeTest = (taskRunner: TaskMockRunner): void => {
registerLocationHelpersMock(taskRunner);

// Prevent file writes
taskRunner.registerMockExport("writefile", (file: string, data: string | Buffer, options?: string | FsOptions): void => {})
taskRunner.registerMockExport("writefile", (file: string, data: string | Buffer, options?: string | fs.WriteFileOptions): void => {})
taskRunner.registerMockExport("cp", (source: string, dest: string, options?: string, continueOnError?: boolean): void => {})
}
20 changes: 0 additions & 20 deletions Tasks/MavenV3/make.json

This file was deleted.

4 changes: 2 additions & 2 deletions Tasks/MavenV3/maventask.ts
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ async function execBuild() {
console.error(err.message);
userRunFailed = true; // Record the error and continue
})
.then(function (code) {
.then(function (code: any) {
if (code && code['code'] != 0) {
userRunFailed = true;
}
Expand Down Expand Up @@ -358,7 +358,7 @@ function publishJUnitTestResults(testResultsFiles: string) {

var tp = new tl.TestPublisher("JUnit");
const testRunTitle = tl.getInput('testRunTitle');
tp.publish(matchingJUnitResultFiles, true, "", "", testRunTitle, true, TESTRUN_SYSTEM);
tp.publish(matchingJUnitResultFiles, 'true', "", "", testRunTitle, 'true', TESTRUN_SYSTEM);
}

function execEnableCodeCoverage(): Q.Promise<string> {
Expand Down
4 changes: 2 additions & 2 deletions Tasks/MavenV3/mavenutil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import path = require('path');
import fs = require('fs');
import * as tl from 'azure-pipelines-task-lib/task';
import * as tr from 'azure-pipelines-task-lib/toolrunner';
import * as pkgLocationUtils from "packaging-common/locationUtilities";
import { logError } from 'packaging-common/util';
import * as pkgLocationUtils from "azure-pipelines-tasks-packaging-common/locationUtilities";
import { logError } from 'azure-pipelines-tasks-packaging-common/util';

import * as url from "url";
import * as xml2js from 'xml2js';
Expand Down
Loading

0 comments on commit e616883

Please sign in to comment.