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/05/28 12:50:37 UTC
[maven-enforcer] branch master updated: [MENFORCER-402] - fix provided dependencies in RequireUpperBoundDeps
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-enforcer.git
The following commit(s) were added to refs/heads/master by this push:
new 35ad6b4 [MENFORCER-402] - fix provided dependencies in RequireUpperBoundDeps
35ad6b4 is described below
commit 35ad6b4fa1f8afff48c8fc0e4bf30ef740fb9bd6
Author: Edwin Stang <gs...@gmail.com>
AuthorDate: Sat May 28 14:50:32 2022 +0200
[MENFORCER-402] - fix provided dependencies in RequireUpperBoundDeps
---
.../org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java | 5 ++++-
.../it/projects/require-upper-bound-deps_failure_show_scopes/pom.xml | 2 +-
.../require-upper-bound-deps_failure_show_scopes/verify.groovy | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
index 4abfb91..ba1ded6 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
@@ -136,7 +136,10 @@ public class RequireUpperBoundDeps
new DefaultProjectBuildingRequest( session.getProjectBuildingRequest() );
buildingRequest.setProject( project );
buildingRequest.setLocalRepository( repository );
- ArtifactFilter filter = null; // we need to evaluate all scopes
+ ArtifactFilter filter = ( Artifact a ) -> ( "compile".equalsIgnoreCase( a.getScope () )
+ || "runtime".equalsIgnoreCase( a.getScope () ) )
+ && !a.isOptional();
+
return dependencyCollectorBuilder.collectDependencyGraph( buildingRequest, filter );
}
catch ( ExpressionEvaluationException e )
diff --git a/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure_show_scopes/pom.xml b/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure_show_scopes/pom.xml
index ef8eddc..6f2488f 100644
--- a/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure_show_scopes/pom.xml
+++ b/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure_show_scopes/pom.xml
@@ -35,7 +35,7 @@
<groupId>org.apache.maven.plugins.enforcer.its</groupId>
<artifactId>menforcer128_classic</artifactId>
<version>0.9.9</version>
- <scope>provided</scope>
+ <scope>compile</scope>
<!-- Depends on org.apache.maven.plugins.enforcer.its:menforcer128_api:1.5.0 -->
</dependency>
</dependencies>
diff --git a/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure_show_scopes/verify.groovy b/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure_show_scopes/verify.groovy
index f916d09..18eb75d 100644
--- a/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure_show_scopes/verify.groovy
+++ b/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure_show_scopes/verify.groovy
@@ -26,6 +26,6 @@ def message =
' +-org.apache.maven.plugins.enforcer.its:menforcer128_api:1.4.0 [runtime]'+LS+
'and'+LS+
'+-org.apache.maven.plugins.enforcer.its:menforcer313:1.0-SNAPSHOT'+LS+
-' +-org.apache.maven.plugins.enforcer.its:menforcer128_classic:0.9.9 [provided]'+LS+
-' +-org.apache.maven.plugins.enforcer.its:menforcer128_api:1.5.0 [provided]'+LS
+' +-org.apache.maven.plugins.enforcer.its:menforcer128_classic:0.9.9'+LS+
+' +-org.apache.maven.plugins.enforcer.its:menforcer128_api:1.5.0'+LS
assert buildLog.text.contains( message )