Skip to content

Commit 5ec1106

Browse files
authored
[MNG-8182] Resolved errors were created based on collect exceptions (#1635)
Hence, they missed resolution errors. --- https://issues.apache.org/jira/browse/MNG-8182
1 parent 1daa1d5 commit 5ec1106

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import java.util.LinkedHashMap;
2626
import java.util.List;
2727
import java.util.Map;
28+
import java.util.stream.Collectors;
29+
import java.util.stream.Stream;
2830

2931
import org.apache.maven.RepositoryUtils;
3032
import org.apache.maven.api.DependencyScope;
@@ -234,8 +236,13 @@ private DependencyResult resolveInternal(
234236
throw new PluginResolutionException(
235237
plugin, e.getResult().getExceptions(), logger.isDebugEnabled() ? e : null);
236238
} catch (DependencyResolutionException e) {
237-
throw new PluginResolutionException(
238-
plugin, e.getResult().getCollectExceptions(), logger.isDebugEnabled() ? e : null);
239+
List<Exception> exceptions = Stream.concat(
240+
e.getResult().getCollectExceptions().stream(),
241+
e.getResult().getArtifactResults().stream()
242+
.filter(r -> !r.isResolved())
243+
.flatMap(r -> r.getExceptions().stream()))
244+
.collect(Collectors.toList());
245+
throw new PluginResolutionException(plugin, exceptions, logger.isDebugEnabled() ? e : null);
239246
}
240247
}
241248
}

0 commit comments

Comments
 (0)