You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/07/03 16:03:33 UTC
[maven-dependency-tree] branch master updated: [MSHARED-1016] exclude transitive provided scope dependencies
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-tree.git
The following commit(s) were added to refs/heads/master by this push:
new 98c5971 [MSHARED-1016] exclude transitive provided scope dependencies
98c5971 is described below
commit 98c59715a3d32268e775908e72a3e542da95ff66
Author: Daniel Norberg <da...@spotify.com>
AuthorDate: Tue Jan 4 10:19:56 2022 -0500
[MSHARED-1016] exclude transitive provided scope dependencies
Transitive dependencies with provided scope should be excluded in order
to match maven behavior:
https://github.com/apache/maven/blob/706d9319f14b507f3c3deeba4eeda1a51a531c9b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java#L80
This should resolve https://issues.apache.org/jira/browse/MENFORCER-402
---
.../dependency/graph/internal/Maven31DependencyCollectorBuilder.java | 1 +
.../dependency/graph/internal/Maven3DependencyCollectorBuilder.java | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyCollectorBuilder.java b/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyCollectorBuilder.java
index 73d06de..037a7a3 100644
--- a/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyCollectorBuilder.java
+++ b/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyCollectorBuilder.java
@@ -106,6 +106,7 @@ public class Maven31DependencyCollectorBuilder
DependencySelector depFilter =
new AndDependencySelector( new Maven31DirectScopeDependencySelector( JavaScopes.TEST ),
+ new Maven31DirectScopeDependencySelector( JavaScopes.PROVIDED ),
new OptionalDependencySelector(),
new ExclusionDependencySelector() );
session.setDependencySelector( depFilter );
diff --git a/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyCollectorBuilder.java b/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyCollectorBuilder.java
index 2a3a555..6dce3a9 100644
--- a/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyCollectorBuilder.java
+++ b/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyCollectorBuilder.java
@@ -106,6 +106,7 @@ public class Maven3DependencyCollectorBuilder
DependencySelector depFilter =
new AndDependencySelector( new Maven3DirectScopeDependencySelector( JavaScopes.TEST ),
+ new Maven3DirectScopeDependencySelector( JavaScopes.PROVIDED ),
new OptionalDependencySelector(),
new ExclusionDependencySelector() );
session.setDependencySelector( depFilter );