Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MENFORCER-402] - fix provided dependencies in RequireUpperBoundDeps #140

Merged
merged 9 commits into from May 28, 2022
Merged

[MENFORCER-402] - fix provided dependencies in RequireUpperBoundDeps #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
87827dc
MENFORCER-402 fix provided dependencies
subes Feb 13, 2022
53d5cee
Merge branch 'apache:master' into patch-1
subes May 25, 2022
a62a99b
[MENFORCER-402] fix provided dependencies
subes Feb 13, 2022
9881297
Merge branch 'apache:master' into patch-1
subes May 25, 2022
621c593
Merge branch 'patch-1' of https://github.com/subes/maven-enforcer.git…
subes May 27, 2022
b4b1dff
Merge branch 'apache:master' into patch-1
subes May 27, 2022
77b50f4
[MENFORCER-402] fix integration test for upper bound dependencies
subes May 27, 2022
33ac4a4
[MENFORCER-402] fix integration test for upper bound dependencies
subes May 27, 2022
4f19e43
Merge branch 'patch-1' of https://github.com/subes/maven-enforcer.git…
subes May 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
View file
Open in desktop
Expand Up @@ -136,7 +136,10 @@ private DependencyNode getNode( EnforcerRuleHelper helper )
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 )
Expand Down
2 changes: 1 addition & 1 deletion maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure_show_scopes/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...nforcer-plugin/src/it/projects/require-upper-bound-deps_failure_show_scopes/verify.groovy
View file
Open in desktop
Expand Up @@ -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 )