This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch SUREFIRE-2047 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit f9c1ca4e1ab47b72003c548cbe96c252497e701b Author: Michael Osipov <[email protected]> AuthorDate: Tue Jun 4 21:08:49 2024 +0200 [SUREFIRE-2047] Upgrade to maven-common-artifact-filters 3.4.0 --- .../plugin/surefire/util/DependenciesScannerTest.java | 2 +- pom.xml | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/DependenciesScannerTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/DependenciesScannerTest.java index e392d8c02..2c6f6c26e 100644 --- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/DependenciesScannerTest.java +++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/DependenciesScannerTest.java @@ -106,7 +106,7 @@ public class DependenciesScannerTest { testArtifact.setFile(testJarFile); List<String> scanDependencies = new ArrayList<>(); - scanDependencies.add("org.surefire.dependency:dependent-artifact2:*:*:tests-jdk15"); + scanDependencies.add("org.surefire.dependency:dependent-artifact2:*:tests-jdk15:*"); List<String> include = new ArrayList<>(); include.add("**/*A.java"); diff --git a/pom.xml b/pom.xml index 8f08f2027..72238b024 100644 --- a/pom.xml +++ b/pom.xml @@ -185,24 +185,9 @@ </exclusions> </dependency> <dependency> - <!-- Do not upgrade, leads to test failures, needs analysis --> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-common-artifact-filters</artifactId> - <version>3.1.1</version> - <exclusions> - <exclusion> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-shared-utils</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> - </exclusion> - <exclusion> - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-inject-plexus</artifactId> - </exclusion> - </exclusions> + <version>3.3.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven.plugin-testing</groupId>
