Skip to content

Commit

Permalink
[MNG-5971] Imported dependencies should be available to inheritance p…
Browse files Browse the repository at this point in the history 
…rocessing

o Updated to restore conflict resolution based on a first declaration wins
  strategy.
  • Loading branch information
@ChristianSchulte
ChristianSchulte committed Feb 23, 2016
1 parent f08e955 commit 4ae1673
Showing 1 changed file with 8 additions and 163 deletions.
171 changes: 8 additions & 163 deletions ...src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,15 @@
* under the License.
*/

import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Model;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.building.ModelProblemCollectorRequest;
import org.codehaus.plexus.component.annotations.Component;

/**
Expand All @@ -49,182 +44,32 @@ public class DefaultDependencyManagementImporter
public void importManagement( final Model target, final List<? extends DependencyManagement> sources,
final ModelBuildingRequest request, final ModelProblemCollector problems )
{
// Intentionally does not check for conflicts in the source dependencies. We want such conflicts to be resolved
// manually instead of silently getting dropped.

if ( sources != null && !sources.isEmpty() )
{
final Map<String, Dependency> targetDependencies = new LinkedHashMap<>();
final DependencyManagement targetDependencyManagement = target.getDependencyManagement() != null
? target.getDependencyManagement()
: new DependencyManagement();

target.setDependencyManagement( targetDependencyManagement );

for ( final Dependency targetDependency : targetDependencyManagement.getDependencies() )
if ( target.getDependencyManagement() != null )
{
targetDependencies.put( targetDependency.getManagementKey(), targetDependency );
for ( final Dependency targetDependency : target.getDependencyManagement().getDependencies() )
{
targetDependencies.put( targetDependency.getManagementKey(), targetDependency );
}
}

final Map<String, List<Dependency>> sourceDependencies = new LinkedHashMap<>();

for ( final DependencyManagement source : sources )
{
for ( final Dependency sourceDependency : source.getDependencies() )
{
if ( !targetDependencies.containsKey( sourceDependency.getManagementKey() ) )
{
List<Dependency> conflictCanditates =
sourceDependencies.get( sourceDependency.getManagementKey() );

if ( conflictCanditates == null )
{
conflictCanditates = new ArrayList<>();
sourceDependencies.put( sourceDependency.getManagementKey(), conflictCanditates );
}

conflictCanditates.add( sourceDependency );
targetDependencies.put( sourceDependency.getManagementKey(), sourceDependency );
}
}
}

for ( final List<Dependency> conflictCanditates : sourceDependencies.values() )
{
final List<Dependency> conflictingDependencies =
this.removeRedundantDependencies( conflictCanditates );

targetDependencyManagement.getDependencies().addAll( conflictingDependencies );

if ( conflictingDependencies.size() > 1 )
{
final StringBuilder conflictsBuilder = new StringBuilder( conflictingDependencies.size() * 128 );

for ( final Dependency dependency : conflictingDependencies )
{
conflictsBuilder.append( ", '" ).append( dependency.getLocation( "" ) ).append( '\'' );
}

problems.add( new ModelProblemCollectorRequest( ModelProblem.Severity.WARNING,
ModelProblem.Version.BASE ).
setMessage( String.format(
"Multiple conflicting imports of dependency '%1$s' into model '%2$s'%3$s(%4$s). "
+ "To resolve this conflict, either declare the dependency directly "
+ "in model '%2$s' to override what gets imported or rearrange the causing "
+ "imports in the inheritance hierarchy to apply standard override logic. "
+ "Without resolving this conflict, your build relies on indeterministic "
+ "behaviour.",
conflictingDependencies.get( 0 ).getManagementKey(), target.getId(),
target.getPomFile() != null
? " @ '" + target.getPomFile().getAbsolutePath() + "' "
: " ", conflictsBuilder.substring( 2 ) ) ) );

}
}
target.setDependencyManagement( new DependencyManagement() );
target.getDependencyManagement().getDependencies().addAll( targetDependencies.values() );
}
}

private List<Dependency> removeRedundantDependencies( final List<Dependency> candidateDependencies )
{
final List<Dependency> resultDependencies = new ArrayList<>( candidateDependencies.size() );

while ( !candidateDependencies.isEmpty() )
{
final Dependency resultDependency = candidateDependencies.remove( 0 );
resultDependencies.add( resultDependency );

// Removes redundant dependencies.
for ( final Iterator<Dependency> it = candidateDependencies.iterator(); it.hasNext(); )
{
final Dependency candidateDependency = it.next();
it.remove();

boolean redundant = true;

redundancy_check:
{
if ( !( resultDependency.getOptional() != null
? resultDependency.getOptional().equals( candidateDependency.getOptional() )
: candidateDependency.getOptional() == null ) )
{
redundant = false;
break redundancy_check;
}

if ( !( resultDependency.getScope() != null
? resultDependency.getScope().equals( candidateDependency.getScope() )
: candidateDependency.getScope() == null ) )
{
redundant = false;
break redundancy_check;
}

if ( !( resultDependency.getSystemPath() != null
? resultDependency.getSystemPath().equals( candidateDependency.getSystemPath() )
: candidateDependency.getSystemPath() == null ) )
{
redundant = false;
break redundancy_check;
}

if ( !( resultDependency.getVersion() != null
? resultDependency.getVersion().equals( candidateDependency.getVersion() )
: candidateDependency.getVersion() == null ) )
{
redundant = false;
break redundancy_check;
}

for ( int i = 0, s0 = resultDependency.getExclusions().size(); i < s0; i++ )
{
final Exclusion resultExclusion = resultDependency.getExclusions().get( i );

if ( !containsExclusion( candidateDependency.getExclusions(), resultExclusion ) )
{
redundant = false;
break redundancy_check;
}
}

for ( int i = 0, s0 = candidateDependency.getExclusions().size(); i < s0; i++ )
{
final Exclusion candidateExclusion = candidateDependency.getExclusions().get( i );

if ( !containsExclusion( resultDependency.getExclusions(), candidateExclusion ) )
{
redundant = false;
break redundancy_check;
}
}
}

if ( !redundant )
{
resultDependencies.add( candidateDependency );
}
}
}

return resultDependencies;
}

private static boolean containsExclusion( final List<Exclusion> exclusions, final Exclusion exclusion )
{
for ( int i = 0, s0 = exclusions.size(); i < s0; i++ )
{
final Exclusion current = exclusions.get( i );

if ( ( exclusion.getArtifactId() != null
? exclusion.getArtifactId().equals( current.getArtifactId() )
: current.getArtifactId() == null )
&& ( exclusion.getGroupId() != null
? exclusion.getGroupId().equals( current.getGroupId() )
: current.getGroupId() == null ) )
{
return true;
}
}

return false;
}

}

0 comments on commit 4ae1673

Please sign in to comment.