pool/maven-surefire
SHA256
12
0
Fork 2
Code Issues Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-surefire?expand=0&rev=57

Browse Source
This commit is contained in:
Fridrich Strba
2025-03-31 15:33:51 +00:00
committed by Git OBS Bridge
parent 6b6f591eb2
commit 5ee38c0e26
6 changed files with 350 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

253
0002-Unshade-surefire.patch
View File

@@ -1,4 +1,4 @@
From 05af044e62a9082624fe6a4cf8f409e14486efbd Mon Sep 17 00:00:00 2001
From b42885011a1ba16ac446a2b83a8164677519066f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Tue, 1 Oct 2024 22:01:47 +0200
Subject: [PATCH 2/2] Unshade surefire
@@ -7,9 +7,10 @@ Subject: [PATCH 2/2] Unshade surefire
maven-failsafe-plugin/pom.xml | 26 +++++----------
.../maven/plugin/failsafe/VerifyMojo.java | 2 +-
.../util/FailsafeSummaryXmlUtils.java | 6 ++--
maven-surefire-common/pom.xml | 32 +++++++++++++------
.../plugin/surefire/AbstractSurefireMojo.java | 22 ++++++-------
maven-surefire-common/pom.xml | 32 ++++++++++++------
.../plugin/surefire/AbstractSurefireMojo.java | 28 +++++++---------
.../surefire/StartupReportConfiguration.java | 2 +-
.../surefire/SurefireDependencyResolver.java | 1 -
.../maven/plugin/surefire/SurefireHelper.java | 2 +-
.../plugin/surefire/SurefireProperties.java | 2 +-
.../maven/plugin/surefire/TestClassPath.java | 2 +-
@@ -31,9 +32,10 @@ Subject: [PATCH 2/2] Unshade surefire
.../plugin/surefire/util/ScannerUtil.java | 2 +-
.../surefire/util/SpecificFileFilter.java | 2 +-
.../maven/surefire/stream/EventDecoder.java | 2 +-
.../surefire/AbstractSurefireMojoTest.java | 6 ++--
.../AbstractSurefireMojoJava7PlusTest.java | 30 +++--------------
.../surefire/AbstractSurefireMojoTest.java | 33 +++----------------
.../plugin/surefire/SurefireHelperTest.java | 2 +-
.../booterclient/ForkConfigurationTest.java | 22 ++++++-------
.../booterclient/ForkConfigurationTest.java | 22 +++++--------
.../booterclient/ForkStarterTest.java | 6 ++--
.../JarManifestForkConfigurationTest.java | 2 +-
...ModularClasspathForkConfigurationTest.java | 2 +-
@@ -44,7 +46,7 @@ Subject: [PATCH 2/2] Unshade surefire
.../StatelessTestsetInfoReporterTest.java | 2 +-
.../report/ConsoleOutputFileReporterTest.java | 2 +-
maven-surefire-report-plugin/pom.xml | 21 +++++++++---
pom.xml | 1 -
pom.xml | 17 ----------
surefire-api/pom.xml | 17 +++++++---
.../maven/surefire/api/booter/Command.java | 2 +-
.../api/filter/SpecificTestClassFilter.java | 2 +-
@@ -57,7 +59,7 @@ Subject: [PATCH 2/2] Unshade surefire
.../api/util/internal/ClassMethod.java | 2 +-
.../api/util/internal/ObjectUtils.java | 4 +--
.../api/util/internal/ObjectUtilsTest.java | 4 +--
surefire-booter/pom.xml | 27 +++++++++++++---
surefire-booter/pom.xml | 27 ++++++++++++---
.../maven/surefire/booter/CommandReader.java | 4 +--
.../maven/surefire/booter/ForkedBooter.java | 2 +-
.../maven/surefire/booter/PpidChecker.java | 10 +++---
@@ -85,7 +87,7 @@ Subject: [PATCH 2/2] Unshade surefire
surefire-providers/common-junit48/pom.xml | 8 ++---
.../common/junit48/FilterFactory.java | 2 +-
.../common/junit48/FilterFactoryTest.java | 2 +-
.../surefire-junit-platform/pom.xml | 18 ++++++++---
.../surefire-junit-platform/pom.xml | 18 +++++++---
.../junitplatform/JUnitPlatformProvider.java | 4 +--
.../junitplatform/RunListenerAdapter.java | 2 +-
surefire-providers/surefire-junit3/pom.xml | 10 +++---
@@ -94,7 +96,8 @@ Subject: [PATCH 2/2] Unshade surefire
.../testng/TestNGDirectoryTestSuite.java | 2 +-
.../maven/surefire/testng/TestNGExecutor.java | 2 +-
surefire-report-parser/pom.xml | 5 +++
90 files changed, 283 insertions(+), 235 deletions(-)
surefire-shadefire/pom.xml | 1 -
93 files changed, 289 insertions(+), 310 deletions(-)
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index dc71f83ad..480a18dc1 100644
@@ -241,7 +244,7 @@ index aba5a859b..58ed7a692 100644
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index b783d73be..a6864899a 100644
index b783d73be..60bb2fec4 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -81,6 +81,7 @@
@@ -300,6 +303,33 @@ index b783d73be..a6864899a 100644
/**
* Abstract base class for running tests using Surefire.
@@ -1874,7 +1874,6 @@ private StartupConfiguration newStartupConfigWithClasspath(
getApiArtifact(),
getSpiArtifact(),
getLoggerApiArtifact(),
- getSurefireSharedUtilsArtifact()
};
Set<Artifact> inProcArtifacts = retainInProcArtifactsUnique(providerArtifacts, additionalInProcArtifacts);
Classpath inProcClasspath = createInProcClasspath(providerClasspath, inProcArtifacts);
@@ -1997,7 +1996,6 @@ private StartupConfiguration newStartupConfigWithModularPath(
getApiArtifact(),
getSpiArtifact(),
getLoggerApiArtifact(),
- getSurefireSharedUtilsArtifact()
};
Set<Artifact> inProcArtifacts = retainInProcArtifactsUnique(providerArtifacts, additionalInProcArtifacts);
Classpath inProcClasspath = createInProcClasspath(providerClasspath, inProcArtifacts);
@@ -2041,10 +2039,6 @@ private Artifact getApiArtifact() {
return getPluginArtifactMap().get("org.apache.maven.surefire:surefire-api");
}
- private Artifact getSurefireSharedUtilsArtifact() {
- return getPluginArtifactMap().get("org.apache.maven.surefire:surefire-shared-utils");
- }
-
private Artifact getLoggerApiArtifact() {
return getPluginArtifactMap().get("org.apache.maven.surefire:surefire-logger-api");
}
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
index cd805c7c7..ef11bab33 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
@@ -316,6 +346,18 @@ index cd805c7c7..ef11bab33 100644
/**
* All the parameters used to construct reporters
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
index 46739e347..85dd3e99a 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
@@ -78,7 +78,6 @@ class SurefireDependencyResolver {
"surefire-junit-platform",
"surefire-api",
"surefire-logger-api",
- "surefire-shared-utils",
"common-java5",
"common-junit3",
"common-junit4",
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
index 6285506c7..ab0628d9f 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
@@ -703,8 +745,84 @@ index 0bfc1e26b..f03a83d7a 100644
/**
*
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
index 39007de0d..4fa30a81c 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
@@ -199,16 +199,6 @@ public void shouldHaveStartupConfigForModularClasspath() throws Exception {
"org.apache.maven.surefire", "surefire-booter", createFromVersion("1"), "runtime", "jar", "", handler);
booter.setFile(mockFile("surefire-booter.jar"));
- Artifact utils = new DefaultArtifact(
- "org.apache.maven.surefire",
- "surefire-shared-utils",
- createFromVersion("1"),
- "runtime",
- "jar",
- "",
- handler);
- utils.setFile(mockFile("surefire-shared-utils.jar"));
-
Map<String, Artifact> artifacts = new HashMap<>();
artifacts.put("org.apache.maven.surefire:maven-surefire-common", common);
artifacts.put("org.apache.maven.surefire:surefire-extensions-api", ext);
@@ -216,7 +206,6 @@ public void shouldHaveStartupConfigForModularClasspath() throws Exception {
artifacts.put("org.apache.maven.surefire:surefire-logger-api", loggerApi);
artifacts.put("org.apache.maven.surefire:surefire-extensions-spi", spi);
artifacts.put("org.apache.maven.surefire:surefire-booter", booter);
- artifacts.put("org.apache.maven.surefire:surefire-shared-utils", utils);
when(mojo.getPluginArtifactMap()).thenReturn(artifacts);
ProviderInfo providerInfo = mock(ProviderInfo.class);
@@ -259,8 +248,8 @@ public void shouldHaveStartupConfigForModularClasspath() throws Exception {
"test(compact) classpath: non-modular.jar junit.jar hamcrest.jar",
"test(compact) modulepath: modular.jar classes",
"provider(compact) classpath: surefire-provider.jar",
- "in-process classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar surefire-shared-utils.jar",
- "in-process(compact) classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar surefire-shared-utils.jar");
+ "in-process classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar",
+ "in-process(compact) classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar");
assertThat(conf).isNotNull();
assertThat(conf.isShadefire()).isFalse();
@@ -369,16 +358,6 @@ public void shouldHaveStartupConfigForModularClasspathAndTestDescriptor() throws
"org.apache.maven.surefire", "surefire-booter", createFromVersion("1"), "runtime", "jar", "", handler);
booter.setFile(mockFile("surefire-booter.jar"));
- Artifact utils = new DefaultArtifact(
- "org.apache.maven.surefire",
- "surefire-shared-utils",
- createFromVersion("1"),
- "runtime",
- "jar",
- "",
- handler);
- utils.setFile(mockFile("surefire-shared-utils.jar"));
-
Map<String, Artifact> artifacts = new HashMap<>();
artifacts.put("org.apache.maven.surefire:maven-surefire-common", common);
artifacts.put("org.apache.maven.surefire:surefire-extensions-api", ext);
@@ -386,7 +365,6 @@ public void shouldHaveStartupConfigForModularClasspathAndTestDescriptor() throws
artifacts.put("org.apache.maven.surefire:surefire-logger-api", loggerApi);
artifacts.put("org.apache.maven.surefire:surefire-extensions-spi", spi);
artifacts.put("org.apache.maven.surefire:surefire-booter", booter);
- artifacts.put("org.apache.maven.surefire:surefire-shared-utils", utils);
when(mojo.getPluginArtifactMap()).thenReturn(artifacts);
ProviderInfo providerInfo = mock(ProviderInfo.class);
@@ -417,8 +395,8 @@ public void shouldHaveStartupConfigForModularClasspathAndTestDescriptor() throws
"test(compact) classpath:",
"test(compact) modulepath: test-classes classes modular.jar non-modular.jar junit.jar hamcrest.jar",
"provider(compact) classpath: surefire-provider.jar",
- "in-process classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar surefire-shared-utils.jar",
- "in-process(compact) classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar surefire-shared-utils.jar");
+ "in-process classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar",
+ "in-process(compact) classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar");
assertThat(conf).isNotNull();
assertThat(conf.isShadefire()).isFalse();
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
index c2967b534..1fb6e73be 100644
index c2967b534..eccf65741 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
@@ -91,12 +91,12 @@
@@ -723,6 +841,75 @@ index c2967b534..1fb6e73be 100644
import static org.assertj.core.api.Assertions.assertThat;
import static org.codehaus.plexus.languages.java.jpms.ModuleNameSource.MODULEDESCRIPTOR;
import static org.mockito.ArgumentMatchers.any;
@@ -478,16 +478,6 @@ public void shouldHaveStartupConfigForNonModularClasspath() throws Exception {
"org.apache.maven.surefire", "surefire-booter", createFromVersion("1"), "runtime", "jar", "", handler);
booter.setFile(mockFile("surefire-booter.jar"));
- Artifact utils = new DefaultArtifact(
- "org.apache.maven.surefire",
- "surefire-shared-utils",
- createFromVersion("1"),
- "runtime",
- "jar",
- "",
- handler);
- utils.setFile(mockFile("surefire-shared-utils.jar"));
-
Map<String, Artifact> providerArtifactsMap = new HashMap<>();
providerArtifactsMap.put("org.apache.maven.surefire:maven-surefire-common", common);
providerArtifactsMap.put("org.apache.maven.surefire:surefire-extensions-api", ext);
@@ -495,7 +485,6 @@ public void shouldHaveStartupConfigForNonModularClasspath() throws Exception {
providerArtifactsMap.put("org.apache.maven.surefire:surefire-logger-api", loggerApi);
providerArtifactsMap.put("org.apache.maven.surefire:surefire-extensions-spi", spi);
providerArtifactsMap.put("org.apache.maven.surefire:surefire-booter", booter);
- providerArtifactsMap.put("org.apache.maven.surefire:surefire-shared-utils", utils);
when(mojo.getPluginArtifactMap()).thenReturn(providerArtifactsMap);
@@ -547,8 +536,8 @@ public void shouldHaveStartupConfigForNonModularClasspath() throws Exception {
"provider classpath: surefire-provider.jar",
"test(compact) classpath: test-classes classes junit.jar hamcrest.jar",
"provider(compact) classpath: surefire-provider.jar",
- "in-process classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar surefire-shared-utils.jar",
- "in-process(compact) classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar surefire-shared-utils.jar");
+ "in-process classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar",
+ "in-process(compact) classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar");
assertThat(conf.getClassLoaderConfiguration()).isSameAs(classLoaderConfiguration);
@@ -660,16 +649,6 @@ private StartupConfiguration startupConfigurationForProvider(ProviderInfo provid
"org.apache.maven.surefire", "surefire-booter", createFromVersion("1"), "runtime", "jar", "", handler);
booter.setFile(mockFile("surefire-booter.jar"));
- Artifact utils = new DefaultArtifact(
- "org.apache.maven.surefire",
- "surefire-shared-utils",
- createFromVersion("1"),
- "runtime",
- "jar",
- "",
- handler);
- utils.setFile(mockFile("surefire-shared-utils.jar"));
-
Map<String, Artifact> providerArtifactsMap = new HashMap<>();
providerArtifactsMap.put("org.apache.maven.surefire:maven-surefire-common", common);
providerArtifactsMap.put("org.apache.maven.surefire:surefire-extensions-api", ext);
@@ -677,7 +656,6 @@ private StartupConfiguration startupConfigurationForProvider(ProviderInfo provid
providerArtifactsMap.put("org.apache.maven.surefire:surefire-logger-api", loggerApi);
providerArtifactsMap.put("org.apache.maven.surefire:surefire-extensions-spi", spi);
providerArtifactsMap.put("org.apache.maven.surefire:surefire-booter", booter);
- providerArtifactsMap.put("org.apache.maven.surefire:surefire-shared-utils", utils);
when(mojo.getPluginArtifactMap()).thenReturn(providerArtifactsMap);
@@ -737,7 +715,6 @@ public void shouldCreateStartupConfigWithModularPath() throws Exception {
artifacts.put("org.apache.maven.surefire:surefire-logger-api", dummyArtifact);
artifacts.put("org.apache.maven.surefire:surefire-extensions-spi", dummyArtifact);
artifacts.put("org.apache.maven.surefire:surefire-booter", dummyArtifact);
- artifacts.put("org.apache.maven.surefire:surefire-shared-utils", dummyArtifact);
mojo.setPluginArtifactMap(artifacts);
ResolvePathResult resolvePathResult = mock(ResolvePathResult.class);
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java
index a0d658946..ae2a3ba91 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java
@@ -1036,7 +1223,7 @@ index 1e1f21e94..4318ad92c 100644
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-i18n</artifactId>
diff --git a/pom.xml b/pom.xml
index 2737001ad..932e56e5a 100644
index 2737001ad..16e1fd4f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,6 @@
@@ -1047,6 +1234,36 @@ index 2737001ad..932e56e5a 100644
<module>surefire-logger-api</module>
<module>surefire-api</module>
<module>surefire-extensions-api</module>
@@ -290,11 +289,6 @@
<version>${jacocoVersion}</version>
<classifier>runtime</classifier>
</dependency>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-shared-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -474,17 +468,6 @@
</reporting>
<profiles>
- <profile>
- <!-- First, install the project without tests -> mvn install -DskipTests
- This is a workaround for IntelliJ IDEA, see https://youtrack.jetbrains.com/issue/IDEA-148573
- IDEA is able to recognize external artifacts with classifiers. But IDEA expects modules and their artifacts
- without classifier. If the version differs from project, the idea would understand it as external artifact.
- -->
- <id>ide-development</id>
- <properties>
- <surefire-shared-utils.version>3-SNAPSHOT</surefire-shared-utils.version>
- </properties>
- </profile>
<profile>
<id>jdk9+</id>
<activation>
diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml
index 68fbf7e10..ab5252f7a 100644
--- a/surefire-api/pom.xml
@@ -2008,6 +2225,18 @@ index 132a1e312..5a7348235 100644
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/surefire-shadefire/pom.xml b/surefire-shadefire/pom.xml
index 73dca095b..2178f2716 100644
--- a/surefire-shadefire/pom.xml
+++ b/surefire-shadefire/pom.xml
@@ -75,7 +75,6 @@
<configuration>
<artifactSet>
<includes>
- <include>org.apache.maven.surefire:surefire-shared-utils</include>
<include>org.apache.maven.surefire:surefire-logger-api</include>
<include>org.apache.maven.surefire:surefire-api</include>
<include>org.apache.maven.surefire:surefire-extensions-spi</include>
--
2.49.0

137
maven-surefire-bootstrap-resources.patch
View File

@@ -1,6 +1,5 @@
diff -urEbwBN a/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-failsafe-plugin/plugin-help.xml b/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-failsafe-plugin/plugin-help.xml
--- a/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-failsafe-plugin/plugin-help.xml 1970-01-01 01:00:00.000000000 +0100
+++ b/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-failsafe-plugin/plugin-help.xml 2024-11-04 10:43:47.030374365 +0100
+++ b/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-failsafe-plugin/plugin-help.xml 2025-03-31 17:27:42.498532301 +0200
@@ -0,0 +1,953 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
@@ -755,7 +754,7 @@ diff -urEbwBN a/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven
+ <classpathDependencyExcludes implementation="java.lang.String[]">${maven.test.dependency.excludes}</classpathDependencyExcludes>
+ <debugForkedProcess implementation="java.lang.String">${maven.failsafe.debug}</debugForkedProcess>
+ <dependenciesToScan implementation="java.lang.String[]">${dependenciesToScan}</dependenciesToScan>
+ <disableXmlReport implementation="java.lang.Boolean" default-value="false">${disableXmlReport}</disableXmlReport>
+ <disableXmlReport implementation="java.lang.Boolean">${disableXmlReport}</disableXmlReport>
+ <enableAssertions implementation="boolean" default-value="true">${enableAssertions}</enableAssertions>
+ <enableOutErrElements implementation="boolean" default-value="true">${enableOutErrElements}</enableOutErrElements>
+ <enableProcessChecker implementation="java.lang.String">${failsafe.enableProcessChecker}</enableProcessChecker>
@@ -848,10 +847,10 @@ diff -urEbwBN a/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven
+ <parameter>
+ <name>encoding</name>
+ <type>java.lang.String</type>
+ <deprecated>since of 2.20.1</deprecated>
+ <deprecated>since 2.20.1</deprecated>
+ <required>false</required>
+ <editable>true</editable>
+ <description>The character encoding scheme to be applied. Deprecated since 2.20.1 and used encoding UTF-8 in failsafe-summary.xml.</description>
+ <description>No effect. UTF-8 is always used for failsafe-summary.xml.</description>
+ </parameter>
+ <parameter>
+ <name>failIfNoTests</name>
@@ -955,10 +954,9 @@ diff -urEbwBN a/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven
+ </mojo>
+ </mojos>
+</plugin>
diff -urEbwBN a/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml b/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml
--- a/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100
+++ b/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 2024-11-04 10:44:32.820687653 +0100
@@ -0,0 +1,1175 @@
+++ b/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 2025-03-31 17:30:54.356186283 +0200
@@ -0,0 +1,1165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Generated by maven-plugin-tools 3.15-->
@@ -1781,7 +1779,7 @@ diff -urEbwBN a/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven
+ <debugForkedProcess implementation="java.lang.String">${maven.failsafe.debug}</debugForkedProcess>
+ <defaultClassesDirectory implementation="java.io.File" default-value="${project.build.outputDirectory}"/>
+ <dependenciesToScan implementation="java.lang.String[]">${dependenciesToScan}</dependenciesToScan>
+ <disableXmlReport implementation="java.lang.Boolean" default-value="false">${disableXmlReport}</disableXmlReport>
+ <disableXmlReport implementation="java.lang.Boolean">${disableXmlReport}</disableXmlReport>
+ <enableAssertions implementation="boolean" default-value="true">${enableAssertions}</enableAssertions>
+ <enableOutErrElements implementation="boolean" default-value="true">${enableOutErrElements}</enableOutErrElements>
+ <enableProcessChecker implementation="java.lang.String">${failsafe.enableProcessChecker}</enableProcessChecker>
@@ -1860,10 +1858,6 @@ diff -urEbwBN a/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven
+ <field-name>locationManager</field-name>
+ </requirement>
+ <requirement>
+ <role>org.codehaus.plexus.logging.Logger</role>
+ <field-name>logger</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.surefire.providerapi.ProviderDetector</role>
+ <field-name>providerDetector</field-name>
+ </requirement>
@@ -1903,10 +1897,10 @@ diff -urEbwBN a/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven
+ <parameter>
+ <name>encoding</name>
+ <type>java.lang.String</type>
+ <deprecated>since of 2.20.1</deprecated>
+ <deprecated>since 2.20.1</deprecated>
+ <required>false</required>
+ <editable>true</editable>
+ <description>The character encoding scheme to be applied. Deprecated since 2.20.1 and used encoding UTF-8 in failsafe-summary.xml.</description>
+ <description>No effect. UTF-8 is always used for failsafe-summary.xml.</description>
+ </parameter>
+ <parameter>
+ <name>failIfNoTests</name>
@@ -2015,12 +2009,6 @@ diff -urEbwBN a/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven
+ <testClassesDirectory implementation="java.io.File" default-value="${project.build.testOutputDirectory}"/>
+ <testFailureIgnore implementation="boolean" default-value="false">${maven.test.failure.ignore}</testFailureIgnore>
+ </configuration>
+ <requirements>
+ <requirement>
+ <role>org.codehaus.plexus.logging.Logger</role>
+ <field-name>logger</field-name>
+ </requirement>
+ </requirements>
+ </mojo>
+ </mojos>
+ <dependencies>
@@ -2040,7 +2028,7 @@ diff -urEbwBN a/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <type>jar</type>
+ <version>2.17.0</version>
+ <version>2.18.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
@@ -2052,43 +2040,43 @@ diff -urEbwBN a/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-api</artifactId>
+ <type>jar</type>
+ <version>3.5.2</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-logger-api</artifactId>
+ <type>jar</type>
+ <version>3.5.2</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-booter</artifactId>
+ <type>jar</type>
+ <version>3.5.2</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-extensions-spi</artifactId>
+ <type>jar</type>
+ <version>3.5.2</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-extensions-api</artifactId>
+ <type>jar</type>
+ <version>3.5.2</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>maven-surefire-common</artifactId>
+ <type>jar</type>
+ <version>3.5.2</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-java</artifactId>
+ <type>jar</type>
+ <version>1.3.0</version>
+ <version>1.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
@@ -2134,9 +2122,8 @@ diff -urEbwBN a/maven-failsafe-plugin/src/main/filtered-resources/META-INF/maven
+ </dependency>
+ </dependencies>
+</plugin>
diff -urEbwBN a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/maven_failsafe_plugin/HelpMojo.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/maven_failsafe_plugin/HelpMojo.java
--- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/maven_failsafe_plugin/HelpMojo.java 1970-01-01 01:00:00.000000000 +0100
+++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/maven_failsafe_plugin/HelpMojo.java 2024-11-04 10:37:46.084598212 +0100
+++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/maven_failsafe_plugin/HelpMojo.java 2025-03-31 17:22:10.243771226 +0200
@@ -0,0 +1,448 @@
+package org.apache.maven.plugins.maven_failsafe_plugin;
+
@@ -2586,9 +2573,8 @@ diff -urEbwBN a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/mave
+ return null;
+ }
+}
diff -urEbwBN a/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-surefire-plugin/plugin-help.xml b/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-surefire-plugin/plugin-help.xml
--- a/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-surefire-plugin/plugin-help.xml 1970-01-01 01:00:00.000000000 +0100
+++ b/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-surefire-plugin/plugin-help.xml 2024-11-04 10:47:52.325388910 +0100
+++ b/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-surefire-plugin/plugin-help.xml 2025-03-31 17:25:50.618189322 +0200
@@ -0,0 +1,812 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
@@ -3334,7 +3320,7 @@ diff -urEbwBN a/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven
+ <classpathDependencyExcludes implementation="java.lang.String[]">${maven.test.dependency.excludes}</classpathDependencyExcludes>
+ <debugForkedProcess implementation="java.lang.String">${maven.surefire.debug}</debugForkedProcess>
+ <dependenciesToScan implementation="java.lang.String[]">${dependenciesToScan}</dependenciesToScan>
+ <disableXmlReport implementation="java.lang.Boolean" default-value="false">${disableXmlReport}</disableXmlReport>
+ <disableXmlReport implementation="java.lang.Boolean">${disableXmlReport}</disableXmlReport>
+ <enableAssertions implementation="boolean" default-value="true">${enableAssertions}</enableAssertions>
+ <enableOutErrElements implementation="boolean" default-value="true">${enableOutErrElements}</enableOutErrElements>
+ <enableProcessChecker implementation="java.lang.String">${surefire.enableProcessChecker}</enableProcessChecker>
@@ -3402,10 +3388,9 @@ diff -urEbwBN a/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven
+ </mojo>
+ </mojos>
+</plugin>
diff -urEbwBN a/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml b/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml
--- a/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100
+++ b/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 2024-11-04 10:48:40.175717003 +0100
@@ -0,0 +1,1012 @@
+++ b/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 2025-03-31 17:28:53.187619727 +0200
@@ -0,0 +1,1008 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Generated by maven-plugin-tools 3.15-->
@@ -4211,7 +4196,7 @@ diff -urEbwBN a/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven
+ <classpathDependencyExcludes implementation="java.lang.String[]">${maven.test.dependency.excludes}</classpathDependencyExcludes>
+ <debugForkedProcess implementation="java.lang.String">${maven.surefire.debug}</debugForkedProcess>
+ <dependenciesToScan implementation="java.lang.String[]">${dependenciesToScan}</dependenciesToScan>
+ <disableXmlReport implementation="java.lang.Boolean" default-value="false">${disableXmlReport}</disableXmlReport>
+ <disableXmlReport implementation="java.lang.Boolean">${disableXmlReport}</disableXmlReport>
+ <enableAssertions implementation="boolean" default-value="true">${enableAssertions}</enableAssertions>
+ <enableOutErrElements implementation="boolean" default-value="true">${enableOutErrElements}</enableOutErrElements>
+ <enableProcessChecker implementation="java.lang.String">${surefire.enableProcessChecker}</enableProcessChecker>
@@ -4289,10 +4274,6 @@ diff -urEbwBN a/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven
+ <field-name>locationManager</field-name>
+ </requirement>
+ <requirement>
+ <role>org.codehaus.plexus.logging.Logger</role>
+ <field-name>logger</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.surefire.providerapi.ProviderDetector</role>
+ <field-name>providerDetector</field-name>
+ </requirement>
@@ -4312,7 +4293,7 @@ diff -urEbwBN a/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-api</artifactId>
+ <type>jar</type>
+ <version>3.5.2</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
@@ -4324,7 +4305,7 @@ diff -urEbwBN a/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <type>jar</type>
+ <version>2.17.0</version>
+ <version>2.18.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
@@ -4336,7 +4317,7 @@ diff -urEbwBN a/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-logger-api</artifactId>
+ <type>jar</type>
+ <version>3.5.2</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
@@ -4348,19 +4329,19 @@ diff -urEbwBN a/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-extensions-api</artifactId>
+ <type>jar</type>
+ <version>3.5.2</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>maven-surefire-common</artifactId>
+ <type>jar</type>
+ <version>3.5.2</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-java</artifactId>
+ <type>jar</type>
+ <version>1.3.0</version>
+ <version>1.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
@@ -4402,13 +4383,13 @@ diff -urEbwBN a/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-booter</artifactId>
+ <type>jar</type>
+ <version>3.5.2</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-extensions-spi</artifactId>
+ <type>jar</type>
+ <version>3.5.2</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
@@ -4418,9 +4399,8 @@ diff -urEbwBN a/maven-surefire-plugin/src/main/filtered-resources/META-INF/maven
+ </dependency>
+ </dependencies>
+</plugin>
diff -urEbwBN a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/maven_surefire_plugin/HelpMojo.java b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/maven_surefire_plugin/HelpMojo.java
--- a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/maven_surefire_plugin/HelpMojo.java 1970-01-01 01:00:00.000000000 +0100
+++ b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/maven_surefire_plugin/HelpMojo.java 2024-11-04 10:41:36.879493528 +0100
+++ b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/maven_surefire_plugin/HelpMojo.java 2025-03-31 17:21:29.795420378 +0200
@@ -0,0 +1,448 @@
+package org.apache.maven.plugins.maven_surefire_plugin;
+
@@ -4870,9 +4850,8 @@ diff -urEbwBN a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/mave
+ return null;
+ }
+}
diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-surefire-report-plugin/plugin-help.xml b/maven-surefire-report-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-surefire-report-plugin/plugin-help.xml
--- a/maven-surefire-report-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-surefire-report-plugin/plugin-help.xml 1970-01-01 01:00:00.000000000 +0100
+++ b/maven-surefire-report-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-surefire-report-plugin/plugin-help.xml 2024-11-04 10:45:39.894480900 +0100
+++ b/maven-surefire-report-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-surefire-report-plugin/plugin-help.xml 2025-03-31 17:26:58.731912223 +0200
@@ -0,0 +1,496 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
@@ -4888,7 +4867,7 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ <mojos>
+ <mojo>
+ <goal>failsafe-report-only</goal>
+ <description>Creates a nicely formatted Failsafe Test Report in html format. This goal does not run the tests, it only builds the reports. See https://issues.apache.org/jira/browse/SUREFIRE-257 &lt;https://issues.apache.org/jira/browse/SUREFIRE-257&gt;</description>
+ <description>Creates a nicely formatted Failsafe Test Report in html format. This goal does not run the tests; it only builds the reports. See https://issues.apache.org/jira/browse/SUREFIRE-257 &lt;https://issues.apache.org/jira/browse/SUREFIRE-257&gt;</description>
+ <requiresDirectInvocation>false</requiresDirectInvocation>
+ <requiresProject>true</requiresProject>
+ <requiresReports>false</requiresReports>
@@ -5089,7 +5068,7 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ <requiresReports>false</requiresReports>
+ <aggregator>false</aggregator>
+ <requiresOnline>false</requiresOnline>
+ <inheritedByDefault>false</inheritedByDefault>
+ <inheritedByDefault>true</inheritedByDefault>
+ <executePhase>test</executePhase>
+ <executeLifecycle>surefire</executeLifecycle>
+ <implementation>org.apache.maven.plugins.surefire.report.SurefireReport</implementation>
@@ -5111,7 +5090,7 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ <since>2.11</since>
+ <required>false</required>
+ <editable>true</editable>
+ <description>If set to true the surefire report will be generated even when there are no surefire result files. Defaults to true to preserve legacy behaviour pre 2.10.</description>
+ <description>If set to true, the surefire report will be generated even when there are no surefire result files. Defaults to true to preserve legacy behaviour pre 2.10.</description>
+ </parameter>
+ <parameter>
+ <name>customBundle</name>
@@ -5199,7 +5178,7 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ <since>2.11</since>
+ <required>false</required>
+ <editable>true</editable>
+ <description>If set to true the surefire report generation will be skipped.</description>
+ <description>If set to true, the surefire report generation will be skipped.</description>
+ </parameter>
+ <parameter>
+ <name>xrefTestLocation</name>
@@ -5254,7 +5233,7 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ <since>2.11</since>
+ <required>false</required>
+ <editable>true</editable>
+ <description>If set to true the surefire report will be generated even when there are no surefire result files. Defaults to true to preserve legacy behaviour pre 2.10.</description>
+ <description>If set to true, the surefire report will be generated even when there are no surefire result files. Defaults to true to preserve legacy behaviour pre 2.10.</description>
+ </parameter>
+ <parameter>
+ <name>customBundle</name>
@@ -5342,7 +5321,7 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ <since>2.11</since>
+ <required>false</required>
+ <editable>true</editable>
+ <description>If set to true the surefire report generation will be skipped.</description>
+ <description>If set to true, the surefire report generation will be skipped.</description>
+ </parameter>
+ <parameter>
+ <name>xrefTestLocation</name>
@@ -5370,10 +5349,9 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ </mojo>
+ </mojos>
+</plugin>
diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml b/maven-surefire-report-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml
--- a/maven-surefire-report-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100
+++ b/maven-surefire-report-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 2024-11-04 10:46:55.558333020 +0100
@@ -0,0 +1,958 @@
+++ b/maven-surefire-report-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 2025-03-31 17:30:07.228212456 +0200
@@ -0,0 +1,946 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Generated by maven-plugin-tools 3.15-->
@@ -5392,7 +5370,7 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ <mojos>
+ <mojo>
+ <goal>failsafe-report-only</goal>
+ <description>Creates a nicely formatted Failsafe Test Report in html format. This goal does not run the tests, it only builds the reports. See https://issues.apache.org/jira/browse/SUREFIRE-257 &lt;https://issues.apache.org/jira/browse/SUREFIRE-257&gt;</description>
+ <description>Creates a nicely formatted Failsafe Test Report in html format. This goal does not run the tests; it only builds the reports. See https://issues.apache.org/jira/browse/SUREFIRE-257 &lt;https://issues.apache.org/jira/browse/SUREFIRE-257&gt;</description>
+ <requiresDirectInvocation>false</requiresDirectInvocation>
+ <requiresProject>true</requiresProject>
+ <requiresReports>false</requiresReports>
@@ -5602,10 +5580,6 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ <field-name>container</field-name>
+ </requirement>
+ <requirement>
+ <role>org.codehaus.plexus.i18n.I18N</role>
+ <field-name>i18n</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.doxia.siterenderer.Renderer</role>
+ <field-name>siteRenderer</field-name>
+ </requirement>
@@ -5675,7 +5649,7 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ <requiresReports>false</requiresReports>
+ <aggregator>false</aggregator>
+ <requiresOnline>false</requiresOnline>
+ <inheritedByDefault>false</inheritedByDefault>
+ <inheritedByDefault>true</inheritedByDefault>
+ <executePhase>test</executePhase>
+ <executeLifecycle>surefire</executeLifecycle>
+ <implementation>org.apache.maven.plugins.surefire.report.SurefireReport</implementation>
@@ -5697,7 +5671,7 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ <since>2.11</since>
+ <required>false</required>
+ <editable>true</editable>
+ <description>If set to true the surefire report will be generated even when there are no surefire result files. Defaults to true to preserve legacy behaviour pre 2.10.</description>
+ <description>If set to true, the surefire report will be generated even when there are no surefire result files. Defaults to true to preserve legacy behaviour pre 2.10.</description>
+ </parameter>
+ <parameter>
+ <name>customBundle</name>
@@ -5841,7 +5815,7 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ <since>2.11</since>
+ <required>false</required>
+ <editable>true</editable>
+ <description>If set to true the surefire report generation will be skipped.</description>
+ <description>If set to true, the surefire report generation will be skipped.</description>
+ </parameter>
+ <parameter>
+ <name>xrefTestLocation</name>
@@ -5880,10 +5854,6 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ <field-name>container</field-name>
+ </requirement>
+ <requirement>
+ <role>org.codehaus.plexus.i18n.I18N</role>
+ <field-name>i18n</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.doxia.siterenderer.Renderer</role>
+ <field-name>siteRenderer</field-name>
+ </requirement>
@@ -5922,7 +5892,7 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ <since>2.11</since>
+ <required>false</required>
+ <editable>true</editable>
+ <description>If set to true the surefire report will be generated even when there are no surefire result files. Defaults to true to preserve legacy behaviour pre 2.10.</description>
+ <description>If set to true, the surefire report will be generated even when there are no surefire result files. Defaults to true to preserve legacy behaviour pre 2.10.</description>
+ </parameter>
+ <parameter>
+ <name>customBundle</name>
@@ -6066,7 +6036,7 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ <since>2.11</since>
+ <required>false</required>
+ <editable>true</editable>
+ <description>If set to true the surefire report generation will be skipped.</description>
+ <description>If set to true, the surefire report generation will be skipped.</description>
+ </parameter>
+ <parameter>
+ <name>xrefTestLocation</name>
@@ -6105,10 +6075,6 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ <field-name>container</field-name>
+ </requirement>
+ <requirement>
+ <role>org.codehaus.plexus.i18n.I18N</role>
+ <field-name>i18n</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.doxia.siterenderer.Renderer</role>
+ <field-name>siteRenderer</field-name>
+ </requirement>
@@ -6124,13 +6090,13 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-logger-api</artifactId>
+ <type>jar</type>
+ <version>3.5.2</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-report-parser</artifactId>
+ <type>jar</type>
+ <version>3.5.2</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
@@ -6190,7 +6156,7 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <type>jar</type>
+ <version>2.17.0</version>
+ <version>2.18.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
@@ -6332,9 +6298,8 @@ diff -urEbwBN a/maven-surefire-report-plugin/src/main/filtered-resources/META-IN
+ </dependency>
+ </dependencies>
+</plugin>
diff -urEbwBN a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugin/maven_surefire_report_plugin/HelpMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugin/maven_surefire_report_plugin/HelpMojo.java
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugin/maven_surefire_report_plugin/HelpMojo.java 1970-01-01 01:00:00.000000000 +0100
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugin/maven_surefire_report_plugin/HelpMojo.java 2024-11-04 10:39:38.158690041 +0100
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugin/maven_surefire_report_plugin/HelpMojo.java 2025-03-31 17:21:49.466428069 +0200
@@ -0,0 +1,448 @@
+package org.apache.maven.plugins.maven_surefire_report_plugin;
+

19
maven-surefire-plugins.changes
View File

@@ -1,3 +1,22 @@
-------------------------------------------------------------------
Mon Mar 31 15:14:16 UTC 2025 - Fridrich Strba <fstrba@suse.com>
- Upgrade to 3.5.3
* Bug
+ SUREFIRE-1643: JUnit 5 in parallel execution mode confuses
Surefire reports
+ SUREFIRE-1737: Disabling the JUnit5Xml30StatelessReporter has
no effect
+ SUREFIRE-1751: Surefire report shows flaky tests as failures
+ SUREFIRE-2289: FailsafeSummary.toRunResult throws a raw
exception
- Modified patches:
* 0001-Port-to-TestNG-7.4.0.patch
* 0002-Unshade-surefire.patch
+ rediff
* maven-surefire-bootstrap-resources.patch
+ regenerate from non-bootstrap build
-------------------------------------------------------------------
Mon Nov 4 09:51:10 UTC 2024 - Fridrich Strba <fstrba@suse.com>

7
maven-surefire-plugins.spec
View File

@@ -56,11 +56,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation)
BuildRequires: mvn(org.codehaus.plexus:plexus-xml)
BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
BuildRequires: mvn(org.fusesource.jansi:jansi)
#!BuildRequires: maven-compiler-plugin-bootstrap
#!BuildRequires: maven-jar-plugin-bootstrap
#!BuildRequires: maven-plugin-plugin-bootstrap
#!BuildRequires: maven-resources-plugin-bootstrap
#!BuildRequires: maven-surefire-plugin-bootstrap
BuildArch: noarch
%description
@@ -176,6 +171,6 @@ done
%files -n maven-failsafe-plugin -f .mfiles-failsafe-plugin
%files javadoc -f .mfiles-javadoc
%license LICENSE-2.0.txt cpl-v10.html
%license LICENSE-2.0.txt cpl-v10.html wjat
%changelog

19
maven-surefire-provider-junit5.changes
View File

@@ -1,3 +1,22 @@
-------------------------------------------------------------------
Mon Mar 31 15:14:16 UTC 2025 - Fridrich Strba <fstrba@suse.com>
- Upgrade to 3.5.3
* Bug
+ SUREFIRE-1643: JUnit 5 in parallel execution mode confuses
Surefire reports
+ SUREFIRE-1737: Disabling the JUnit5Xml30StatelessReporter has
no effect
+ SUREFIRE-1751: Surefire report shows flaky tests as failures
+ SUREFIRE-2289: FailsafeSummary.toRunResult throws a raw
exception
- Modified patches:
* 0001-Port-to-TestNG-7.4.0.patch
* 0002-Unshade-surefire.patch
+ rediff
* maven-surefire-bootstrap-resources.patch
+ regenerate from non-bootstrap build
-------------------------------------------------------------------
Mon Nov 4 09:51:10 UTC 2024 - Fridrich Strba <fstrba@suse.com>

19
maven-surefire.changes
View File

@@ -1,3 +1,22 @@
-------------------------------------------------------------------
Mon Mar 31 15:14:16 UTC 2025 - Fridrich Strba <fstrba@suse.com>
- Upgrade to 3.5.3
* Bug
+ SUREFIRE-1643: JUnit 5 in parallel execution mode confuses
Surefire reports
+ SUREFIRE-1737: Disabling the JUnit5Xml30StatelessReporter has
no effect
+ SUREFIRE-1751: Surefire report shows flaky tests as failures
+ SUREFIRE-2289: FailsafeSummary.toRunResult throws a raw
exception
- Modified patches:
* 0001-Port-to-TestNG-7.4.0.patch
* 0002-Unshade-surefire.patch
+ rediff
* maven-surefire-bootstrap-resources.patch
+ regenerate from non-bootstrap build
-------------------------------------------------------------------
Mon Nov 4 09:51:10 UTC 2024 - Fridrich Strba <fstrba@suse.com>