Skip to content

Commit 24362d2

Browse files
cstamasslawekjaranowskikwin
authored
[MJAVADOC-742] Fix resolution of docletArtifacts (#186)
Co-authored-by: Slawomir Jaranowski <[email protected]> Co-authored-by: Konrad Windszus <[email protected]>
1 parent bee4197 commit 24362d2

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@
132132
import org.eclipse.aether.artifact.ArtifactTypeRegistry;
133133
import org.eclipse.aether.artifact.DefaultArtifact;
134134
import org.eclipse.aether.collection.CollectRequest;
135-
import org.eclipse.aether.graph.DefaultDependencyNode;
136135
import org.eclipse.aether.graph.DependencyFilter;
137136
import org.eclipse.aether.resolution.ArtifactRequest;
138137
import org.eclipse.aether.resolution.ArtifactResolutionException;
@@ -3251,8 +3250,11 @@ private List<String> getArtifactsAbsolutePath(JavadocPathArtifact javadocArtifac
32513250

32523251
DependencyFilter filter = new ScopeDependencyFilter(
32533252
Arrays.asList(Artifact.SCOPE_COMPILE, Artifact.SCOPE_PROVIDED), Collections.emptySet());
3254-
DependencyRequest req =
3255-
new DependencyRequest(new DefaultDependencyNode(RepositoryUtils.toArtifact(artifact)), filter);
3253+
DependencyRequest req = new DependencyRequest(
3254+
new CollectRequest(
3255+
new org.eclipse.aether.graph.Dependency(RepositoryUtils.toArtifact(artifact), null),
3256+
RepositoryUtils.toRepos(project.getRemoteArtifactRepositories())),
3257+
filter);
32563258
Iterable<ArtifactResult> deps =
32573259
repoSystem.resolveDependencies(repoSession, req).getArtifactResults();
32583260
for (ArtifactResult a : deps) {

src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java

+8-10
Original file line numberDiff line numberDiff line change
@@ -1080,19 +1080,17 @@ public void testTagletArtifacts() throws Exception {
10801080
Path testPom = unit.resolve("tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml");
10811081
JavadocReport mojo = lookupMojo(testPom);
10821082

1083-
MavenSession session = spy(newMavenSession(mojo.project));
1084-
ProjectBuildingRequest buildingRequest = mock(ProjectBuildingRequest.class);
1085-
when(buildingRequest.getRemoteRepositories()).thenReturn(mojo.project.getRemoteArtifactRepositories());
1086-
when(session.getProjectBuildingRequest()).thenReturn(buildingRequest);
1087-
DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
1088-
repositorySession.setLocalRepositoryManager(new SimpleLocalRepositoryManagerFactory()
1089-
.newInstance(repositorySession, new LocalRepository(localRepo)));
1090-
when(buildingRequest.getRepositorySession()).thenReturn(repositorySession);
1091-
when(session.getRepositorySession()).thenReturn(repositorySession);
1083+
MavenSession session = newMavenSession(mojo.project);
1084+
DefaultRepositorySystemSession repoSysSession = (DefaultRepositorySystemSession) session.getRepositorySession();
1085+
repoSysSession.setLocalRepositoryManager(new SimpleLocalRepositoryManagerFactory()
1086+
.newInstance(session.getRepositorySession(), new LocalRepository(new File("target/local-repo"))));
1087+
// Ensure remote repo connection uses SSL
1088+
File globalSettingsFile = new File(getBasedir(), "target/test-classes/unit/settings.xml");
1089+
session.getRequest().setGlobalSettingsFile(globalSettingsFile);
10921090
LegacySupport legacySupport = lookup(LegacySupport.class);
10931091
legacySupport.setSession(session);
10941092
setVariableValueToObject(mojo, "session", session);
1095-
setVariableValueToObject(mojo, "repoSession", repositorySession);
1093+
setVariableValueToObject(mojo, "repoSession", repoSysSession);
10961094
mojo.execute();
10971095

10981096
Path optionsFile = new File(mojo.getOutputDirectory(), "options").toPath();

0 commit comments

Comments
 (0)