453221 represent missing dependencies in dependency tree
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
index 28770c1..04a3501 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
@@ -447,8 +447,8 @@
getRemoteRepositories( rangeResult.getRepository( version ), repositories );
DefaultDependencyNode child =
- createDependencyNode( relocations, preManaged, rangeResult, version, d, descriptorResult, repos,
- args.request.getRequestContext() );
+ createDependencyNode( relocations, preManaged, rangeResult, version, d,
+ descriptorResult.getAliases(), repos, args.request.getRequestContext() );
node.getChildren().add( child );
@@ -460,6 +460,16 @@
}
}
}
+ else
+ {
+ DependencyNode node = args.nodes.top();
+ List<RemoteRepository> repos =
+ getRemoteRepositories( rangeResult.getRepository( version ), repositories );
+ DefaultDependencyNode child =
+ createDependencyNode( relocations, preManaged, rangeResult, version, d, null, repos,
+ args.request.getRequestContext() );
+ node.getChildren().add( child );
+ }
}
}
@@ -544,7 +554,7 @@
private static DefaultDependencyNode createDependencyNode( List<Artifact> relocations,
PremanagedDependency preManaged,
VersionRangeResult rangeResult, Version version,
- Dependency d, ArtifactDescriptorResult descriptorResult,
+ Dependency d, Collection<Artifact> aliases,
List<RemoteRepository> repos, String requestContext )
{
DefaultDependencyNode child = new DefaultDependencyNode( d );
@@ -552,7 +562,7 @@
child.setRelocations( relocations );
child.setVersionConstraint( rangeResult.getVersionConstraint() );
child.setVersion( version );
- child.setAliases( descriptorResult.getAliases() );
+ child.setAliases( aliases );
child.setRepositories( repos );
child.setRequestContext( requestContext );
return child;
@@ -565,7 +575,7 @@
DependencyNode cycleNode )
{
DefaultDependencyNode child =
- createDependencyNode( relocations, preManaged, rangeResult, version, d, descriptorResult,
+ createDependencyNode( relocations, preManaged, rangeResult, version, d, descriptorResult.getAliases(),
cycleNode.getRepositories(), cycleNode.getRequestContext() );
child.setChildren( cycleNode.getChildren() );
return child;
diff --git a/aether-impl/src/test/resources/artifact-descriptions/expectedPartialSubtreeOnError.txt b/aether-impl/src/test/resources/artifact-descriptions/expectedPartialSubtreeOnError.txt
index badca5e..6ef2faf 100644
--- a/aether-impl/src/test/resources/artifact-descriptions/expectedPartialSubtreeOnError.txt
+++ b/aether-impl/src/test/resources/artifact-descriptions/expectedPartialSubtreeOnError.txt
@@ -1,5 +1,6 @@
subtree:comparison:ext:error
+- duplicate:transitive:ext:dependency compile
- +- gid:aid:ext:ver compile
- | \- gid:aid2:ext:ver compile
- \- gid:aid2:ext:ver compile
+| +- gid:aid:ext:ver compile
+| | \- gid:aid2:ext:ver compile
+| \- gid:aid2:ext:ver compile
+\- git:aid:ext:ver compile
