From c0810c87e089809b1e8a559c970719fede87f3c5 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Sun, 28 May 2023 11:55:56 +0200 Subject: [PATCH] [SUREFIRE-2171] Upgrade to Maven Surefire 3.1.0 This closes #646 --- maven-failsafe-plugin/pom.xml | 2 +- maven-surefire-common/pom.xml | 2 +- maven-surefire-plugin/pom.xml | 2 +- maven-surefire-report-plugin/pom.xml | 2 +- surefire-api/pom.xml | 2 +- surefire-booter/pom.xml | 2 +- surefire-extensions-api/pom.xml | 2 +- surefire-grouper/pom.xml | 2 +- surefire-its/pom.xml | 8 ++++---- .../maven/surefire/its/fixture/HelperAssertions.java | 5 ++--- surefire-logger-api/pom.xml | 2 +- surefire-providers/common-java5/pom.xml | 2 +- surefire-providers/common-junit3/pom.xml | 2 +- surefire-providers/common-junit4/pom.xml | 2 +- surefire-providers/common-junit48/pom.xml | 2 +- surefire-providers/pom.xml | 2 +- surefire-providers/surefire-junit3/pom.xml | 2 +- surefire-providers/surefire-junit4/pom.xml | 2 +- surefire-providers/surefire-junit47/pom.xml | 2 +- surefire-providers/surefire-testng-utils/pom.xml | 2 +- surefire-providers/surefire-testng/pom.xml | 2 +- surefire-report-parser/pom.xml | 2 +- 22 files changed, 26 insertions(+), 27 deletions(-) diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index 53327b826a..0f64e13301 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -113,7 +113,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index d4009434c9..12963273d8 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -149,7 +149,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index 9d2d367d57..276bed6ea8 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -90,7 +90,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index 714d94e3e5..78e8f54cc3 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -187,7 +187,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml index ad6bd587ba..b2f4840eeb 100644 --- a/surefire-api/pom.xml +++ b/surefire-api/pom.xml @@ -88,7 +88,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/surefire-booter/pom.xml b/surefire-booter/pom.xml index 4eb498736b..762a9c4d40 100644 --- a/surefire-booter/pom.xml +++ b/surefire-booter/pom.xml @@ -116,7 +116,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/surefire-extensions-api/pom.xml b/surefire-extensions-api/pom.xml index d73038fe63..3e7584900a 100644 --- a/surefire-extensions-api/pom.xml +++ b/surefire-extensions-api/pom.xml @@ -82,7 +82,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/surefire-grouper/pom.xml b/surefire-grouper/pom.xml index d4372aeb95..1f4527f79e 100644 --- a/surefire-grouper/pom.xml +++ b/surefire-grouper/pom.xml @@ -77,7 +77,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml index 4062c74037..1713eaf742 100644 --- a/surefire-its/pom.xml +++ b/surefire-its/pom.xml @@ -39,7 +39,7 @@ org.apache.maven.surefire surefire-report-parser - 3.0.0-M7 + 3.1.0 test @@ -128,7 +128,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 @@ -176,7 +176,7 @@ maven-failsafe-plugin - 3.0.0-M7 + 3.1.0 ${skipTests} @@ -205,7 +205,7 @@ org.apache.maven.surefire surefire-junit47 - 3.0.0-M7 + 3.1.0 diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java index f99d690176..dcd43f6532 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java @@ -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; @@ -129,7 +128,7 @@ public static List 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) { @@ -145,7 +144,7 @@ private static List 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) { diff --git a/surefire-logger-api/pom.xml b/surefire-logger-api/pom.xml index 6d8ba2542c..5b717a4d03 100644 --- a/surefire-logger-api/pom.xml +++ b/surefire-logger-api/pom.xml @@ -84,7 +84,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/surefire-providers/common-java5/pom.xml b/surefire-providers/common-java5/pom.xml index 9354a9c9ee..846b1df674 100644 --- a/surefire-providers/common-java5/pom.xml +++ b/surefire-providers/common-java5/pom.xml @@ -69,7 +69,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/surefire-providers/common-junit3/pom.xml b/surefire-providers/common-junit3/pom.xml index 73e9717cda..7a8e7bd026 100644 --- a/surefire-providers/common-junit3/pom.xml +++ b/surefire-providers/common-junit3/pom.xml @@ -70,7 +70,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/surefire-providers/common-junit4/pom.xml b/surefire-providers/common-junit4/pom.xml index 65030e4e32..d12ad16806 100644 --- a/surefire-providers/common-junit4/pom.xml +++ b/surefire-providers/common-junit4/pom.xml @@ -80,7 +80,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/surefire-providers/common-junit48/pom.xml b/surefire-providers/common-junit48/pom.xml index 02848eeab9..1b31052d25 100644 --- a/surefire-providers/common-junit48/pom.xml +++ b/surefire-providers/common-junit48/pom.xml @@ -123,7 +123,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/surefire-providers/pom.xml b/surefire-providers/pom.xml index cb9bc30a38..16aa20bc4e 100644 --- a/surefire-providers/pom.xml +++ b/surefire-providers/pom.xml @@ -61,7 +61,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/surefire-providers/surefire-junit3/pom.xml b/surefire-providers/surefire-junit3/pom.xml index 797b6352a7..147e3947b6 100644 --- a/surefire-providers/surefire-junit3/pom.xml +++ b/surefire-providers/surefire-junit3/pom.xml @@ -80,7 +80,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/surefire-providers/surefire-junit4/pom.xml b/surefire-providers/surefire-junit4/pom.xml index 201245d9d7..604a92ec22 100644 --- a/surefire-providers/surefire-junit4/pom.xml +++ b/surefire-providers/surefire-junit4/pom.xml @@ -78,7 +78,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/surefire-providers/surefire-junit47/pom.xml b/surefire-providers/surefire-junit47/pom.xml index 477aeaef96..1bd57705ca 100644 --- a/surefire-providers/surefire-junit47/pom.xml +++ b/surefire-providers/surefire-junit47/pom.xml @@ -96,7 +96,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/surefire-providers/surefire-testng-utils/pom.xml b/surefire-providers/surefire-testng-utils/pom.xml index 24b292c723..1ae7398a00 100644 --- a/surefire-providers/surefire-testng-utils/pom.xml +++ b/surefire-providers/surefire-testng-utils/pom.xml @@ -82,7 +82,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml index baab50f703..73e2335702 100644 --- a/surefire-providers/surefire-testng/pom.xml +++ b/surefire-providers/surefire-testng/pom.xml @@ -98,7 +98,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0 diff --git a/surefire-report-parser/pom.xml b/surefire-report-parser/pom.xml index e99f5cc108..2a6c727738 100644 --- a/surefire-report-parser/pom.xml +++ b/surefire-report-parser/pom.xml @@ -71,7 +71,7 @@ org.apache.maven.surefire surefire-shadefire - 3.0.0-M7 + 3.1.0