WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit e99690b

Browse files
Merge pull request #186 from jenkinsci/develop
Merge dependency changes changes into master branch for v4.0 [AUOPS-4287]
2 parents abcd23e + e49c2d6 commit e99690b

File tree

2 files changed

+66
-8
lines changed

2 files changed

+66
-8
lines changed

pom.xml

Lines changed: 56 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,15 @@
1313
<packaging>hpi</packaging>
1414

1515
<properties>
16-
<jenkins.version>2.387.3</jenkins.version>
16+
<jenkins.version>2.414.3</jenkins.version>
1717
<powershell.version>1.7</powershell.version>
1818
<envinject.version>2.4.0</envinject.version>
1919
<mockito-core.version>4.8.0</mockito-core.version>
2020
<plain-credentials.version>179.vc5cb_98f6db_38</plain-credentials.version>
2121
<json.version>20231013</json.version>
2222
<credentials.version>1319.v7eb_51b_3a_c97b_</credentials.version>
23-
<org.jenkins-ci.plugins.junit.version>1265.v65b_14fa_f12f0</org.jenkins-ci.plugins.junit.version>
23+
<org.jenkins-ci.plugins.junit.version>1304.vc85a_b_ca_96613</org.jenkins-ci.plugins.junit.version>
2424
<JUnitParams.version>1.1.1</JUnitParams.version>
25-
<matrix-project.version>1.20</matrix-project.version>
2625
<native2ascii-maven-plugin.version>2.0.1</native2ascii-maven-plugin.version>
2726
<properties-maven-plugin.version>1.1.0</properties-maven-plugin.version>
2827
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
@@ -35,6 +34,15 @@
3534
<structs.version>325.vcb_307d2a_2782</structs.version>
3635
<caffeine-api.version>3.1.8-133.v17b_1ff2e0599</caffeine-api.version>
3736
<instance-identity.version>185.v303dc7c645f9</instance-identity.version>
37+
<plugin-util-api.version>3.8.0</plugin-util-api.version>
38+
<commons-text-api.version>1.10.0-78.v3e7b_ea_d5a_fe1</commons-text-api.version>
39+
<workflow-support.version>865.v43e78cc44e0d</workflow-support.version>
40+
<font-awesome-api.version>6.4.2-1</font-awesome-api.version>
41+
<bootstrap5-api.version>5.3.2-3</bootstrap5-api.version>
42+
<checks-api.version>2.0.2</checks-api.version>
43+
<jquery3-api.version>3.7.1-1</jquery3-api.version>
44+
<echarts-api.version>5.4.0-7</echarts-api.version>
45+
<matrix-project.version>789.v57a_725b_63c79</matrix-project.version>
3846
</properties>
3947

4048
<name>UiPath Plugin</name>
@@ -300,6 +308,51 @@
300308
<artifactId>caffeine-api</artifactId>
301309
<version>${caffeine-api.version}</version>
302310
</dependency>
311+
<dependency>
312+
<groupId>io.jenkins.plugins</groupId>
313+
<artifactId>plugin-util-api</artifactId>
314+
<version>${plugin-util-api.version}</version>
315+
</dependency>
316+
<dependency>
317+
<groupId>io.jenkins.plugins</groupId>
318+
<artifactId>commons-text-api</artifactId>
319+
<version>${commons-text-api.version}</version>
320+
</dependency>
321+
<dependency>
322+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
323+
<artifactId>workflow-support</artifactId>
324+
<version>${workflow-support.version}</version>
325+
</dependency>
326+
<dependency>
327+
<groupId>io.jenkins.plugins</groupId>
328+
<artifactId>font-awesome-api</artifactId>
329+
<version>${font-awesome-api.version}</version>
330+
</dependency>
331+
<dependency>
332+
<groupId>io.jenkins.plugins</groupId>
333+
<artifactId>bootstrap5-api</artifactId>
334+
<version>${bootstrap5-api.version}</version>
335+
</dependency>
336+
<dependency>
337+
<groupId>io.jenkins.plugins</groupId>
338+
<artifactId>checks-api</artifactId>
339+
<version>${checks-api.version}</version>
340+
</dependency>
341+
<dependency>
342+
<groupId>io.jenkins.plugins</groupId>
343+
<artifactId>jquery3-api</artifactId>
344+
<version>${jquery3-api.version}</version>
345+
</dependency>
346+
<dependency>
347+
<groupId>io.jenkins.plugins</groupId>
348+
<artifactId>echarts-api</artifactId>
349+
<version>${echarts-api.version}</version>
350+
</dependency>
351+
<dependency>
352+
<groupId>org.jenkins-ci.plugins</groupId>
353+
<artifactId>matrix-project</artifactId>
354+
<version>${matrix-project.version}</version>
355+
</dependency>
303356
</dependencies>
304357
<dependencyManagement>
305358
<dependencies>

src/main/java/com/uipath/uipathpackage/UiPathTest.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class UiPathTest extends Recorder implements SimpleBuildStep, JUnitTask {
5858
private final TraceLevel traceLevel;
5959
private boolean attachRobotLogs;
6060
private Boolean disableBuiltInNugetFeeds;
61-
61+
6262
private static int TimeoutDefault = 7200;
6363

6464
/**
@@ -91,7 +91,7 @@ public UiPathTest(String orchestratorAddress, String orchestratorTenant, String
9191
this.credentials = credentials;
9292
this.timeout = timeout;
9393
this.testResultsOutputPath = testResultsOutputPath;
94-
this.parametersFilePath = parametersFilePath;
94+
this.parametersFilePath = parametersFilePath;
9595
this.disableBuiltInNugetFeeds = null;
9696
this.repositoryUrl = null;
9797
this.repositoryCommit = null;
@@ -181,7 +181,7 @@ public void perform(@Nonnull Run<?, ?> run, @Nonnull FilePath workspace, @NonNul
181181
testOptions.setTestReportType("junit");
182182

183183
String resultsOutputPath = testResultsOutputPath != null && !testResultsOutputPath.trim().isEmpty()
184-
? testResultsOutputPath : "UiPathResults.xml";
184+
? testResultsOutputPath : "UiPathResults.xml";
185185

186186
FilePath expandedTestResultsOutputPath = resultsOutputPath.contains("${WORKSPACE}") ?
187187
new FilePath(launcher.getChannel(), envVars.expand(resultsOutputPath)) :
@@ -208,7 +208,7 @@ public void perform(@Nonnull Run<?, ?> run, @Nonnull FilePath workspace, @NonNul
208208

209209
testOptions.setParametersFilePath(parametersPath.getRemote());
210210
}
211-
211+
212212
testOptions.setAttachRobotLogs(attachRobotLogs);
213213

214214
testOptions.setRepositoryUrl(repositoryUrl);
@@ -528,6 +528,11 @@ public boolean isKeepProperties() {
528528
return false;
529529
}
530530

531+
@Override
532+
public boolean isKeepTestNames() {
533+
return false;
534+
}
535+
531536
@Override
532537
public boolean isAllowEmptyResults() {
533538
return true;
@@ -669,7 +674,7 @@ public FormValidation doCheckParametersFilePath(@QueryParameter String value) {
669674

670675
return FormValidation.ok();
671676
}
672-
677+
673678
/**
674679
* Validates that the timeout is specified
675680
*

0 commit comments

Comments
 (0)