|
29 | 29 | import org.apache.maven.artifact.Artifact;
|
30 | 30 | import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
|
31 | 31 | import org.apache.maven.artifact.resolver.filter.IncludesArtifactFilter;
|
| 32 | +import org.apache.maven.execution.MavenSession; |
32 | 33 | import org.apache.maven.plugin.MojoExecutionException;
|
33 | 34 | import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException;
|
34 | 35 | import org.apache.maven.plugin.descriptor.PluginDescriptor;
|
|
48 | 49 | import org.apache.maven.tools.plugin.scanner.MojoScanner;
|
49 | 50 | import org.codehaus.plexus.component.repository.ComponentDependency;
|
50 | 51 | import org.codehaus.plexus.util.ReaderFactory;
|
51 |
| -import org.eclipse.aether.RepositorySystemSession; |
52 | 52 | import org.sonatype.plexus.build.incremental.BuildContext;
|
53 | 53 |
|
54 | 54 | /**
|
@@ -226,11 +226,12 @@ public class DescriptorGeneratorMojo extends AbstractGeneratorMojo {
|
226 | 226 | *
|
227 | 227 | * @since 3.7.0
|
228 | 228 | */
|
229 |
| - @Parameter(defaultValue = "${settings}", readonly = true, required = true) |
| 229 | + @Component |
230 | 230 | private Settings settings;
|
231 | 231 |
|
232 |
| - @Parameter(defaultValue = "${repositorySystemSession}", readonly = true, required = true) |
233 |
| - private RepositorySystemSession repoSession; |
| 232 | + @Component |
| 233 | + private MavenSession mavenSession; |
| 234 | + |
234 | 235 | /**
|
235 | 236 | * The required Java version to set in the plugin descriptor. This is evaluated by Maven 4 and ignored by earlier
|
236 | 237 | * Maven versions. Can be either one of the following formats:
|
@@ -346,7 +347,7 @@ public void generate() throws MojoExecutionException {
|
346 | 347 | request.setEncoding(encoding);
|
347 | 348 | request.setSkipErrorNoDescriptorsFound(skipErrorNoDescriptorsFound);
|
348 | 349 | request.setDependencies(filterMojoDependencies());
|
349 |
| - request.setRepoSession(repoSession); |
| 350 | + request.setRepoSession(mavenSession.getRepositorySession()); |
350 | 351 | request.setInternalJavadocBaseUrl(internalJavadocBaseUrl);
|
351 | 352 | request.setInternalJavadocVersion(internalJavadocVersion);
|
352 | 353 | request.setExternalJavadocBaseUrls(externalJavadocBaseUrls);
|
|
0 commit comments