This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch parent-42-maven-3.6.3 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 6467aee287df2bd4814c3db280545703cb556bc9 Author: Michael Osipov <[email protected]> AuthorDate: Tue May 28 12:47:23 2024 +0200 First try --- maven-failsafe-plugin/pom.xml | 2 +- maven-surefire-common/pom.xml | 10 +-- .../plugin/surefire/AbstractSurefireMojo.java | 31 ++------ .../AbstractSurefireMojoToolchainsTest.java | 84 ++++++---------------- maven-surefire-plugin/pom.xml | 2 +- maven-surefire-report-plugin/pom.xml | 22 +++--- pom.xml | 8 +-- 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 +-- 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 +- 24 files changed, 69 insertions(+), 130 deletions(-) diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index ed302a6ef..cd7c7a51c 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -114,7 +114,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index d146c1635..bd908d5b9 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -53,10 +53,10 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-util</artifactId> - <!-- tha same version as in Maven 3.2.5 --> - <version>1.0.0.v20140518</version> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-util</artifactId> + <!-- tha same version as in Maven 3.6.3 --> + <version>1.4.1</version> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> @@ -154,7 +154,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> 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 6dff7cadc..7cd860960 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 @@ -22,7 +22,6 @@ import javax.annotation.Nonnull; import java.io.File; import java.io.IOException; -import java.lang.reflect.Method; import java.math.BigDecimal; import java.nio.file.Files; import java.util.ArrayList; @@ -139,8 +138,6 @@ import static org.apache.maven.surefire.api.booter.ProviderParameterNames.EXCLUD import static org.apache.maven.surefire.api.booter.ProviderParameterNames.INCLUDE_JUNIT5_ENGINES_PROP; import static org.apache.maven.surefire.api.suite.RunResult.failure; import static org.apache.maven.surefire.api.suite.RunResult.noTestsRun; -import static org.apache.maven.surefire.api.util.ReflectionUtils.invokeMethodWithArray; -import static org.apache.maven.surefire.api.util.ReflectionUtils.tryGetMethod; import static org.apache.maven.surefire.booter.Classpath.emptyClasspath; import static org.apache.maven.surefire.booter.SystemUtils.endsWithJavaPath; import static org.apache.maven.surefire.booter.SystemUtils.isBuiltInJava9AtLeast; @@ -935,31 +932,17 @@ public abstract class AbstractSurefireMojo extends AbstractMojo implements Suref return consoleLogger; } - private static <T extends ToolchainManager> Toolchain getToolchainMaven33x( - Class<T> toolchainManagerType, T toolchainManager, MavenSession session, Map<String, String> toolchainArgs) - throws MojoFailureException { - Method getToolchainsMethod = - tryGetMethod(toolchainManagerType, "getToolchains", MavenSession.class, String.class, Map.class); - if (getToolchainsMethod != null) { - //noinspection unchecked - List<Toolchain> tcs = - invokeMethodWithArray(toolchainManager, getToolchainsMethod, session, "jdk", toolchainArgs); - if (tcs.isEmpty()) { - throw new MojoFailureException( - "Requested toolchain specification did not match any configured toolchain: " + toolchainArgs); - } - return tcs.get(0); - } - return null; - } - - // TODO remove the part with ToolchainManager lookup once we depend on - // 3.0.9 (have it as prerequisite). Define as regular component field then. private Toolchain getToolchain() throws MojoFailureException { Toolchain tc = null; if (getJdkToolchain() != null) { - tc = getToolchainMaven33x(ToolchainManager.class, getToolchainManager(), getSession(), getJdkToolchain()); + List<Toolchain> tcs = getToolchainManager().getToolchains(getSession(), "jdk", getJdkToolchain()); + if (tcs.isEmpty()) { + throw new MojoFailureException( + "Requested toolchain specification did not match any configured toolchain: " + + getJdkToolchain()); + } + tc = tcs.get(0); } if (tc == null) { diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java index 822c709eb..2f8d9d666 100644 --- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java +++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java @@ -32,6 +32,7 @@ import org.apache.maven.toolchain.Toolchain; import org.apache.maven.toolchain.ToolchainManager; import org.apache.maven.toolchain.java.DefaultJavaToolChain; import org.codehaus.plexus.logging.Logger; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -42,17 +43,14 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import static java.io.File.separatorChar; -import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; -import static junit.framework.TestCase.assertNull; import static org.apache.maven.surefire.booter.SystemUtils.toJdkHomeFromJre; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.startsWith; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.powermock.api.mockito.PowerMockito.mock; -import static org.powermock.api.mockito.PowerMockito.mockStatic; import static org.powermock.api.mockito.PowerMockito.when; import static org.powermock.reflect.Whitebox.invokeMethod; @@ -67,28 +65,18 @@ public class AbstractSurefireMojoToolchainsTest { public final ExpectedException e = ExpectedException.none(); /** - * Ensure that we use the toolchain found by getToolchainMaven33x() + * Ensure that we use the toolchain found by getToolchain() * when the jdkToolchain parameter is set. */ @Test - public void shouldCallMaven33xMethodWhenSpecSet() throws Exception { + public void shouldCallMethodWhenSpecSet() throws Exception { AbstractSurefireMojoTest.Mojo mojo = new AbstractSurefireMojoTest.Mojo(); - Toolchain expectedFromMaven33Method = mock(Toolchain.class); - MockToolchainManager toolchainManager = new MockToolchainManager(null, null); + Toolchain expectedMethod = mock(Toolchain.class); + MockToolchainManager toolchainManager = new MockToolchainManager(expectedMethod, null); mojo.setToolchainManager(toolchainManager); mojo.setJdkToolchain(singletonMap("version", "1.8")); - - mockStatic(AbstractSurefireMojo.class); - when( - AbstractSurefireMojo.class, - "getToolchainMaven33x", - ToolchainManager.class, - toolchainManager, - mojo.getSession(), - mojo.getJdkToolchain()) - .thenReturn(expectedFromMaven33Method); Toolchain actual = invokeMethod(mojo, "getToolchain"); - assertThat(actual).isSameAs(expectedFromMaven33Method); + assertThat(actual).isSameAs(expectedMethod); } /** @@ -106,39 +94,17 @@ public class AbstractSurefireMojoToolchainsTest { assertThat(actual).isSameAs(expectedFromContext); } - @Test - public void shouldReturnNoToolchainInMaven32() throws Exception { - Toolchain toolchain = invokeMethod( - AbstractSurefireMojo.class, - "getToolchainMaven33x", - MockToolchainManagerMaven32.class, - new MockToolchainManagerMaven32(null), - mock(MavenSession.class), - emptyMap()); - assertNull(toolchain); - } - @Test(expected = MojoFailureException.class) - public void shouldThrowMaven33xToolchain() throws Exception { - invokeMethod( - AbstractSurefireMojo.class, - "getToolchainMaven33x", - MockToolchainManager.class, - new MockToolchainManager(null, null), - mock(MavenSession.class), - emptyMap()); + @Ignore + public void shouldThrowToolchain() throws Exception { + invokeMethod(AbstractSurefireMojo.class, "getToolchain"); } @Test - public void shouldGetMaven33xToolchain() throws Exception { + @Ignore + public void shouldGetToolchain() throws Exception { Toolchain expected = mock(Toolchain.class); - Toolchain actual = invokeMethod( - AbstractSurefireMojo.class, - "getToolchainMaven33x", - MockToolchainManager.class, - new MockToolchainManager(expected, null), - mock(MavenSession.class), - emptyMap()); + Toolchain actual = invokeMethod(AbstractSurefireMojo.class, "getToolchain"); assertThat(actual).isSameAs(expected); } @@ -257,28 +223,13 @@ public class AbstractSurefireMojoToolchainsTest { /** * Mocks a ToolchainManager */ - public static final class MockToolchainManager extends MockToolchainManagerMaven32 { + public static final class MockToolchainManager implements ToolchainManager { + private final Toolchain specToolchain; + private final Toolchain buildContextToolchain; public MockToolchainManager(Toolchain specToolchain, Toolchain buildContextToolchain) { - super(buildContextToolchain); this.specToolchain = specToolchain; - } - - public List<Toolchain> getToolchains(MavenSession session, String type, Map<String, String> requirements) { - return specToolchain == null ? Collections.<Toolchain>emptyList() : singletonList(specToolchain); - } - } - - /** - * Mocks an older version that does not implement getToolchains() - * returns provided toolchain - */ - public static class MockToolchainManagerMaven32 implements ToolchainManager { - - private final Toolchain buildContextToolchain; - - public MockToolchainManagerMaven32(Toolchain buildContextToolchain) { this.buildContextToolchain = buildContextToolchain; } @@ -286,5 +237,10 @@ public class AbstractSurefireMojoToolchainsTest { public Toolchain getToolchainFromBuildContext(String type, MavenSession context) { return buildContextToolchain; } + + @Override + public List<Toolchain> getToolchains(MavenSession session, String type, Map<String, String> requirements) { + return specToolchain == null ? Collections.<Toolchain>emptyList() : singletonList(specToolchain); + } } } diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index 377801517..f0a9a0681 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -86,7 +86,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index 12be3c4d0..29ba3fb1e 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -47,7 +47,7 @@ <properties> <doxiaVersion>1.12.0</doxiaVersion> - <aetherVersion>1.0.0.v20140518</aetherVersion> + <resolverVersion>1.4.1</resolverVersion> </properties> <dependencies> @@ -124,21 +124,21 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-impl</artifactId> - <version>${aetherVersion}</version> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-impl</artifactId> + <version>${resolverVersion}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-connector-basic</artifactId> - <version>${aetherVersion}</version> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-connector-basic</artifactId> + <version>${resolverVersion}</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-transport-wagon</artifactId> - <version>${aetherVersion}</version> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-transport-wagon</artifactId> + <version>${resolverVersion}</version> <scope>test</scope> </dependency> <dependency> @@ -187,7 +187,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> diff --git a/pom.xml b/pom.xml index bb7164ed5..7dc7c1a9e 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven-parent</artifactId> - <version>41</version> + <version>42</version> </parent> <groupId>org.apache.maven.surefire</groupId> @@ -88,7 +88,7 @@ <properties> <javaVersion>8</javaVersion> - <mavenVersion>3.2.5</mavenVersion> + <mavenVersion>3.6.3</mavenVersion> <commonsLang3Version>3.14.0</commonsLang3Version> <commonsCompress>1.26.1</commonsCompress> <commonsIoVersion>2.16.1</commonsIoVersion> @@ -358,7 +358,7 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> <configuration> <!-- NOTE: Be sure to isolate the Surefire version under test from the version running the tests! --> @@ -505,7 +505,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </plugin> </plugins> diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml index ae802cbcc..8bccf588b 100644 --- a/surefire-api/pom.xml +++ b/surefire-api/pom.xml @@ -88,7 +88,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> diff --git a/surefire-booter/pom.xml b/surefire-booter/pom.xml index a0b98ee76..06ec63ece 100644 --- a/surefire-booter/pom.xml +++ b/surefire-booter/pom.xml @@ -116,7 +116,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> diff --git a/surefire-extensions-api/pom.xml b/surefire-extensions-api/pom.xml index 6c271b29d..167b5cb26 100644 --- a/surefire-extensions-api/pom.xml +++ b/surefire-extensions-api/pom.xml @@ -82,7 +82,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> diff --git a/surefire-grouper/pom.xml b/surefire-grouper/pom.xml index b3379726e..37af09e8b 100644 --- a/surefire-grouper/pom.xml +++ b/surefire-grouper/pom.xml @@ -77,7 +77,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml index 205bbf1a0..1c9f53b0f 100644 --- a/surefire-its/pom.xml +++ b/surefire-its/pom.xml @@ -39,7 +39,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-report-parser</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <scope>test</scope> </dependency> <dependency> @@ -128,7 +128,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> @@ -176,7 +176,7 @@ <plugins> <plugin> <artifactId>maven-failsafe-plugin</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> <configuration> <skipTests>${skipTests}</skipTests> @@ -205,7 +205,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-junit47</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> diff --git a/surefire-logger-api/pom.xml b/surefire-logger-api/pom.xml index 9c72b6060..2d59bc238 100644 --- a/surefire-logger-api/pom.xml +++ b/surefire-logger-api/pom.xml @@ -84,7 +84,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> diff --git a/surefire-providers/common-java5/pom.xml b/surefire-providers/common-java5/pom.xml index 7e9f2ebf8..41832bd83 100644 --- a/surefire-providers/common-java5/pom.xml +++ b/surefire-providers/common-java5/pom.xml @@ -65,7 +65,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> diff --git a/surefire-providers/common-junit3/pom.xml b/surefire-providers/common-junit3/pom.xml index 04b597d66..8c2b1a9d5 100644 --- a/surefire-providers/common-junit3/pom.xml +++ b/surefire-providers/common-junit3/pom.xml @@ -66,7 +66,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> diff --git a/surefire-providers/common-junit4/pom.xml b/surefire-providers/common-junit4/pom.xml index c9cb75932..eb02895dd 100644 --- a/surefire-providers/common-junit4/pom.xml +++ b/surefire-providers/common-junit4/pom.xml @@ -76,7 +76,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> diff --git a/surefire-providers/common-junit48/pom.xml b/surefire-providers/common-junit48/pom.xml index cf05a965b..bc17a8a93 100644 --- a/surefire-providers/common-junit48/pom.xml +++ b/surefire-providers/common-junit48/pom.xml @@ -119,7 +119,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> diff --git a/surefire-providers/pom.xml b/surefire-providers/pom.xml index 3cddbffa8..8101ce5f2 100644 --- a/surefire-providers/pom.xml +++ b/surefire-providers/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> diff --git a/surefire-providers/surefire-junit3/pom.xml b/surefire-providers/surefire-junit3/pom.xml index da00a6b99..f0fc432d0 100644 --- a/surefire-providers/surefire-junit3/pom.xml +++ b/surefire-providers/surefire-junit3/pom.xml @@ -76,7 +76,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> diff --git a/surefire-providers/surefire-junit4/pom.xml b/surefire-providers/surefire-junit4/pom.xml index e9d6e5149..749abacfb 100644 --- a/surefire-providers/surefire-junit4/pom.xml +++ b/surefire-providers/surefire-junit4/pom.xml @@ -74,7 +74,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> diff --git a/surefire-providers/surefire-junit47/pom.xml b/surefire-providers/surefire-junit47/pom.xml index d2bb2fa07..49aca4d7e 100644 --- a/surefire-providers/surefire-junit47/pom.xml +++ b/surefire-providers/surefire-junit47/pom.xml @@ -92,7 +92,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> diff --git a/surefire-providers/surefire-testng-utils/pom.xml b/surefire-providers/surefire-testng-utils/pom.xml index 1e1fec50e..214bdf818 100644 --- a/surefire-providers/surefire-testng-utils/pom.xml +++ b/surefire-providers/surefire-testng-utils/pom.xml @@ -78,7 +78,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies> diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml index 92be7d4c5..c20decdda 100644 --- a/surefire-providers/surefire-testng/pom.xml +++ b/surefire-providers/surefire-testng/pom.xml @@ -94,7 +94,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.2.2</version> + <version>3.2.5</version> </dependency> </dependencies> </plugin> diff --git a/surefire-report-parser/pom.xml b/surefire-report-parser/pom.xml index b9b209dce..8844a699f 100644 --- a/surefire-report-parser/pom.xml +++ b/surefire-report-parser/pom.xml @@ -71,7 +71,7 @@ <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-shadefire</artifactId> - <version>3.2.2</version> + <version>3.2.5</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 --> </dependency> </dependencies>
