Skip to content

Commit b5fa41a

Browse files
authored
fixed case where ResolvedPom.resolveDependencies can return incomplete data (#2151) (#2152)
1 parent 00dfc80 commit b5fa41a

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java

+10-1
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ public List<ResolvedDependency> resolveDependencies(Scope scope, Map<GroupArtifa
552552
.getResolutionListener()
553553
.clear();
554554
return resolveDependencies(scope, requirements, downloader, ctx);
555-
} else {
555+
} else if (contains(dependencies, ga)) {
556556
// we've already resolved this previously and the requirement didn't change,
557557
// so just skip and continue on
558558
continue;
@@ -624,6 +624,15 @@ public List<ResolvedDependency> resolveDependencies(Scope scope, Map<GroupArtifa
624624
return dependencies;
625625
}
626626

627+
private boolean contains(List<ResolvedDependency> dependencies, GroupArtifact ga) {
628+
for (ResolvedDependency it : dependencies) {
629+
if (it.getGroupId().equals(ga.getGroupId()) && it.getArtifactId().equals(ga.getArtifactId())) {
630+
return true;
631+
}
632+
}
633+
return false;
634+
}
635+
627636
private Scope getDependencyScope(Dependency d2, ResolvedPom containingPom) {
628637
if (d2.getScope() == null) {
629638
// project POM's dependency management overrules the dependency's dependencyManagement

0 commit comments

Comments
 (0)