Skip to content

Commit aa864f4

Browse files
michael-omichael-o
committed
[SUREFIRE-2216] Upgrade plugins and components (in ITs)
This closes #690
1 parent 6662e07 commit aa864f4

File tree

22 files changed

+33
-35
lines changed

22 files changed

+33
-35
lines changed

‎maven-failsafe-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<dependency>
115115
<groupId>org.apache.maven.surefire</groupId>
116116
<artifactId>surefire-shadefire</artifactId>
117-
<version>3.1.0</version>
117+
<version>3.2.2</version>
118118
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
119119
</dependency>
120120
</dependencies>

‎maven-surefire-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
<dependency>
155155
<groupId>org.apache.maven.surefire</groupId>
156156
<artifactId>surefire-shadefire</artifactId>
157-
<version>3.1.0</version>
157+
<version>3.2.2</version>
158158
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
159159
</dependency>
160160
</dependencies>

‎maven-surefire-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<dependency>
8787
<groupId>org.apache.maven.surefire</groupId>
8888
<artifactId>surefire-shadefire</artifactId>
89-
<version>3.1.0</version>
89+
<version>3.2.2</version>
9090
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
9191
</dependency>
9292
</dependencies>

‎maven-surefire-report-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
<dependency>
188188
<groupId>org.apache.maven.surefire</groupId>
189189
<artifactId>surefire-shadefire</artifactId>
190-
<version>3.1.0</version>
190+
<version>3.2.2</version>
191191
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
192192
</dependency>
193193
</dependencies>

‎pom.xml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@
8989
<properties>
9090
<javaVersion>8</javaVersion>
9191
<mavenVersion>3.2.5</mavenVersion>
92-
<commonsLang3Version>3.12.0</commonsLang3Version>
93-
<commonsCompress>1.23.0</commonsCompress>
94-
<commonsIoVersion>2.12.0</commonsIoVersion>
92+
<commonsLang3Version>3.14.0</commonsLang3Version>
93+
<commonsCompress>1.25.0</commonsCompress>
94+
<commonsIoVersion>2.15.0</commonsIoVersion>
9595
<plexus-java-version>1.2.0</plexus-java-version>
96-
<!-- maven-shared-utils:3.3.4 uses org.fusesource.jansi:jansi:2.2.0 -->
96+
<!-- Do not upgrade, leads to test failures, MSHARED-1014 -->
9797
<mavenSharedUtilsVersion>3.3.4</mavenSharedUtilsVersion>
9898
<powermockVersion>2.0.9</powermockVersion>
9999
<jacocoVersion>0.8.8</jacocoVersion>
@@ -183,6 +183,7 @@
183183
</exclusions>
184184
</dependency>
185185
<dependency>
186+
<!-- Do not upgrade, leads to test failures, needs analysis -->
186187
<groupId>org.apache.maven.shared</groupId>
187188
<artifactId>maven-common-artifact-filters</artifactId>
188189
<version>3.1.1</version>
@@ -223,6 +224,7 @@
223224
<version>2.4.0</version>
224225
</dependency>
225226
<dependency>
227+
<!-- Do not upgrade, needs code changes -->
226228
<groupId>org.apache.maven.shared</groupId>
227229
<artifactId>maven-verifier</artifactId>
228230
<version>1.8.0</version>
@@ -306,17 +308,13 @@
306308
<classifier>runtime</classifier>
307309
</dependency>
308310
<dependency>
311+
<!-- Do not upgrade, leads to test failures, needs analysis -->
309312
<groupId>org.junit</groupId>
310313
<artifactId>junit-bom</artifactId>
311314
<version>5.9.3</version>
312315
<type>pom</type>
313316
<scope>import</scope>
314317
</dependency>
315-
<dependency>
316-
<groupId>org.codehaus.plexus</groupId>
317-
<artifactId>plexus-xml</artifactId>
318-
<version>3.0.0</version>
319-
</dependency>
320318
</dependencies>
321319
</dependencyManagement>
322320
<dependencies>
@@ -367,7 +365,7 @@
367365
</plugin>
368366
<plugin>
369367
<artifactId>maven-surefire-plugin</artifactId>
370-
<version>3.1.0</version>
368+
<version>3.2.2</version>
371369
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
372370
<configuration>
373371
<!-- NOTE: Be sure to isolate the Surefire version under test from the version running the tests! -->
@@ -514,7 +512,7 @@
514512
<plugin>
515513
<groupId>org.apache.maven.plugins</groupId>
516514
<artifactId>maven-surefire-report-plugin</artifactId>
517-
<version>3.1.0</version>
515+
<version>3.2.2</version>
518516
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
519517
</plugin>
520518
</plugins>

‎surefire-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<dependency>
8989
<groupId>org.apache.maven.surefire</groupId>
9090
<artifactId>surefire-shadefire</artifactId>
91-
<version>3.1.0</version>
91+
<version>3.2.2</version>
9292
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
9393
</dependency>
9494
</dependencies>

‎surefire-booter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<dependency>
117117
<groupId>org.apache.maven.surefire</groupId>
118118
<artifactId>surefire-shadefire</artifactId>
119-
<version>3.1.0</version>
119+
<version>3.2.2</version>
120120
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
121121
</dependency>
122122
</dependencies>

‎surefire-extensions-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<dependency>
8383
<groupId>org.apache.maven.surefire</groupId>
8484
<artifactId>surefire-shadefire</artifactId>
85-
<version>3.1.0</version>
85+
<version>3.2.2</version>
8686
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
8787
</dependency>
8888
</dependencies>

‎surefire-grouper/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<dependency>
7878
<groupId>org.apache.maven.surefire</groupId>
7979
<artifactId>surefire-shadefire</artifactId>
80-
<version>3.1.0</version>
80+
<version>3.2.2</version>
8181
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
8282
</dependency>
8383
</dependencies>

‎surefire-its/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>org.apache.maven.surefire</groupId>
4141
<artifactId>surefire-report-parser</artifactId>
42-
<version>3.1.0</version>
42+
<version>3.2.2</version>
4343
<scope>test</scope>
4444
</dependency>
4545
<dependency>
@@ -128,7 +128,7 @@
128128
<dependency>
129129
<groupId>org.apache.maven.surefire</groupId>
130130
<artifactId>surefire-shadefire</artifactId>
131-
<version>3.1.0</version>
131+
<version>3.2.2</version>
132132
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
133133
</dependency>
134134
</dependencies>
@@ -176,7 +176,7 @@
176176
<plugins>
177177
<plugin>
178178
<artifactId>maven-failsafe-plugin</artifactId>
179-
<version>3.1.0</version>
179+
<version>3.2.2</version>
180180
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
181181
<configuration>
182182
<skipTests>${skipTests}</skipTests>
@@ -205,7 +205,7 @@
205205
<dependency>
206206
<groupId>org.apache.maven.surefire</groupId>
207207
<artifactId>surefire-junit47</artifactId>
208-
<version>3.1.0</version>
208+
<version>3.2.2</version>
209209
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
210210
</dependency>
211211
</dependencies>

‎surefire-logger-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<dependency>
8585
<groupId>org.apache.maven.surefire</groupId>
8686
<artifactId>surefire-shadefire</artifactId>
87-
<version>3.1.0</version>
87+
<version>3.2.2</version>
8888
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
8989
</dependency>
9090
</dependencies>

‎surefire-providers/common-java5/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<dependency>
7070
<groupId>org.apache.maven.surefire</groupId>
7171
<artifactId>surefire-shadefire</artifactId>
72-
<version>3.1.0</version>
72+
<version>3.2.2</version>
7373
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
7474
</dependency>
7575
</dependencies>

‎surefire-providers/common-junit3/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<dependency>
7171
<groupId>org.apache.maven.surefire</groupId>
7272
<artifactId>surefire-shadefire</artifactId>
73-
<version>3.1.0</version>
73+
<version>3.2.2</version>
7474
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
7575
</dependency>
7676
</dependencies>

‎surefire-providers/common-junit4/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>org.apache.maven.surefire</groupId>
8282
<artifactId>surefire-shadefire</artifactId>
83-
<version>3.1.0</version>
83+
<version>3.2.2</version>
8484
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
8585
</dependency>
8686
</dependencies>

‎surefire-providers/common-junit48/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<dependency>
124124
<groupId>org.apache.maven.surefire</groupId>
125125
<artifactId>surefire-shadefire</artifactId>
126-
<version>3.1.0</version>
126+
<version>3.2.2</version>
127127
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
128128
</dependency>
129129
</dependencies>

‎surefire-providers/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<dependency>
6262
<groupId>org.apache.maven.surefire</groupId>
6363
<artifactId>surefire-shadefire</artifactId>
64-
<version>3.1.0</version>
64+
<version>3.2.2</version>
6565
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
6666
</dependency>
6767
</dependencies>

‎surefire-providers/surefire-junit3/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>org.apache.maven.surefire</groupId>
8282
<artifactId>surefire-shadefire</artifactId>
83-
<version>3.1.0</version>
83+
<version>3.2.2</version>
8484
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
8585
</dependency>
8686
</dependencies>

‎surefire-providers/surefire-junit4/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<dependency>
7979
<groupId>org.apache.maven.surefire</groupId>
8080
<artifactId>surefire-shadefire</artifactId>
81-
<version>3.1.0</version>
81+
<version>3.2.2</version>
8282
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
8383
</dependency>
8484
</dependencies>

‎surefire-providers/surefire-junit47/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<dependency>
9797
<groupId>org.apache.maven.surefire</groupId>
9898
<artifactId>surefire-shadefire</artifactId>
99-
<version>3.1.0</version>
99+
<version>3.2.2</version>
100100
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
101101
</dependency>
102102
</dependencies>

‎surefire-providers/surefire-testng-utils/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<dependency>
8383
<groupId>org.apache.maven.surefire</groupId>
8484
<artifactId>surefire-shadefire</artifactId>
85-
<version>3.1.0</version>
85+
<version>3.2.2</version>
8686
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
8787
</dependency>
8888
</dependencies>

‎surefire-providers/surefire-testng/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<groupId>org.apache.maven.surefire</groupId>
9999
<artifactId>surefire-shadefire</artifactId>
100100
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
101-
<version>3.1.0</version>
101+
<version>3.2.2</version>
102102
</dependency>
103103
</dependencies>
104104
</plugin>

‎surefire-report-parser/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<dependency>
7272
<groupId>org.apache.maven.surefire</groupId>
7373
<artifactId>surefire-shadefire</artifactId>
74-
<version>3.1.0</version>
74+
<version>3.2.2</version>
7575
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
7676
</dependency>
7777
</dependencies>

0 commit comments

Comments
 (0)