Skip to content

Commit

Permalink
[MJAVADOC-809] Align Mojo class names
Browse files Browse the repository at this point in the history
This closes #312
  • Loading branch information
michael-o committed Aug 20, 2024
1 parent 7c4b467 commit a11b921
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
aggregator = true,
requiresDependencyResolution = ResolutionScope.COMPILE)
@Execute(phase = LifecyclePhase.COMPILE)
public class AggregatorJavadocJar extends JavadocJar {
public class AggregatorJavadocJarMojo extends JavadocJarMojo {
@Override
protected boolean isAggregator() {
return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
aggregator = true,
requiresDependencyResolution = ResolutionScope.TEST)
@Execute(phase = LifecyclePhase.TEST_COMPILE)
public class AggregatorTestJavadocJar extends TestJavadocJar {
public class AggregatorTestJavadocJarMojo extends TestJavadocJarMojo {
@Override
protected boolean isAggregator() {
return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
defaultPhase = LifecyclePhase.PACKAGE,
requiresDependencyResolution = ResolutionScope.COMPILE,
threadSafe = true)
public class JavadocJar extends AbstractJavadocMojo {
public class JavadocJarMojo extends AbstractJavadocMojo {
/**
* Includes all generated Javadoc files
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
defaultPhase = LifecyclePhase.PACKAGE,
requiresDependencyResolution = ResolutionScope.TEST,
threadSafe = true)
public class TestJavadocJar extends JavadocJar {
public class TestJavadocJarMojo extends JavadocJarMojo {
// ----------------------------------------------------------------------
// Javadoc Options (should be inline with Javadoc options defined in TestJavadocReport)
// ----------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.apache.maven.plugins.annotations.ResolutionScope;

/**
* Bundle {@link TestJavadocJar#testJavadocDirectory}, along with javadoc configuration options from
* Bundle {@link TestJavadocJarMojo#testJavadocDirectory}, along with javadoc configuration options from
* {@link AbstractJavadocMojo} such as taglet, doclet, and link information into a deployable
* artifact. This artifact can then be consumed by the javadoc plugin mojos when used by the
* <code>includeDependencySources</code> option, to generate javadocs that are somewhat consistent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
/**
* @author <a href="mailto:[email protected]">Maria Odea Ching</a>
*/
public class JavadocJarTest extends AbstractMojoTestCase {
public class JavadocJarMojoTest extends AbstractMojoTestCase {

private JavadocJar lookupMojo(File testPom) throws Exception {
JavadocJar mojo = (JavadocJar) lookupMojo("jar", testPom);
private JavadocJarMojo lookupMojo(File testPom) throws Exception {
JavadocJarMojo mojo = (JavadocJarMojo) lookupMojo("jar", testPom);

Plugin p = new Plugin();
p.setGroupId("org.apache.maven.plugins");
Expand Down Expand Up @@ -78,7 +78,7 @@ private JavadocJar lookupMojo(File testPom) throws Exception {
public void testDefaultConfig() throws Exception {
File testPom = new File(
getBasedir(), "src/test/resources/unit/javadocjar-default/javadocjar-default-plugin-config.xml");
JavadocJar mojo = lookupMojo(testPom);
JavadocJarMojo mojo = lookupMojo(testPom);
mojo.execute();

// check if the javadoc jar file was generated
Expand Down Expand Up @@ -144,7 +144,7 @@ public void testInvalidDestdir() throws Exception {
File testPom = new File(
getBasedir(),
"src/test/resources/unit/javadocjar-invalid-destdir/javadocjar-invalid-destdir-plugin-config.xml");
JavadocJar mojo = lookupMojo(testPom);
JavadocJarMojo mojo = lookupMojo(testPom);
mojo.execute();

// check if the javadoc jar file was generated
Expand All @@ -158,7 +158,7 @@ public void testContinueIfFailOnErrorIsFalse() throws Exception {
File testPom = new File(
getBasedir(),
"src/test/resources/unit/javadocjar-failonerror/javadocjar-failonerror-plugin-config.xml");
JavadocJar mojo = lookupMojo(testPom);
JavadocJarMojo mojo = lookupMojo(testPom);
mojo.execute();

// check if the javadoc jar file was generated
Expand All @@ -170,7 +170,7 @@ public void testContinueIfFailOnErrorIsFalse() throws Exception {
public void testIncludeMavenDescriptorWhenExplicitlyConfigured() throws Exception {
File testPom = new File(
getBasedir(), "src/test/resources/unit/javadocjar-archive-config/javadocjar-archive-config.xml");
JavadocJar mojo = lookupMojo(testPom);
JavadocJarMojo mojo = lookupMojo(testPom);
mojo.execute();

// check if the javadoc jar file was generated
Expand Down Expand Up @@ -200,7 +200,7 @@ public void testIncludeMavenDescriptorWhenExplicitlyConfigured() throws Exceptio

public void testStale() throws Exception {
File testPom = new File(getBasedir(), "src/test/resources/unit/stale-test/stale-test-plugin-config.xml");
JavadocJar mojo = lookupMojo(testPom);
JavadocJarMojo mojo = lookupMojo(testPom);
BufferingLog log = new BufferingLog();
mojo.setLog(log);

Expand Down

0 comments on commit a11b921

Please sign in to comment.