You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/12/20 21:02:31 UTC
[maven-surefire] branch SUREFIRE-2129 updated (118d7806f -> 5d68d9cd2)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch SUREFIRE-2129
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
omit 118d7806f [SUREFIRE-2129] Upgrade Maven Reporting API to 3.1.1/Maven Reporting Impl to 3.2.0
add 12b9679dc [SUREFIRE-2135] Use native.encoding for ps parse
add ce1667928 [SUREFIRE-2136] Rename test dir that has colon
add f2d4ea99b [SUREFIRE-2126] Use the latest surefire version 3.0.0-M7 with self testing
add 815f8194a Use shared GitHub action v3
add 7ab8264c2 Add autolink for jira
add 52f276ba0 [SUREFIRE-1654] Remove deprecated forkMode parameter
new 5d68d9cd2 [SUREFIRE-2129] Upgrade Maven Reporting API to 3.1.1/Maven Reporting Impl to 3.2.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (118d7806f)
\
N -- N -- N refs/heads/SUREFIRE-2129 (5d68d9cd2)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.asf.yaml | 2 +
.github/workflows/maven-verify.yml | 2 +-
.github/workflows/release-drafter.yml | 2 +-
maven-failsafe-plugin/pom.xml | 2 +-
maven-surefire-common/pom.xml | 2 +-
.../plugin/surefire/AbstractSurefireMojo.java | 113 +--------------------
.../maven/plugin/surefire/CommonReflector.java | 2 +-
.../surefire/StartupReportConfiguration.java | 14 +--
.../maven/plugin/surefire/CommonReflectorTest.java | 2 +-
.../maven/plugin/surefire/MojoMocklessTest.java | 26 -----
.../report/DefaultReporterFactoryTest.java | 2 +-
maven-surefire-plugin/pom.xml | 2 +-
.../src/site/apt/examples/class-loading.apt.vm | 2 +-
.../fork-options-and-parallel-execution.apt.vm | 26 -----
maven-surefire-report-plugin/pom.xml | 2 +-
pom.xml | 4 +-
surefire-api/pom.xml | 2 +-
surefire-booter/pom.xml | 3 +-
.../apache/maven/surefire/booter/PpidChecker.java | 4 +-
.../maven/surefire/booter/PpidCheckerTest.java | 1 -
surefire-extensions-api/pom.xml | 2 +-
surefire-grouper/pom.xml | 2 +-
surefire-its/pom.xml | 9 +-
...java => CheckTestFailIfNoTestsForkCountIT.java} | 16 +--
.../maven/surefire/its/CheckTestNgSuiteXmlIT.java | 2 +-
.../maven/surefire/its/CrashDetectionIT.java | 15 +--
.../its/{ForkModeIT.java => ForkCountIT.java} | 72 ++++---------
...tiModuleIT.java => ForkCountMultiModuleIT.java} | 14 +--
...orkModeTestNGIT.java => ForkCountTestNGIT.java} | 8 +-
.../maven/surefire/its/ResultCountingIT.java | 13 +--
.../org/apache/maven/surefire/its/RunOrderIT.java | 19 ++--
.../surefire/its/RunOrderParallelForksIT.java | 4 +-
.../org/apache/maven/surefire/its/UmlautDirIT.java | 56 +++++++---
.../maven/surefire/its/XmlReporterRunTimeIT.java | 2 +-
.../surefire/its/fixture/SurefireLauncher.java | 21 +---
.../jiras/Surefire1177TestngParallelSuitesIT.java | 4 +-
.../Surefire1295AttributeJvmCrashesToTestsIT.java | 7 +-
.../its/jiras/Surefire1364SystemPropertiesIT.java | 20 ++--
.../its/jiras/Surefire1367AssumptionLogsIT.java | 19 ++--
...java => Surefire801ForkNeverClassLoaderIT.java} | 6 +-
.../jiras/Surefire839TestWithoutCategoriesIT.java | 6 +-
.../Surefire855AllowFailsafeUseArtifactFileIT.java | 9 +-
.../Surefire907PerThreadWithoutThreadCountIT.java | 46 ---------
...Surefire946KillMainProcessInReusableForkIT.java | 2 +-
.../src/test/resources/argLine-parameter/pom.xml | 2 +-
.../src/test/resources/argLine-properties/pom.xml | 2 +-
.../src/test/resources/consoleOutput/pom.xml | 3 +-
.../test/resources/consoleOutputEncoding/pom.xml | 6 +-
.../src/test/resources/consoleoutput-noisy/pom.xml | 6 +-
.../src/test/resources/crash-detection/pom.xml | 2 +-
.../src/test/resources/crash-during-test/pom.xml | 2 +-
.../test/resources/environment-variables/pom.xml | 6 +-
.../src/test/resources/fail-fast-junit/pom.xml | 1 -
.../src/test/resources/fail-fast-testng/pom.xml | 3 +-
.../src/test/resources/failingBuilds/pom.xml | 2 +-
.../test/resources/failure-result-counting/pom.xml | 6 +-
.../src/test/resources/failureOutput/pom.xml | 6 +-
.../src/test/resources/fork-consoleOutput/pom.xml | 6 +-
.../resources/fork-consoleOutputWithErrors/pom.xml | 6 +-
.../module-a}/pom.xml | 6 +-
.../module-a/src/test/java/forkCount}/Test1.java | 2 +-
.../module-a/src/test/java/forkCount}/Test2.java | 2 +-
.../module-a/src/test/java/forkCount}/Test3.java | 2 +-
.../module-b}/pom.xml | 6 +-
.../module-b/src/test/java/forkCount}/Test1.java | 2 +-
.../module-b/src/test/java/forkCount}/Test2.java | 2 +-
.../module-b/src/test/java/forkCount}/Test3.java | 2 +-
.../pom.xml | 7 +-
.../pom.xml | 9 +-
.../src/test/java/forkCount}/ResourceLoadTest.java | 2 +-
.../src/test/resources/myFile.txt | 0
.../pom.xml | 7 +-
.../src/test/java/forkCount}/Test1.java | 2 +-
.../src/test/java/forkCount}/Test2.java | 2 +-
.../src/test/java/forkCount}/Test3.java | 2 +-
.../resources/{fork-mode => fork-count}/pom.xml | 7 +-
.../src/test/java/forkCount}/Test1.java | 2 +-
.../src/test/java/forkCount}/Test2.java | 2 +-
.../src/test/java/forkCount}/Test3.java | 2 +-
surefire-its/src/test/resources/fork-fail/pom.xml | 2 +-
.../test/java/{forkMode => forkCount}/Test1.java | 2 +-
.../test/java/{forkMode => forkCount}/Test2.java | 2 +-
.../test/java/{forkMode => forkCount}/Test3.java | 2 +-
.../resources/fork-mode-resource-loading/pom.xml | 54 ----------
.../src/test/resources/fork-timeout/pom.xml | 6 +-
.../src/test/resources/java9-full-api/pom.xml | 4 +-
.../src/test/java/junit4/forkMode/Test1.java | 58 -----------
.../src/test/java/junit4/forkMode/Test2.java | 36 -------
.../src/test/java/junit4/forkMode/Test3.java | 36 -------
.../resources/junit4-forkAlways-staticInit/pom.xml | 3 +-
.../test/resources/junit47-redirect-output/pom.xml | 6 +-
.../pom.xml | 2 +-
.../junit47-static-inner-class-tests/pom.xml | 2 +-
.../test/resources/junit48-method-pattern/pom.xml | 2 +-
.../resources/junit48-multiple-methods/pom.xml | 2 +-
.../test/resources/junit48-single-method/pom.xml | 2 +-
.../src/test/resources/long-windows-path/pom.xml | 2 +-
surefire-its/src/test/resources/pom.xml | 2 -
surefire-its/src/test/resources/reporters/pom.xml | 6 +-
.../src/test/resources/result-counting/pom.xml | 6 +-
surefire-its/src/test/resources/runOrder/pom.xml | 2 +-
.../test/resources/small-result-counting/pom.xml | 6 +-
.../pom.xml | 1 -
.../surefire-1053-system-properties/pom.xml | 2 +-
.../surefire-1055-parallelTestCount/pom.xml | 2 +-
.../pom.xml | 4 +-
.../surefire-1158-remove-info-lines/pom.xml | 3 +-
.../surefire-1202-rerun-and-failfast/pom.xml | 3 +-
.../src/test/resources/surefire-1211/pom.xml | 2 +-
.../src/test/resources/surefire-1264/pom.xml | 2 +-
.../src/test/resources/surefire-1364/pom.xml | 4 +-
.../src/test/resources/surefire-1367/pom.xml | 3 +-
.../surefire-146-forkPerTestNoSetup/pom.xml | 3 +-
.../resources/surefire-162-charsetProvider/pom.xml | 2 +-
.../application/pom.xml | 1 -
.../resources/surefire-510-testClassPath/pom.xml | 3 +-
.../surefire-613-testCount-in-parallel/pom.xml | 2 +-
.../pom.xml | 10 +-
.../pom.xml | 2 +-
.../surefire-674-buildFailingWhenErrors/pom.xml | 6 +-
.../surefire-685-commaseparatedIncludes/pom.xml | 2 +-
.../surefire-812-log4j-classloader/pom.xml | 3 +-
.../resources/surefire-817-system-exit/pom.xml | 3 +-
.../surefire-855-failsafe-use-bundle/pom.xml | 3 +-
.../surefire-855-failsafe-use-jar/pom.xml | 3 +-
.../src/test/java/jiras/surefire855/jar/FooIT.java | 4 +-
.../surefire-855-failsafe-use-war/pom.xml | 3 +-
.../surefire-972-bizarre-noclassdef/boom/pom.xml | 3 +-
.../resources/test-helper-dump-pid-plugin/pom.xml | 2 +-
.../test/resources/testng-execute-error/pom.xml | 2 +-
.../src/test/resources/testng-listeners/pom.xml | 50 +++++----
surefire-logger-api/pom.xml | 3 +-
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-junit-platform/pom.xml | 1 -
surefire-providers/surefire-junit3/pom.xml | 2 +-
surefire-providers/surefire-junit4/pom.xml | 2 +-
surefire-providers/surefire-junit47/pom.xml | 2 +-
.../junitcore/NonConcurrentRunListener.java | 5 +-
surefire-providers/surefire-testng-utils/pom.xml | 2 +-
surefire-providers/surefire-testng/pom.xml | 2 +-
surefire-report-parser/pom.xml | 2 +-
surefire-shadefire/pom.xml | 1 -
146 files changed, 386 insertions(+), 740 deletions(-)
rename surefire-its/src/test/java/org/apache/maven/surefire/its/{CheckTestFailIfNoTestsForkModeIT.java => CheckTestFailIfNoTestsForkCountIT.java} (84%)
rename surefire-its/src/test/java/org/apache/maven/surefire/its/{ForkModeIT.java => ForkCountIT.java} (74%)
rename surefire-its/src/test/java/org/apache/maven/surefire/its/{ForkModeMultiModuleIT.java => ForkCountMultiModuleIT.java} (92%)
rename surefire-its/src/test/java/org/apache/maven/surefire/its/{ForkModeTestNGIT.java => ForkCountTestNGIT.java} (88%)
rename surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/{Surefire801ForkModeNoneClassLoaderIT.java => Surefire801ForkNeverClassLoaderIT.java} (86%)
delete mode 100755 surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
rename surefire-its/src/test/resources/{fork-mode-multimodule/module-b => fork-count-multimodule/module-a}/pom.xml (88%)
rename surefire-its/src/test/resources/{fork-mode-multimodule/module-b/src/test/java/forkMode => fork-count-multimodule/module-a/src/test/java/forkCount}/Test1.java (99%)
rename surefire-its/src/test/resources/{fork-mode-multimodule/module-a/src/test/java/forkMode => fork-count-multimodule/module-a/src/test/java/forkCount}/Test2.java (98%)
rename surefire-its/src/test/resources/{fork-mode-multimodule/module-b/src/test/java/forkMode => fork-count-multimodule/module-a/src/test/java/forkCount}/Test3.java (98%)
rename surefire-its/src/test/resources/{fork-mode-multimodule/module-a => fork-count-multimodule/module-b}/pom.xml (88%)
rename surefire-its/src/test/resources/{fork-mode-multimodule/module-a/src/test/java/forkMode => fork-count-multimodule/module-b/src/test/java/forkCount}/Test1.java (99%)
rename surefire-its/src/test/resources/{fork-mode-multimodule/module-b/src/test/java/forkMode => fork-count-multimodule/module-b/src/test/java/forkCount}/Test2.java (98%)
rename surefire-its/src/test/resources/{fork-mode-multimodule/module-a/src/test/java/forkMode => fork-count-multimodule/module-b/src/test/java/forkCount}/Test3.java (98%)
rename surefire-its/src/test/resources/{fork-mode-multimodule => fork-count-multimodule}/pom.xml (91%)
rename surefire-its/src/test/resources/{junit-fork-mode-always => fork-count-resource-loading}/pom.xml (89%)
rename surefire-its/src/test/resources/{fork-mode-resource-loading/src/test/java/forkMode => fork-count-resource-loading/src/test/java/forkCount}/ResourceLoadTest.java (98%)
rename surefire-its/src/test/resources/{fork-mode-resource-loading => fork-count-resource-loading}/src/test/resources/myFile.txt (100%)
rename surefire-its/src/test/resources/{fork-mode-testng => fork-count-testng}/pom.xml (92%)
rename surefire-its/src/test/resources/{fork-mode-testng/src/test/java/forkMode => fork-count-testng/src/test/java/forkCount}/Test1.java (99%)
rename surefire-its/src/test/resources/{fork-mode-testng/src/test/java/forkMode => fork-count-testng/src/test/java/forkCount}/Test2.java (98%)
rename surefire-its/src/test/resources/{fork-mode-testng/src/test/java/forkMode => fork-count-testng/src/test/java/forkCount}/Test3.java (98%)
rename surefire-its/src/test/resources/{fork-mode => fork-count}/pom.xml (91%)
rename surefire-its/src/test/resources/{fork-mode/src/test/java/forkMode => fork-count/src/test/java/forkCount}/Test1.java (99%)
rename surefire-its/src/test/resources/{fork-mode/src/test/java/forkMode => fork-count/src/test/java/forkCount}/Test2.java (98%)
rename surefire-its/src/test/resources/{fork-mode/src/test/java/forkMode => fork-count/src/test/java/forkCount}/Test3.java (98%)
rename surefire-its/src/test/resources/fork-fail/src/test/java/{forkMode => forkCount}/Test1.java (98%)
rename surefire-its/src/test/resources/fork-fail/src/test/java/{forkMode => forkCount}/Test2.java (98%)
rename surefire-its/src/test/resources/fork-fail/src/test/java/{forkMode => forkCount}/Test3.java (98%)
delete mode 100644 surefire-its/src/test/resources/fork-mode-resource-loading/pom.xml
delete mode 100644 surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java
delete mode 100644 surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java
delete mode 100644 surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java
[maven-surefire] 01/01: [SUREFIRE-2129] Upgrade Maven Reporting API to 3.1.1/Maven Reporting Impl to 3.2.0
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SUREFIRE-2129
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 5d68d9cd29488000931715f9af8582945bed1dc2
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Dec 3 13:18:38 2022 +0100
[SUREFIRE-2129] Upgrade Maven Reporting API to 3.1.1/Maven Reporting Impl to 3.2.0
This closes #579
---
maven-surefire-report-plugin/pom.xml | 23 ++++++++++++++++++++++
.../surefire/report/SurefireReportGenerator.java | 3 +--
pom.xml | 4 ++--
.../surefire/its/fixture/HelperAssertions.java | 4 ++--
4 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
index 40d566d3d..b48f894dd 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -46,6 +46,10 @@
<maven>${mavenVersion}</maven>
</prerequisites>
+ <properties>
+ <doxiaVersion>1.11.1</doxiaVersion>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
@@ -57,6 +61,11 @@
<artifactId>maven-core</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
@@ -67,6 +76,20 @@
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-core</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
index b4d9d2436..ee28d0899 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
@@ -36,7 +36,6 @@ import static org.apache.maven.doxia.sink.Sink.JUSTIFY_LEFT;
import static org.apache.maven.doxia.sink.SinkEventAttributes.CLASS;
import static org.apache.maven.doxia.sink.SinkEventAttributes.HREF;
import static org.apache.maven.doxia.sink.SinkEventAttributes.ID;
-import static org.apache.maven.doxia.sink.SinkEventAttributes.NAME;
import static org.apache.maven.doxia.sink.SinkEventAttributes.STYLE;
import static org.apache.maven.doxia.sink.SinkEventAttributes.TYPE;
@@ -725,7 +724,7 @@ public final class SurefireReportGenerator
{
// Dollar '$' for nested classes is not valid character in sink.anchor() and therefore it is ignored
// https://issues.apache.org/jira/browse/SUREFIRE-1443
- sink.unknown( A.toString(), TAG_TYPE_START, new SinkEventAttributeSet( NAME, anchor ) );
+ sink.unknown( A.toString(), TAG_TYPE_START, new SinkEventAttributeSet( ID, anchor ) );
sink.unknown( A.toString(), TAG_TYPE_END, null );
}
diff --git a/pom.xml b/pom.xml
index 8d8bdb11c..73f7664c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -170,7 +170,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
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 27f671bbe..dbfa5ff84 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
@@ -146,7 +146,7 @@ public final class HelperAssertions
reportsDirs.add( reportsDir );
}
ConsoleLogger logger = new PrintStreamLogger( System.out );
- SurefireReportParser parser = new SurefireReportParser( reportsDirs, Locale.getDefault(), logger );
+ SurefireReportParser parser = new SurefireReportParser( reportsDirs, Locale.ROOT, logger );
try
{
return parser.parseXMLReportFiles();
@@ -167,7 +167,7 @@ public final class HelperAssertions
reportsDirs.add( reportsDir );
}
ConsoleLogger logger = new PrintStreamLogger( System.out );
- SurefireReportParser parser = new SurefireReportParser( reportsDirs, Locale.getDefault(), logger );
+ SurefireReportParser parser = new SurefireReportParser( reportsDirs, Locale.ROOT, logger );
try
{
return parser.parseXMLReportFiles();