Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MavenV3] Migrated to Node 10 #14064

Merged
merged 22 commits into from
Dec 28, 2020
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
11b801a
Removed typings
egor-bryzgalov Dec 11, 2020
0e1ce49
Delete make.json
egor-bryzgalov Dec 11, 2020
733fd9d
Updated packages
egor-bryzgalov Dec 11, 2020
64b472e
Fixed type issues.
egor-bryzgalov Dec 11, 2020
ce75cec
Updated version and execution handler
egor-bryzgalov Dec 11, 2020
27c4916
Fixed TS error. Updated package-lock
egor-bryzgalov Dec 14, 2020
d0c0a34
Added logs for testing purposes
egor-bryzgalov Dec 14, 2020
299abd8
Attempt to fix test
egor-bryzgalov Dec 14, 2020
bd921bc
Update L0DefaultsWithHomeSet.ts
egor-bryzgalov Dec 14, 2020
3b860bc
Update L0DefaultsWithNoHomeSet.ts
egor-bryzgalov Dec 14, 2020
8b1816d
Fake changes
egor-bryzgalov Dec 15, 2020
34d4c5f
Merge branch 'users/egor-bryzgalov/MavenV3-node10' of https://github.…
egor-bryzgalov Dec 15, 2020
7d75b83
Revert "Merge branch 'users/egor-bryzgalov/MavenV3-node10' of https:/…
egor-bryzgalov Dec 15, 2020
26fcffc
Updated packaging-common
egor-bryzgalov Dec 25, 2020
4cf18e6
Merge branch 'master' into users/egor-bryzgalov/MavenV3-node10
egor-bryzgalov Dec 25, 2020
e12bf68
Applied workaround for build issue
egor-bryzgalov Dec 25, 2020
4d0dcb5
Bumped version
egor-bryzgalov Dec 25, 2020
a467d7e
Revert "Applied workaround for build issue"
egor-bryzgalov Dec 25, 2020
cf48ebf
Fixed type issue
egor-bryzgalov Dec 25, 2020
ccd6149
Merge branch 'master' into users/egor-bryzgalov/MavenV3-node10
egor-bryzgalov Dec 25, 2020
ec31b22
Update package.json
egor-bryzgalov Dec 28, 2020
7f29f2f
Merge branch 'master' into users/egor-bryzgalov/MavenV3-node10
egor-bryzgalov Dec 28, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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