You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2023/02/23 16:48:15 UTC
[maven-javadoc-plugin] branch MJAVADOC-742 created (now 85e0e90c)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a change to branch MJAVADOC-742
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
at 85e0e90c [MJAVADOC-742] Fix resolution of docletArtifacts
This branch includes the following new commits:
new 85e0e90c [MJAVADOC-742] Fix resolution of docletArtifacts
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-javadoc-plugin] 01/01: [MJAVADOC-742] Fix resolution of docletArtifacts
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch MJAVADOC-742
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 85e0e90c4dd453bf3f0e8ce5169d933436a99474
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Thu Feb 23 17:47:28 2023 +0100
[MJAVADOC-742] Fix resolution of docletArtifacts
---
https://issues.apache.org/jira/browse/MJAVADOC-742
---
.../org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index e9f38d54..e5cbb2cf 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -133,7 +133,6 @@ import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.artifact.ArtifactTypeRegistry;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.eclipse.aether.collection.CollectRequest;
-import org.eclipse.aether.graph.DefaultDependencyNode;
import org.eclipse.aether.graph.DependencyFilter;
import org.eclipse.aether.resolution.ArtifactRequest;
import org.eclipse.aether.resolution.ArtifactResolutionException;
@@ -3242,8 +3241,11 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
DependencyFilter filter = new ScopeDependencyFilter(
Arrays.asList(Artifact.SCOPE_COMPILE, Artifact.SCOPE_PROVIDED), Collections.emptySet());
- DependencyRequest req =
- new DependencyRequest(new DefaultDependencyNode(RepositoryUtils.toArtifact(artifact)), filter);
+ DependencyRequest req = new DependencyRequest(
+ new CollectRequest(
+ new org.eclipse.aether.graph.Dependency(RepositoryUtils.toArtifact(artifact), null),
+ RepositoryUtils.toRepos(project.getRemoteArtifactRepositories())),
+ filter);
Iterable<ArtifactResult> deps =
repoSystem.resolveDependencies(repoSession, req).getArtifactResults();
for (ArtifactResult a : deps) {