[maven-javadoc-plugin] branch master updated: [MJAVADOC-742] Fix resolution of docletArtifacts (#186)

[kwin]

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 24362d28 [MJAVADOC-742] Fix resolution of docletArtifacts (#186)
24362d28 is described below

commit 24362d288bc70c658cdcced4cc0b60b648180dc7
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Mon Sep 11 20:28:07 2023 +0200

    [MJAVADOC-742] Fix resolution of docletArtifacts (#186)
    
    Co-authored-by: Slawomir Jaranowski <s.jaranow...@gmail.com>
    Co-authored-by: Konrad Windszus <k...@apache.org>
---
 .../maven/plugins/javadoc/AbstractJavadocMojo.java     |  8 +++++---
 .../maven/plugins/javadoc/JavadocReportTest.java       | 18 ++++++++----------
 2 files changed, 13 insertions(+), 13 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 e812c17f..af3eb67e 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -132,7 +132,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;
@@ -3251,8 +3250,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) {
diff --git 
a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java 
b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
index fce08966..6df45691 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -1080,19 +1080,17 @@ public class JavadocReportTest extends 
AbstractMojoTestCase {
         Path testPom = 
unit.resolve("tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml");
         JavadocReport mojo = lookupMojo(testPom);
 
-        MavenSession session = spy(newMavenSession(mojo.project));
-        ProjectBuildingRequest buildingRequest = 
mock(ProjectBuildingRequest.class);
-        
when(buildingRequest.getRemoteRepositories()).thenReturn(mojo.project.getRemoteArtifactRepositories());
-        when(session.getProjectBuildingRequest()).thenReturn(buildingRequest);
-        DefaultRepositorySystemSession repositorySession = new 
DefaultRepositorySystemSession();
-        repositorySession.setLocalRepositoryManager(new 
SimpleLocalRepositoryManagerFactory()
-                .newInstance(repositorySession, new 
LocalRepository(localRepo)));
-        
when(buildingRequest.getRepositorySession()).thenReturn(repositorySession);
-        when(session.getRepositorySession()).thenReturn(repositorySession);
+        MavenSession session = newMavenSession(mojo.project);
+        DefaultRepositorySystemSession repoSysSession = 
(DefaultRepositorySystemSession) session.getRepositorySession();
+        repoSysSession.setLocalRepositoryManager(new 
SimpleLocalRepositoryManagerFactory()
+                .newInstance(session.getRepositorySession(), new 
LocalRepository(new File("target/local-repo"))));
+        // Ensure remote repo connection uses SSL
+        File globalSettingsFile = new File(getBasedir(), 
"target/test-classes/unit/settings.xml");
+        session.getRequest().setGlobalSettingsFile(globalSettingsFile);
         LegacySupport legacySupport = lookup(LegacySupport.class);
         legacySupport.setSession(session);
         setVariableValueToObject(mojo, "session", session);
-        setVariableValueToObject(mojo, "repoSession", repositorySession);
+        setVariableValueToObject(mojo, "repoSession", repoSysSession);
         mojo.execute();
 
         Path optionsFile = new File(mojo.getOutputDirectory(), 
"options").toPath();