Skip to content

Commit 638895d

Browse files
cyrille-leclercCyrille Le Clerc
cyrille-leclerc
authored and
Cyrille Le Clerc
committed
JENKINS-57813 Bump jenkins-core dependency to 2.138 and introduce a maven engine 3.6.1 in unit tests
1 parent 9a673ee commit 638895d

File tree

5 files changed

+131
-34
lines changed

5 files changed

+131
-34
lines changed

‎jenkins-plugin/pom.xml‎

Lines changed: 113 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@
5656
</developers>
5757

5858
<properties>
59-
<scm-api-plugin.version>2.2.6</scm-api-plugin.version>
60-
<git-plugin.version>3.6.4</git-plugin.version>
59+
<scm-api-plugin.version>2.2.8</scm-api-plugin.version>
60+
<git-plugin.version>3.9.2</git-plugin.version>
6161
<!--
6262
stick to junit 1.20 clarifying the impact of the introduction of the dependencies
6363
workflow-step-api or workflow-api-->
64-
<junit-plugin.version>1.23</junit-plugin.version>
64+
<junit-plugin.version>1.26.1</junit-plugin.version>
6565
<asm.version>5.2</asm.version>
66-
<workflow-support-plugin.version>2.18</workflow-support-plugin.version>
66+
<workflow-support-plugin.version>2.22</workflow-support-plugin.version>
6767
</properties>
6868
<dependencies>
6969
<dependency>
@@ -85,6 +85,18 @@
8585
<groupId>commons-net</groupId>
8686
<artifactId>commons-net</artifactId>
8787
</exclusion>
88+
<exclusion>
89+
<groupId>org.jenkins-ci.plugins</groupId>
90+
<artifactId>apache-httpcomponents-client-4-api</artifactId>
91+
</exclusion>
92+
<exclusion>
93+
<groupId>org.apache.maven.doxia</groupId>
94+
<artifactId>doxia-sink-api</artifactId>
95+
</exclusion>
96+
<exclusion>
97+
<groupId>org.apache.maven.wagon</groupId>
98+
<artifactId>wagon-webdav-jackrabbit</artifactId>
99+
</exclusion>
88100
</exclusions>
89101
</dependency>
90102
<dependency>
@@ -107,24 +119,24 @@
107119
<dependency>
108120
<groupId>org.jenkins-ci.plugins.workflow</groupId>
109121
<artifactId>workflow-job</artifactId>
110-
<version>2.17</version>
122+
<version>2.29</version>
111123
</dependency>
112124
<dependency>
113125
<groupId>org.jenkins-ci.plugins.workflow</groupId>
114126
<artifactId>workflow-multibranch</artifactId>
115-
<version>2.17</version>
127+
<version>2.20</version>
116128
<scope>test</scope>
117129
</dependency>
118130
<dependency>
119131
<groupId>org.jenkins-ci.plugins</groupId>
120132
<artifactId>pipeline-build-step</artifactId>
121-
<version>2.5.1</version>
133+
<version>2.7</version>
122134
<optional>true</optional>
123135
</dependency>
124136
<dependency>
125137
<groupId>org.jenkins-ci.plugins</groupId>
126138
<artifactId>branch-api</artifactId>
127-
<version>2.0.18</version>
139+
<version>2.0.20.1</version>
128140
</dependency>
129141
<dependency>
130142
<groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -133,27 +145,27 @@
133145
TODO when there is enough adoption of workflow-step-api with https://github.com/jenkinsci/workflow-step-api-plugin/pull/38
134146
Replace org.jenkinsci.plugins.pipeline.maven.fix.jenkins49337.GeneralNonBlockingStepExecution by org.jenkinsci.plugins.workflow.steps.GeneralNonBlockingStepExecution;
135147
-->
136-
<version>2.14</version>
148+
<version>2.16</version>
137149
</dependency>
138150
<dependency>
139151
<groupId>org.jenkins-ci.plugins.workflow</groupId>
140152
<artifactId>workflow-api</artifactId>
141-
<version>2.25</version>
153+
<version>2.32</version>
142154
</dependency>
143155
<dependency>
144156
<groupId>org.jenkins-ci.plugins</groupId>
145157
<artifactId>config-file-provider</artifactId>
146-
<version>2.17</version>
158+
<version>3.5</version>
147159
</dependency>
148160
<dependency>
149161
<groupId>org.jenkins-ci.plugins</groupId>
150162
<artifactId>credentials</artifactId>
151-
<version>2.1.16</version>
163+
<version>2.1.19</version>
152164
</dependency>
153165
<dependency>
154166
<groupId>org.jenkins-ci.plugins</groupId>
155167
<artifactId>cloudbees-folder</artifactId>
156-
<version>6.1.2</version>
168+
<version>6.6</version>
157169
</dependency>
158170
<dependency>
159171
<groupId>io.jenkins.plugins</groupId>
@@ -163,7 +175,7 @@
163175
<dependency>
164176
<groupId>org.jenkins-ci.plugins</groupId>
165177
<artifactId>script-security</artifactId>
166-
<version>1.39</version>
178+
<version>1.54.1</version>
167179
</dependency>
168180
<dependency>
169181
<groupId>org.jenkins-ci.plugins</groupId>
@@ -191,7 +203,7 @@
191203
<dependency>
192204
<groupId>org.jenkins-ci.plugins</groupId>
193205
<artifactId>htmlpublisher</artifactId>
194-
<version>1.14</version>
206+
<version>1.16</version>
195207
<scope>compile</scope>
196208
<optional>true</optional>
197209
</dependency>
@@ -205,9 +217,23 @@
205217
<dependency>
206218
<groupId>org.jenkins-ci.plugins</groupId>
207219
<artifactId>maven-invoker-plugin</artifactId>
208-
<version>1.3</version>
220+
<version>2.4</version>
209221
<scope>compile</scope>
210222
<optional>true</optional>
223+
<exclusions>
224+
<exclusion>
225+
<groupId>org.apache.maven.doxia</groupId>
226+
<artifactId>doxia-core</artifactId>
227+
</exclusion>
228+
<exclusion>
229+
<groupId>org.apache.maven.doxia</groupId>
230+
<artifactId>doxia-site-renderer</artifactId>
231+
</exclusion>
232+
<exclusion>
233+
<groupId>org.apache.maven.doxia</groupId>
234+
<artifactId>doxia-sink-api</artifactId>
235+
</exclusion>
236+
</exclusions>
211237
</dependency>
212238
<dependency>
213239
<groupId>org.jvnet.hudson.plugins</groupId>
@@ -253,25 +279,29 @@
253279
<groupId>org.ow2.asm</groupId>
254280
<artifactId>asm-tree</artifactId>
255281
</exclusion>
282+
<exclusion>
283+
<groupId>org.apache.httpcomponents</groupId>
284+
<artifactId>httpcore</artifactId>
285+
</exclusion>
256286
</exclusions>
257287
</dependency>
258288

259289
<dependency>
260290
<groupId>org.jenkins-ci.plugins.workflow</groupId>
261291
<artifactId>workflow-cps</artifactId>
262-
<version>2.44</version>
292+
<version>2.61.3</version>
263293
<scope>test</scope>
264294
</dependency>
265295
<dependency>
266296
<groupId>org.jenkins-ci.plugins.workflow</groupId>
267297
<artifactId>workflow-durable-task-step</artifactId>
268-
<version>2.18</version>
298+
<version>2.26</version>
269299
<scope>test</scope>
270300
</dependency>
271301
<dependency>
272302
<groupId>org.jenkins-ci.plugins.workflow</groupId>
273303
<artifactId>workflow-basic-steps</artifactId>
274-
<version>2.6</version>
304+
<version>2.12</version>
275305
<scope>test</scope>
276306
</dependency>
277307
<dependency>
@@ -290,18 +320,18 @@
290320
<dependency>
291321
<groupId>org.jenkins-ci.plugins</groupId>
292322
<artifactId>structs</artifactId>
293-
<version>1.13</version>
323+
<version>1.17</version>
294324
</dependency>
295325
<dependency>
296326
<groupId>org.jenkins-ci.plugins.workflow</groupId>
297327
<artifactId>workflow-scm-step</artifactId>
298-
<version>2.6</version>
328+
<version>2.7</version>
299329
<scope>test</scope>
300330
</dependency>
301331
<dependency>
302332
<groupId>org.jenkins-ci.plugins</groupId>
303333
<artifactId>pipeline-stage-step</artifactId>
304-
<version>2.2</version>
334+
<version>2.3</version>
305335
<scope>test</scope>
306336
</dependency>
307337
<dependency>
@@ -310,7 +340,7 @@
310340
-->
311341
<groupId>org.jenkins-ci.plugins</groupId>
312342
<artifactId>matrix-project</artifactId>
313-
<version>1.12</version>
343+
<version>1.14</version>
314344
<optional>true</optional>
315345
</dependency>
316346

@@ -323,7 +353,7 @@
323353
<dependency>
324354
<groupId>org.jenkins-ci.plugins</groupId>
325355
<artifactId>ssh-slaves</artifactId>
326-
<version>1.24</version>
356+
<version>1.29.4</version>
327357
<scope>test</scope>
328358
</dependency>
329359
<dependency>
@@ -365,7 +395,7 @@
365395
<dependency>
366396
<groupId>org.jenkins-ci.plugins</groupId>
367397
<artifactId>mailer</artifactId>
368-
<version>1.20</version>
398+
<version>1.21</version>
369399
</dependency>
370400
<dependency>
371401
<groupId>org.jenkins-ci.plugins</groupId>
@@ -375,7 +405,12 @@
375405
<dependency>
376406
<groupId>org.jenkins-ci.plugins</groupId>
377407
<artifactId>ssh-credentials</artifactId>
378-
<version>1.13</version>
408+
<version>1.14</version>
409+
</dependency>
410+
<dependency>
411+
<groupId>org.jenkins-ci.plugins</groupId>
412+
<artifactId>apache-httpcomponents-client-4-api</artifactId>
413+
<version>4.5.5-3.0</version>
379414
</dependency>
380415
<dependency>
381416
<groupId>org.apache.ant</groupId>
@@ -385,7 +420,7 @@
385420
<dependency>
386421
<groupId>org.apache.maven</groupId>
387422
<artifactId>maven-embedder</artifactId>
388-
<version>3.3.1</version>
423+
<version>3.5.0</version>
389424
</dependency>
390425
<dependency>
391426
<groupId>org.codehaus.plexus</groupId>
@@ -409,6 +444,9 @@
409444
<version>3.5.0</version>
410445
</dependency>
411446
<dependency>
447+
<!--
448+
for org.jenkins-ci.plugins:maven-invoker-plugin and org.jenkins-ci.main:maven-plugin
449+
-->
412450
<groupId>org.apache.maven</groupId>
413451
<artifactId>maven-aether-provider</artifactId>
414452
<version>3.3.9</version>
@@ -418,6 +456,16 @@
418456
<artifactId>maven-compat</artifactId>
419457
<version>3.5.0</version>
420458
</dependency>
459+
<dependency>
460+
<groupId>org.apache.maven</groupId>
461+
<artifactId>maven-repository-metadata</artifactId>
462+
<version>3.5.0</version>
463+
</dependency>
464+
<dependency>
465+
<groupId>org.apache.maven.shared</groupId>
466+
<artifactId>maven-shared-utils</artifactId>
467+
<version>3.2.1</version>
468+
</dependency>
421469
<dependency>
422470
<groupId>org.codehaus.plexus</groupId>
423471
<artifactId>plexus-utils</artifactId>
@@ -463,11 +511,23 @@
463511
<artifactId>jsch</artifactId>
464512
<version>0.1.54</version>
465513
</dependency>
514+
<!--
466515
<dependency>
467516
<groupId>org.apache.maven.doxia</groupId>
468517
<artifactId>doxia-sink-api</artifactId>
469-
<version>1.4</version>
518+
<version>1.7</version>
519+
</dependency>
520+
<dependency>
521+
<groupId>org.apache.maven.doxia</groupId>
522+
<artifactId>doxia-core</artifactId>
523+
<version>1.7</version>
524+
</dependency>
525+
<dependency>
526+
<groupId>org.apache.maven.doxia</groupId>
527+
<artifactId>doxia-site-renderer</artifactId>
528+
<version>1.7</version>
470529
</dependency>
530+
-->
471531
<dependency>
472532
<groupId>xerces</groupId>
473533
<artifactId>xercesImpl</artifactId>
@@ -481,7 +541,7 @@
481541
<dependency>
482542
<groupId>commons-io</groupId>
483543
<artifactId>commons-io</artifactId>
484-
<version>2.4</version>
544+
<version>2.5</version>
485545
</dependency>
486546
<dependency>
487547
<groupId>org.jvnet.localizer</groupId>
@@ -516,7 +576,7 @@
516576
<dependency>
517577
<groupId>org.kohsuke.stapler</groupId>
518578
<artifactId>stapler</artifactId>
519-
<version>1.254</version>
579+
<version>1.256</version>
520580
</dependency>
521581
<dependency>
522582
<groupId>org.apache.commons</groupId>
@@ -577,14 +637,17 @@
577637
</configuration>
578638
</execution>
579639
<execution>
580-
<id>copy-binary-files</id>
640+
<id>copy-apache-maven-350</id>
581641
<phase>process-test-resources</phase>
582642
<goals>
583643
<goal>copy</goal>
584644
</goals>
585645
<configuration>
586646
<artifactItems>
587647
<artifactItem>
648+
<!--
649+
download deprecated see org.jvnet.hudson.test.ExtendedToolInstallations.configureMaven35
650+
-->
588651
<groupId>org.apache.maven</groupId>
589652
<artifactId>apache-maven</artifactId>
590653
<version>3.5.0</version>
@@ -595,6 +658,25 @@
595658
</artifactItems>
596659
</configuration>
597660
</execution>
661+
<execution>
662+
<id>copy-apache-maven-361</id>
663+
<phase>process-test-resources</phase>
664+
<goals>
665+
<goal>copy</goal>
666+
</goals>
667+
<configuration>
668+
<artifactItems>
669+
<artifactItem>
670+
<groupId>org.apache.maven</groupId>
671+
<artifactId>apache-maven</artifactId>
672+
<version>3.6.1</version>
673+
<type>zip</type>
674+
<classifier>bin</classifier>
675+
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
676+
</artifactItem>
677+
</artifactItems>
678+
</configuration>
679+
</execution>
598680
</executions>
599681
</plugin>
600682
</plugins>

‎jenkins-plugin/src/test/java/org/jenkinsci/plugins/pipeline/maven/AbstractIntegrationTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public abstract class AbstractIntegrationTest {
3535

3636
@Before
3737
public void setup() throws Exception {
38-
// Maven.MavenInstallation maven3 = ToolInstallations.configureMaven35();
3938
Maven.MavenInstallation maven3 = ExtendedToolInstallations.configureMaven35();
4039

4140
mavenInstallationName = maven3.getName();

‎jenkins-plugin/src/test/java/org/jenkinsci/plugins/pipeline/maven/cause/MavenDependencyCauseHelperTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.jenkinsci.plugins.pipeline.maven.cause;
22

3-
import edu.emory.mathcs.backport.java.util.Arrays;
43
import org.hamcrest.Matchers;
54
import org.jenkinsci.plugins.pipeline.maven.MavenArtifact;
65
import org.junit.Assert;
76
import org.junit.Test;
87

8+
import java.util.Arrays;
99
import java.util.Collections;
1010
import java.util.List;
1111

0 commit comments

Comments
 (0)