Skip to content

[MNG-5600] Dependency management import should support exclusions #295

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

Closed
alex1989hu wants to merge 1 commit into from
Closed

[MNG-5600] Dependency management import should support exclusions #295

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 35 additions & 1 deletion maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.InputLocation;
import org.apache.maven.model.InputSource;
import org.apache.maven.model.Model;
Expand Down Expand Up @@ -1407,7 +1408,40 @@ private void importDependencyManagement( Model model, ModelBuildingRequest reque
importMgmt = new DependencyManagement();
}

intoCache( request.getModelCache(), groupId, artifactId, version, ModelCacheTag.IMPORT, importMgmt );
// [MNG-5600] Dependency management import should support exclusions.
if ( !dependency.getExclusions().isEmpty() )
{
for ( final Exclusion exclusion : dependency.getExclusions() )
{
if ( exclusion.getGroupId() != null && exclusion.getArtifactId() != null )
{
for ( final Iterator<Dependency> dependencies = importMgmt.getDependencies().iterator();
dependencies.hasNext(); )
{
final Dependency candidate = dependencies.next();

if ( ( exclusion.getGroupId().equals( "*" )
|| exclusion.getGroupId().equals( candidate.getGroupId() ) )
&& ( exclusion.getArtifactId().equals( "*" )
|| exclusion.getArtifactId().equals( candidate.getArtifactId() ) ) )
{
// Dependency excluded from import.
dependencies.remove();
}
}
}
}

for ( final Dependency includedDependency : importMgmt.getDependencies() )
{
includedDependency.getExclusions().addAll( dependency.getExclusions() );
}
}
else
{
// Only dependency managements without exclusion processing applied can be cached.
intoCache( request.getModelCache(), groupId, artifactId, version, ModelCacheTag.IMPORT, importMgmt );
}
}

if ( importMgmts == null )
Expand Down