Skip to content

Commit dda864b

Browse files
elharoelharo
committed
Migrate from Plexus to Sisu Guice
1 parent 3bb982d commit dda864b

21 files changed

+502
-37
lines changed

‎src/main/java/org/apache/maven/plugins/javadoc/AbstractFixJavadocMojo.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
*/
1919
package org.apache.maven.plugins.javadoc;
2020

21+
import javax.inject.Inject;
22+
2123
import java.io.BufferedReader;
2224
import java.io.File;
2325
import java.io.IOException;
@@ -74,7 +76,6 @@
7476
import org.apache.maven.plugin.AbstractMojo;
7577
import org.apache.maven.plugin.MojoExecutionException;
7678
import org.apache.maven.plugin.MojoFailureException;
77-
import org.apache.maven.plugins.annotations.Component;
7879
import org.apache.maven.plugins.annotations.Parameter;
7980
import org.apache.maven.project.MavenProject;
8081
import org.apache.maven.settings.Settings;
@@ -217,9 +218,13 @@ public abstract class AbstractFixJavadocMojo extends AbstractMojo {
217218
/**
218219
* Input handler, needed for command line handling.
219220
*/
220-
@Component
221221
private InputHandler inputHandler;
222222

223+
@Inject
224+
public AbstractFixJavadocMojo(InputHandler inputHandler) {
225+
this.inputHandler = inputHandler;
226+
}
227+
223228
// ----------------------------------------------------------------------
224229
// Mojo parameters
225230
// ----------------------------------------------------------------------

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

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
*/
1919
package org.apache.maven.plugins.javadoc;
2020

21+
import javax.inject.Inject;
22+
2123
import java.io.File;
2224
import java.io.FileNotFoundException;
2325
import java.io.IOException;
@@ -74,7 +76,6 @@
7476
import org.apache.maven.plugin.MojoExecution;
7577
import org.apache.maven.plugin.MojoExecutionException;
7678
import org.apache.maven.plugin.MojoFailureException;
77-
import org.apache.maven.plugins.annotations.Component;
7879
import org.apache.maven.plugins.annotations.Parameter;
7980
import org.apache.maven.plugins.javadoc.options.BootclasspathArtifact;
8081
import org.apache.maven.plugins.javadoc.options.DocletArtifact;
@@ -206,7 +207,7 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
206207
protected static final String FILES_FILE_NAME = "files";
207208

208209
/**
209-
* Default css file name, used as file name in the output directory for the temporary custom stylesheet file
210+
* Default CSS file name, used as file name in the output directory for the temporary custom stylesheet file
210211
* loaded from classloader resources.
211212
*/
212213
private static final String DEFAULT_CSS_NAME = "stylesheet.css";
@@ -261,9 +262,6 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
261262
*/
262263
private static final JavaVersion SINCE_JAVADOC_1_8 = JavaVersion.parse("1.8");
263264

264-
/**
265-
*
266-
*/
267265
private static final JavaVersion JAVA_VERSION = JavaVersion.JAVA_SPECIFICATION_VERSION;
268266

269267
// ----------------------------------------------------------------------
@@ -273,41 +271,51 @@ public abstract class AbstractJavadocMojo extends AbstractMojo {
273271
/**
274272
* SiteTool.
275273
*/
276-
@Component
277274
protected SiteTool siteTool;
278275

279276
/**
280277
* Archiver manager
281278
*
282279
* @since 2.5
283280
*/
284-
@Component
285281
private ArchiverManager archiverManager;
286282

287-
@Component
288283
private ResourceResolver resourceResolver;
289284

290-
@Component
291285
private RepositorySystem repoSystem;
292286

293287
@Parameter(defaultValue = "${repositorySystemSession}", readonly = true, required = true)
294288
private RepositorySystemSession repoSession;
295289

296-
@Component
297290
private ArtifactHandlerManager artifactHandlerManager;
298291

299292
/**
300293
* Project builder
301294
*
302295
* @since 3.0
303296
*/
304-
@Component
305297
private ProjectBuilder mavenProjectBuilder;
306298

307-
/** */
308-
@Component
309299
private ToolchainManager toolchainManager;
310300

301+
@Inject
302+
public AbstractJavadocMojo(
303+
SiteTool siteTool,
304+
ArchiverManager archiverManager,
305+
ResourceResolver resourceResolver,
306+
RepositorySystem repoSystem,
307+
ArtifactHandlerManager artifactHandlerManager,
308+
ProjectBuilder mavenProjectBuilder,
309+
ToolchainManager toolchainManager) {
310+
this.siteTool = siteTool;
311+
this.archiverManager = archiverManager;
312+
this.resourceResolver = resourceResolver;
313+
this.repoSystem = repoSystem;
314+
this.artifactHandlerManager = artifactHandlerManager;
315+
this.mavenProjectBuilder = mavenProjectBuilder;
316+
this.toolchainManager = toolchainManager;
317+
}
318+
311319
final LocationManager locationManager = new LocationManager();
312320

313321
// ----------------------------------------------------------------------

‎src/main/java/org/apache/maven/plugins/javadoc/AggregatorJavadocJarMojo.java‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,21 @@
1818
*/
1919
package org.apache.maven.plugins.javadoc;
2020

21+
import javax.inject.Inject;
22+
23+
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
24+
import org.apache.maven.doxia.tools.SiteTool;
2125
import org.apache.maven.plugins.annotations.Execute;
2226
import org.apache.maven.plugins.annotations.LifecyclePhase;
2327
import org.apache.maven.plugins.annotations.Mojo;
2428
import org.apache.maven.plugins.annotations.ResolutionScope;
29+
import org.apache.maven.plugins.javadoc.resolver.ResourceResolver;
30+
import org.apache.maven.project.MavenProjectHelper;
31+
import org.apache.maven.project.ProjectBuilder;
32+
import org.apache.maven.toolchain.ToolchainManager;
33+
import org.codehaus.plexus.archiver.jar.JarArchiver;
34+
import org.codehaus.plexus.archiver.manager.ArchiverManager;
35+
import org.eclipse.aether.RepositorySystem;
2536

2637
/**
2738
* <p>Bundles the Javadoc documentation for main <code>Java code</code> in an <b>aggregator</b> project into a jar
@@ -39,6 +50,32 @@
3950
requiresDependencyResolution = ResolutionScope.COMPILE)
4051
@Execute(phase = LifecyclePhase.COMPILE)
4152
public class AggregatorJavadocJarMojo extends JavadocJarMojo {
53+
54+
// CHECKSTYLE_OFF: ParameterNumber
55+
@Inject
56+
public AggregatorJavadocJarMojo(
57+
MavenProjectHelper projectHelper,
58+
JarArchiver jarArchiver,
59+
SiteTool siteTool,
60+
ArchiverManager archiverManager,
61+
ResourceResolver resourceResolver,
62+
RepositorySystem repoSystem,
63+
ArtifactHandlerManager artifactHandlerManager,
64+
ProjectBuilder mavenProjectBuilder,
65+
ToolchainManager toolchainManager) {
66+
super(
67+
projectHelper,
68+
jarArchiver,
69+
siteTool,
70+
archiverManager,
71+
resourceResolver,
72+
repoSystem,
73+
artifactHandlerManager,
74+
mavenProjectBuilder,
75+
toolchainManager);
76+
}
77+
// CHECKSTYLE_ON: ParameterNumber
78+
4279
@Override
4380
protected boolean isAggregator() {
4481
return true;

‎src/main/java/org/apache/maven/plugins/javadoc/AggregatorJavadocNoForkReport.java‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,19 @@
1818
*/
1919
package org.apache.maven.plugins.javadoc;
2020

21+
import javax.inject.Inject;
22+
23+
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
24+
import org.apache.maven.doxia.tools.SiteTool;
2125
import org.apache.maven.plugins.annotations.Execute;
2226
import org.apache.maven.plugins.annotations.LifecyclePhase;
2327
import org.apache.maven.plugins.annotations.Mojo;
2428
import org.apache.maven.plugins.annotations.ResolutionScope;
29+
import org.apache.maven.plugins.javadoc.resolver.ResourceResolver;
30+
import org.apache.maven.project.ProjectBuilder;
31+
import org.apache.maven.toolchain.ToolchainManager;
32+
import org.codehaus.plexus.archiver.manager.ArchiverManager;
33+
import org.eclipse.aether.RepositorySystem;
2534

2635
/**
2736
* Generates documentation for the <code>Java code</code> in an <b>aggregator</b> project using the standard
@@ -31,4 +40,27 @@
3140
*/
3241
@Mojo(name = "aggregate-no-fork", requiresDependencyResolution = ResolutionScope.COMPILE)
3342
@Execute(phase = LifecyclePhase.NONE)
34-
public class AggregatorJavadocNoForkReport extends AggregatorJavadocReport {}
43+
public class AggregatorJavadocNoForkReport extends AggregatorJavadocReport {
44+
45+
// CHECKSTYLE_OFF: ParameterNumber
46+
@Inject
47+
public AggregatorJavadocNoForkReport(
48+
SiteTool siteTool,
49+
ArchiverManager archiverManager,
50+
ResourceResolver resourceResolver,
51+
RepositorySystem repoSystem,
52+
ArtifactHandlerManager artifactHandlerManager,
53+
ProjectBuilder mavenProjectBuilder,
54+
ToolchainManager toolchainManager) {
55+
super(
56+
siteTool,
57+
archiverManager,
58+
resourceResolver,
59+
repoSystem,
60+
artifactHandlerManager,
61+
mavenProjectBuilder,
62+
toolchainManager);
63+
}
64+
// CHECKSTYLE_ON: ParameterNumber
65+
66+
}

‎src/main/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReport.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,19 @@
1818
*/
1919
package org.apache.maven.plugins.javadoc;
2020

21+
import javax.inject.Inject;
22+
23+
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
24+
import org.apache.maven.doxia.tools.SiteTool;
2125
import org.apache.maven.plugins.annotations.Execute;
2226
import org.apache.maven.plugins.annotations.LifecyclePhase;
2327
import org.apache.maven.plugins.annotations.Mojo;
2428
import org.apache.maven.plugins.annotations.ResolutionScope;
29+
import org.apache.maven.plugins.javadoc.resolver.ResourceResolver;
30+
import org.apache.maven.project.ProjectBuilder;
31+
import org.apache.maven.toolchain.ToolchainManager;
32+
import org.codehaus.plexus.archiver.manager.ArchiverManager;
33+
import org.eclipse.aether.RepositorySystem;
2534

2635
/**
2736
* <p>Generates documentation for the <code>Java code</code> in an <b>aggregator</b> project using the standard
@@ -35,6 +44,26 @@
3544
@Mojo(name = "aggregate", aggregator = true, requiresDependencyResolution = ResolutionScope.COMPILE)
3645
@Execute(phase = LifecyclePhase.COMPILE)
3746
public class AggregatorJavadocReport extends JavadocReport {
47+
48+
@Inject
49+
public AggregatorJavadocReport(
50+
SiteTool siteTool,
51+
ArchiverManager archiverManager,
52+
ResourceResolver resourceResolver,
53+
RepositorySystem repoSystem,
54+
ArtifactHandlerManager artifactHandlerManager,
55+
ProjectBuilder mavenProjectBuilder,
56+
ToolchainManager toolchainManager) {
57+
super(
58+
siteTool,
59+
archiverManager,
60+
resourceResolver,
61+
repoSystem,
62+
artifactHandlerManager,
63+
mavenProjectBuilder,
64+
toolchainManager);
65+
}
66+
3867
@Override
3968
protected boolean isAggregator() {
4069
return true;

‎src/main/java/org/apache/maven/plugins/javadoc/AggregatorTestJavadocJarMojo.java‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,21 @@
1818
*/
1919
package org.apache.maven.plugins.javadoc;
2020

21+
import javax.inject.Inject;
22+
23+
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
24+
import org.apache.maven.doxia.tools.SiteTool;
2125
import org.apache.maven.plugins.annotations.Execute;
2226
import org.apache.maven.plugins.annotations.LifecyclePhase;
2327
import org.apache.maven.plugins.annotations.Mojo;
2428
import org.apache.maven.plugins.annotations.ResolutionScope;
29+
import org.apache.maven.plugins.javadoc.resolver.ResourceResolver;
30+
import org.apache.maven.project.MavenProjectHelper;
31+
import org.apache.maven.project.ProjectBuilder;
32+
import org.apache.maven.toolchain.ToolchainManager;
33+
import org.codehaus.plexus.archiver.jar.JarArchiver;
34+
import org.codehaus.plexus.archiver.manager.ArchiverManager;
35+
import org.eclipse.aether.RepositorySystem;
2536

2637
/**
2738
* <p>Bundles the Javadoc documentation for <code>Java Test code</code> in an <b>aggregator</b> project into a jar
@@ -39,6 +50,32 @@
3950
requiresDependencyResolution = ResolutionScope.TEST)
4051
@Execute(phase = LifecyclePhase.TEST_COMPILE)
4152
public class AggregatorTestJavadocJarMojo extends TestJavadocJarMojo {
53+
54+
// CHECKSTYLE_OFF: ParameterNumber
55+
@Inject
56+
public AggregatorTestJavadocJarMojo(
57+
MavenProjectHelper projectHelper,
58+
JarArchiver jarArchiver,
59+
SiteTool siteTool,
60+
ArchiverManager archiverManager,
61+
ResourceResolver resourceResolver,
62+
RepositorySystem repoSystem,
63+
ArtifactHandlerManager artifactHandlerManager,
64+
ProjectBuilder mavenProjectBuilder,
65+
ToolchainManager toolchainManager) {
66+
super(
67+
projectHelper,
68+
jarArchiver,
69+
siteTool,
70+
archiverManager,
71+
resourceResolver,
72+
repoSystem,
73+
artifactHandlerManager,
74+
mavenProjectBuilder,
75+
toolchainManager);
76+
}
77+
// CHECKSTYLE_ON: ParameterNumber
78+
4279
@Override
4380
protected boolean isAggregator() {
4481
return true;

‎src/main/java/org/apache/maven/plugins/javadoc/AggregatorTestJavadocNoForkReport.java‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,19 @@
1818
*/
1919
package org.apache.maven.plugins.javadoc;
2020

21+
import javax.inject.Inject;
22+
23+
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
24+
import org.apache.maven.doxia.tools.SiteTool;
2125
import org.apache.maven.plugins.annotations.Execute;
2226
import org.apache.maven.plugins.annotations.LifecyclePhase;
2327
import org.apache.maven.plugins.annotations.Mojo;
2428
import org.apache.maven.plugins.annotations.ResolutionScope;
29+
import org.apache.maven.plugins.javadoc.resolver.ResourceResolver;
30+
import org.apache.maven.project.ProjectBuilder;
31+
import org.apache.maven.toolchain.ToolchainManager;
32+
import org.codehaus.plexus.archiver.manager.ArchiverManager;
33+
import org.eclipse.aether.RepositorySystem;
2534

2635
/**
2736
* Generates documentation for the <code>Java Test code</code> in an <b>aggregator</b> project using the standard
@@ -32,4 +41,24 @@
3241
*/
3342
@Mojo(name = "test-aggregate-no-fork", requiresDependencyResolution = ResolutionScope.TEST)
3443
@Execute(phase = LifecyclePhase.NONE)
35-
public class AggregatorTestJavadocNoForkReport extends AggregatorTestJavadocReport {}
44+
public class AggregatorTestJavadocNoForkReport extends AggregatorTestJavadocReport {
45+
46+
@Inject
47+
public AggregatorTestJavadocNoForkReport(
48+
SiteTool siteTool,
49+
ArchiverManager archiverManager,
50+
ResourceResolver resourceResolver,
51+
RepositorySystem repoSystem,
52+
ArtifactHandlerManager artifactHandlerManager,
53+
ProjectBuilder mavenProjectBuilder,
54+
ToolchainManager toolchainManager) {
55+
super(
56+
siteTool,
57+
archiverManager,
58+
resourceResolver,
59+
repoSystem,
60+
artifactHandlerManager,
61+
mavenProjectBuilder,
62+
toolchainManager);
63+
}
64+
}

0 commit comments

Comments
 (0)