You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2021/05/25 17:32:22 UTC
[maven-dist-tool] branch master updated: rename *Mojo to *Report
because they are reports
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dist-tool.git
The following commit(s) were added to refs/heads/master by this push:
new 0fc201c rename *Mojo to *Report because they are reports
0fc201c is described below
commit 0fc201cbaa9007c20a9d1d4d8585ca0f3ec74af9
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Tue May 25 19:32:16 2021 +0200
rename *Mojo to *Report because they are reports
---
...ractDistCheckMojo.java => AbstractDistCheckReport.java} | 2 +-
.../org/apache/maven/dist/tools/ConfigurationLineInfo.java | 4 ++--
...DistCheckErrorsMojo.java => DistCheckErrorsReport.java} | 14 +++++++-------
.../{DummyFailureMojo.java => DummyFailureReport.java} | 4 ++--
.../{ListBranchesMojo.java => ListBranchesReport.java} | 2 +-
...eckIndexPageMojo.java => DistCheckIndexPageReport.java} | 6 +++---
.../{ListMasterJobsMojo.java => ListMasterJobsReport.java} | 2 +-
...isitesMojo.java => ListPluginsPrerequisitesReport.java} | 2 +-
.../org/apache/maven/dist/tools/site/CheckSiteResult.java | 10 +++++-----
.../{DistCheckSiteMojo.java => DistCheckSiteReport.java} | 6 +++---
...eReleaseMojo.java => DistCheckSourceReleaseReport.java} | 6 +++---
.../org/apache/maven/dist/tools/source/PatternTest.java | 6 +++---
12 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java b/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckReport.java
similarity index 99%
rename from src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
rename to src/main/java/org/apache/maven/dist/tools/AbstractDistCheckReport.java
index 611170a..af8904a 100644
--- a/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
+++ b/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckReport.java
@@ -54,7 +54,7 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
*
* @author skygo
*/
-public abstract class AbstractDistCheckMojo
+public abstract class AbstractDistCheckReport
extends AbstractMavenReport
{
private static final String CONF = "dist-tool.conf";
diff --git a/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java b/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java
index 663487a..05966dc 100644
--- a/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java
+++ b/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java
@@ -25,7 +25,7 @@ import java.time.temporal.TemporalAccessor;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.dist.tools.index.DistCheckIndexPageMojo;
+import org.apache.maven.dist.tools.index.DistCheckIndexPageReport;
/**
*
@@ -58,7 +58,7 @@ public class ConfigurationLineInfo
this.artifactId = ( index < 0 ) ? null : g.substring( index + 1 );
this.versionRange = null;
- this.indexPageUrl = DistCheckIndexPageMojo.POMS_INDEX_URL; // in case of group parent pom artifact
+ this.indexPageUrl = DistCheckIndexPageReport.POMS_INDEX_URL; // in case of group parent pom artifact
}
public ConfigurationLineInfo( ConfigurationLineInfo group, String[] infos )
diff --git a/src/main/java/org/apache/maven/dist/tools/DistCheckErrorsMojo.java b/src/main/java/org/apache/maven/dist/tools/DistCheckErrorsReport.java
similarity index 93%
rename from src/main/java/org/apache/maven/dist/tools/DistCheckErrorsMojo.java
rename to src/main/java/org/apache/maven/dist/tools/DistCheckErrorsReport.java
index 32af9b5..b96c13b 100644
--- a/src/main/java/org/apache/maven/dist/tools/DistCheckErrorsMojo.java
+++ b/src/main/java/org/apache/maven/dist/tools/DistCheckErrorsReport.java
@@ -23,9 +23,9 @@ import java.io.File;
import java.io.IOException;
import java.util.Locale;
-import org.apache.maven.dist.tools.index.DistCheckIndexPageMojo;
-import org.apache.maven.dist.tools.site.DistCheckSiteMojo;
-import org.apache.maven.dist.tools.source.DistCheckSourceReleaseMojo;
+import org.apache.maven.dist.tools.index.DistCheckIndexPageReport;
+import org.apache.maven.dist.tools.site.DistCheckSiteReport;
+import org.apache.maven.dist.tools.source.DistCheckSourceReleaseReport;
import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
@@ -37,11 +37,11 @@ import org.codehaus.plexus.util.FileUtils;
* @author skygo
*/
@Mojo( name = "check-errors", requiresProject = false )
-public class DistCheckErrorsMojo
- extends AbstractDistCheckMojo
+public class DistCheckErrorsReport
+ extends AbstractDistCheckReport
{
- private static final String[] FAILURES_FILENAMES = { DistCheckSourceReleaseMojo.FAILURES_FILENAME,
- DistCheckSiteMojo.FAILURES_FILENAME, DistCheckIndexPageMojo.FAILURES_FILENAME };
+ private static final String[] FAILURES_FILENAMES = { DistCheckSourceReleaseReport.FAILURES_FILENAME,
+ DistCheckSiteReport.FAILURES_FILENAME, DistCheckIndexPageReport.FAILURES_FILENAME };
private static final String EOL = System.getProperty( "line.separator" );
diff --git a/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java b/src/main/java/org/apache/maven/dist/tools/DummyFailureReport.java
similarity index 95%
rename from src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java
rename to src/main/java/org/apache/maven/dist/tools/DummyFailureReport.java
index 90f8376..bc61d54 100644
--- a/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java
+++ b/src/main/java/org/apache/maven/dist/tools/DummyFailureReport.java
@@ -28,8 +28,8 @@ import org.apache.maven.plugins.annotations.Mojo;
* @author skygo
*/
@Mojo( name = "failure-report", requiresProject = false )
-public class DummyFailureMojo
- extends DistCheckErrorsMojo
+public class DummyFailureReport
+ extends DistCheckErrorsReport
{
@Override
boolean isDummyFailure()
diff --git a/src/main/java/org/apache/maven/dist/tools/branches/ListBranchesMojo.java b/src/main/java/org/apache/maven/dist/tools/branches/ListBranchesReport.java
similarity index 99%
rename from src/main/java/org/apache/maven/dist/tools/branches/ListBranchesMojo.java
rename to src/main/java/org/apache/maven/dist/tools/branches/ListBranchesReport.java
index 79fcebf..4dbd32e 100644
--- a/src/main/java/org/apache/maven/dist/tools/branches/ListBranchesMojo.java
+++ b/src/main/java/org/apache/maven/dist/tools/branches/ListBranchesReport.java
@@ -50,7 +50,7 @@ import org.jsoup.select.Elements;
* @author Robert Scholte
*/
@Mojo( name = "list-branches", requiresProject = false )
-public class ListBranchesMojo extends AbstractMavenReport
+public class ListBranchesReport extends AbstractMavenReport
{
private static final String JIRA_BASE_URL = "https://issues.apache.org/jira/projects/";
diff --git a/src/main/java/org/apache/maven/dist/tools/index/DistCheckIndexPageMojo.java b/src/main/java/org/apache/maven/dist/tools/index/DistCheckIndexPageReport.java
similarity index 98%
rename from src/main/java/org/apache/maven/dist/tools/index/DistCheckIndexPageMojo.java
rename to src/main/java/org/apache/maven/dist/tools/index/DistCheckIndexPageReport.java
index 52edb4b..be7307c 100644
--- a/src/main/java/org/apache/maven/dist/tools/index/DistCheckIndexPageMojo.java
+++ b/src/main/java/org/apache/maven/dist/tools/index/DistCheckIndexPageReport.java
@@ -30,7 +30,7 @@ import java.util.Locale;
import java.util.Map;
import org.apache.maven.dist.tools.AbstractCheckResult;
-import org.apache.maven.dist.tools.AbstractDistCheckMojo;
+import org.apache.maven.dist.tools.AbstractDistCheckReport;
import org.apache.maven.dist.tools.ConfigurationLineInfo;
import org.apache.maven.dist.tools.JsoupRetry;
import org.apache.maven.doxia.sink.Sink;
@@ -48,8 +48,8 @@ import org.jsoup.select.Elements;
* @author skygo
*/
@Mojo( name = "check-index-page", requiresProject = false )
-public class DistCheckIndexPageMojo
- extends AbstractDistCheckMojo
+public class DistCheckIndexPageReport
+ extends AbstractDistCheckReport
{
public static final String FAILURES_FILENAME = "check-index-page.log";
diff --git a/src/main/java/org/apache/maven/dist/tools/masterjobs/ListMasterJobsMojo.java b/src/main/java/org/apache/maven/dist/tools/masterjobs/ListMasterJobsReport.java
similarity index 99%
rename from src/main/java/org/apache/maven/dist/tools/masterjobs/ListMasterJobsMojo.java
rename to src/main/java/org/apache/maven/dist/tools/masterjobs/ListMasterJobsReport.java
index a36fadf..9236746 100644
--- a/src/main/java/org/apache/maven/dist/tools/masterjobs/ListMasterJobsMojo.java
+++ b/src/main/java/org/apache/maven/dist/tools/masterjobs/ListMasterJobsReport.java
@@ -47,7 +47,7 @@ import org.jsoup.select.Elements;
* @author Robert Scholte
*/
@Mojo( name = "list-master-jobs", requiresProject = false )
-public class ListMasterJobsMojo extends AbstractMavenReport
+public class ListMasterJobsReport extends AbstractMavenReport
{
private String gitboxUrl = "https://gitbox.apache.org/repos/asf";
private String mavenboxJobsBaseUrl = "https://ci-builds.apache.org/job/Maven/job/maven-box/";
diff --git a/src/main/java/org/apache/maven/dist/tools/prerequisites/ListPluginsPrerequisitesMojo.java b/src/main/java/org/apache/maven/dist/tools/prerequisites/ListPluginsPrerequisitesReport.java
similarity index 98%
rename from src/main/java/org/apache/maven/dist/tools/prerequisites/ListPluginsPrerequisitesMojo.java
rename to src/main/java/org/apache/maven/dist/tools/prerequisites/ListPluginsPrerequisitesReport.java
index 08a6608..568b679 100644
--- a/src/main/java/org/apache/maven/dist/tools/prerequisites/ListPluginsPrerequisitesMojo.java
+++ b/src/main/java/org/apache/maven/dist/tools/prerequisites/ListPluginsPrerequisitesReport.java
@@ -35,7 +35,7 @@ import org.apache.maven.reporting.MavenReportException;
* @author Karl Heinz Marbaise
*/
@Mojo( name = "list-plugins-prerequisites", requiresProject = false )
-public class ListPluginsPrerequisitesMojo
+public class ListPluginsPrerequisitesReport
extends AbstractMavenReport
{
@Override
diff --git a/src/main/java/org/apache/maven/dist/tools/site/CheckSiteResult.java b/src/main/java/org/apache/maven/dist/tools/site/CheckSiteResult.java
index f94f124..8282216 100644
--- a/src/main/java/org/apache/maven/dist/tools/site/CheckSiteResult.java
+++ b/src/main/java/org/apache/maven/dist/tools/site/CheckSiteResult.java
@@ -38,14 +38,14 @@ class CheckSiteResult
/**
*
*/
- private final DistCheckSiteMojo distCheckSiteMojo;
+ private final DistCheckSiteReport distCheckSiteMojo;
private String url;
private Map<HTMLChecker, Boolean> checkMap = new HashMap<>();
private int statusCode = -1;
private Document document;
private String screenshotName;
- CheckSiteResult( DistCheckSiteMojo distCheckSiteMojo, ConfigurationLineInfo r, String version )
+ CheckSiteResult( DistCheckSiteReport distCheckSiteMojo, ConfigurationLineInfo r, String version )
{
super( r, version );
this.distCheckSiteMojo = distCheckSiteMojo;
@@ -87,7 +87,7 @@ class CheckSiteResult
void getSkins( Sink sink )
{
- if ( statusCode != DistCheckSiteMojo.HTTP_OK )
+ if ( statusCode != DistCheckSiteReport.HTTP_OK )
{
sink.text( "None" );
}
@@ -129,7 +129,7 @@ class CheckSiteResult
void getOverall( Sink sink )
{
- if ( statusCode != DistCheckSiteMojo.HTTP_OK )
+ if ( statusCode != DistCheckSiteReport.HTTP_OK )
{
this.distCheckSiteMojo.iconError( sink );
}
@@ -169,7 +169,7 @@ class CheckSiteResult
void setDocument( Document doc )
{
this.document = doc ;
- statusCode = ( doc == null ) ? -1 : DistCheckSiteMojo.HTTP_OK;
+ statusCode = ( doc == null ) ? -1 : DistCheckSiteReport.HTTP_OK;
}
void setScreenShot( String fileName )
diff --git a/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteMojo.java b/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteReport.java
similarity index 98%
rename from src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteMojo.java
rename to src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteReport.java
index 56111ec..24f46ce 100644
--- a/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteMojo.java
+++ b/src/main/java/org/apache/maven/dist/tools/site/DistCheckSiteReport.java
@@ -26,7 +26,7 @@ import java.util.Locale;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.dist.tools.AbstractDistCheckMojo;
+import org.apache.maven.dist.tools.AbstractDistCheckReport;
import org.apache.maven.dist.tools.ConfigurationLineInfo;
import org.apache.maven.dist.tools.JsoupRetry;
import org.apache.maven.doxia.sink.Sink;
@@ -44,8 +44,8 @@ import org.jsoup.nodes.Document;
* @author skygo
*/
@Mojo( name = "check-site", requiresProject = false )
-public class DistCheckSiteMojo
- extends AbstractDistCheckMojo
+public class DistCheckSiteReport
+ extends AbstractDistCheckReport
{
public static final String FAILURES_FILENAME = "check-site.log";
diff --git a/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseMojo.java b/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseReport.java
similarity index 99%
rename from src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseMojo.java
rename to src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseReport.java
index 1491e60..7df81e8 100644
--- a/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseMojo.java
+++ b/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseReport.java
@@ -28,7 +28,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Set;
-import org.apache.maven.dist.tools.AbstractDistCheckMojo;
+import org.apache.maven.dist.tools.AbstractDistCheckReport;
import org.apache.maven.dist.tools.ConfigurationLineInfo;
import org.apache.maven.dist.tools.JsoupRetry;
import org.apache.maven.doxia.markup.HtmlMarkup;
@@ -48,8 +48,8 @@ import org.jsoup.select.Elements;
* @author skygo
*/
@Mojo( name = "check-source-release", requiresProject = false )
-public class DistCheckSourceReleaseMojo
- extends AbstractDistCheckMojo
+public class DistCheckSourceReleaseReport
+ extends AbstractDistCheckReport
{
private static final String NOT_IN_DISTRIBUTION_AREA = "_not_in_distribution_area_";
diff --git a/src/test/java/org/apache/maven/dist/tools/source/PatternTest.java b/src/test/java/org/apache/maven/dist/tools/source/PatternTest.java
index b704453..fe9969e 100644
--- a/src/test/java/org/apache/maven/dist/tools/source/PatternTest.java
+++ b/src/test/java/org/apache/maven/dist/tools/source/PatternTest.java
@@ -19,7 +19,7 @@ package org.apache.maven.dist.tools.source;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import org.apache.maven.dist.tools.source.DistCheckSourceReleaseMojo;
+import org.apache.maven.dist.tools.source.DistCheckSourceReleaseReport;
import org.junit.Test;
/**
@@ -35,7 +35,7 @@ public class PatternTest
@Test
public void testGetGroupId()
{
- String q = DistCheckSourceReleaseMojo.getSourceReleasePattern( "doxia" );
+ String q = DistCheckSourceReleaseReport.getSourceReleasePattern( "doxia" );
assertTrue( "doxia-1.4-source-release.zip.asc".matches( q ) );
assertTrue( "doxia-1.4-source-release.zip.md5".matches( q ) );
@@ -44,7 +44,7 @@ public class PatternTest
assertFalse( "doxia-sitetools-1.4-source-release.zip.md5".matches( q ) );
assertFalse( "doxia-sitetools-1.4-source-release.zip".matches( q ) );
- String r = DistCheckSourceReleaseMojo.getSourceReleasePattern( "doxia-sitetools" );
+ String r = DistCheckSourceReleaseReport.getSourceReleasePattern( "doxia-sitetools" );
assertFalse( "doxia-1.4-source-release.zip.asc".matches( r ) );
assertFalse( "doxia-1.4-source-release.zip.md5".matches( r ) );