Skip to content

Commit

Permalink
Update Sufefire
Browse files Browse the repository at this point in the history
  • Loading branch information
@michael-o
michael-o committed May 28, 2023
1 parent 2967be3 commit 23cf5c8
Show file tree
Hide file tree
Showing 22 changed files with 26 additions and 27 deletions.
2 changes: 1 addition & 1 deletion maven-failsafe-plugin/pom.xml
View file
Expand Up @@ -113,7 +113,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion maven-surefire-common/pom.xml
View file
Expand Up @@ -149,7 +149,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion maven-surefire-plugin/pom.xml
View file
Expand Up @@ -90,7 +90,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion maven-surefire-report-plugin/pom.xml
View file
Expand Up @@ -187,7 +187,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion surefire-api/pom.xml
View file
Expand Up @@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion surefire-booter/pom.xml
View file
Expand Up @@ -116,7 +116,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion surefire-extensions-api/pom.xml
View file
Expand Up @@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion surefire-grouper/pom.xml
View file
Expand Up @@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions surefire-its/pom.xml
View file
Expand Up @@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-report-parser</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -128,7 +128,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down Expand Up @@ -176,7 +176,7 @@
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
<configuration>
<skipTests>${skipTests}</skipTests>
Expand Down Expand Up @@ -205,7 +205,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
5 changes: 2 additions & 3 deletions surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
View file
Expand Up @@ -21,7 +21,6 @@
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;

import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
import org.apache.maven.plugin.surefire.log.api.PrintStreamLogger;
Expand Down Expand Up @@ -129,7 +128,7 @@ public static List<ReportTestSuite> extractReports(File... testDirs) {
reportsDirs.add(reportsDir);
}
ConsoleLogger logger = new PrintStreamLogger(System.out);
SurefireReportParser parser = new SurefireReportParser(reportsDirs, Locale.ROOT, logger);
SurefireReportParser parser = new SurefireReportParser(reportsDirs, logger);
try {
return parser.parseXMLReportFiles();
} catch (Exception e) {
Expand All @@ -145,7 +144,7 @@ private static List<ReportTestSuite> extractITReports(File... testDirs) {
reportsDirs.add(reportsDir);
}
ConsoleLogger logger = new PrintStreamLogger(System.out);
SurefireReportParser parser = new SurefireReportParser(reportsDirs, Locale.ROOT, logger);
SurefireReportParser parser = new SurefireReportParser(reportsDirs, logger);
try {
return parser.parseXMLReportFiles();
} catch (Exception e) {
Expand Down
2 changes: 1 addition & 1 deletion surefire-logger-api/pom.xml
View file
Expand Up @@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion surefire-providers/common-java5/pom.xml
View file
Expand Up @@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion surefire-providers/common-junit3/pom.xml
View file
Expand Up @@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion surefire-providers/common-junit4/pom.xml
View file
Expand Up @@ -80,7 +80,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion surefire-providers/common-junit48/pom.xml
View file
Expand Up @@ -123,7 +123,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion surefire-providers/pom.xml
View file
Expand Up @@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion surefire-providers/surefire-junit3/pom.xml
View file
Expand Up @@ -80,7 +80,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion surefire-providers/surefire-junit4/pom.xml
View file
Expand Up @@ -78,7 +78,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion surefire-providers/surefire-junit47/pom.xml
View file
Expand Up @@ -96,7 +96,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion surefire-providers/surefire-testng-utils/pom.xml
View file
Expand Up @@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion surefire-providers/surefire-testng/pom.xml
View file
Expand Up @@ -98,7 +98,7 @@
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
<version>3.0.0-M7</version>
<version>3.1.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion surefire-report-parser/pom.xml
View file
Expand Up @@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-shadefire</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
<!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
Expand Down

0 comments on commit 23cf5c8

Please sign in to comment.