upgraded maven-reporting-impl to latest
git-svn-id: https://svn.apache.org/repos/asf/maven/sandbox/trunk@1632762 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dist-tools/dist-tool-plugin/pom.xml b/dist-tools/dist-tool-plugin/pom.xml
index de960dc..02ef9ba 100644
--- a/dist-tools/dist-tool-plugin/pom.xml
+++ b/dist-tools/dist-tool-plugin/pom.xml
@@ -77,21 +77,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>2.2</version>
- <exclusions>
- <exclusion>
- <artifactId>maven-artifact</artifactId>
- <groupId>org.apache.maven</groupId>
- </exclusion>
- <exclusion>
- <artifactId>maven-model</artifactId>
- <groupId>org.apache.maven</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xml-apis</artifactId>
- <groupId>xml-apis</groupId>
- </exclusion>
- </exclusions>
+ <version>2.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
diff --git a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
index a884c22..3e7b11c 100644
--- a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
+++ b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
@@ -45,11 +45,8 @@
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -76,24 +73,6 @@
@Parameter( property = "configurationLines", defaultValue = "" )
private List<String> configurationLines;
- /**
- * Site renderer.
- */
- @Component
- protected Renderer siteRenderer;
-
- /**
- * Reporting directory.
- */
- @Parameter( defaultValue = "${project.reporting.outputDirectory}", required = true )
- protected File outputDirectory;
-
- /**
- * Maven project.
- */
- @Parameter( defaultValue = "${project}", readonly = true, required = true )
- protected MavenProject project;
-
@Parameter( defaultValue = "${project.build.directory}/dist-tool" )
protected File failuresDirectory;
@@ -137,24 +116,6 @@
return "dist-tool-" + getFailuresFilename().replace( ".old", "" );
}
- @Override
- protected String getOutputDirectory()
- {
- return outputDirectory.getAbsolutePath();
- }
-
- @Override
- protected Renderer getSiteRenderer()
- {
- return siteRenderer;
- }
-
- @Override
- protected MavenProject getProject()
- {
- return project;
- }
-
private void loadConfiguration()
throws MojoExecutionException
{
diff --git a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java
index a089855..8ab8dfc 100644
--- a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java
+++ b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java
@@ -23,12 +23,8 @@
import java.io.IOException;
import java.util.Locale;
-import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.MavenReportException;
import org.codehaus.plexus.util.FileUtils;
@@ -45,50 +41,14 @@
private static final String EOL = System.getProperty( "line.separator" );
- /**
- * Site renderer.
- */
- @Component
- protected Renderer siteRenderer;
-
- /**
- * Reporting directory.
- */
- @Parameter( defaultValue = "${project.reporting.outputDirectory}", required = true )
- protected File outputDirectory;
-
- /**
- * Maven project.
- */
- @Parameter( defaultValue = "${project}", readonly = true, required = true )
- protected MavenProject project;
-
@Override
boolean isIndexPageCheck()
{
return false;
}
- @Override
- public void execute()
- throws MojoExecutionException
- {
- boolean failure = false;
- // if failures log file is present, throw exception to fail build
- for ( String failuresFilename : FAILURES_FILENAMES )
- {
- failure |= checkFailure( failuresFilename );
- }
-
- if ( failure )
- {
- throw new MojoExecutionException( "Dist tools check reports found inconsistencies in some released "
- + "artifacts, see https://builds.apache.org/job/dist-tool-plugin/site/ for more information" );
- }
- }
-
private boolean checkFailure( String failuresFilename )
- throws MojoExecutionException
+ throws MavenReportException
{
File failureFile = new File( failuresDirectory, failuresFilename );
@@ -103,7 +63,7 @@
}
catch ( IOException ioe )
{
- throw new MojoExecutionException( "Cannot read " + failureFile, ioe );
+ throw new MavenReportException( "Cannot read " + failureFile, ioe );
}
}
@@ -111,17 +71,17 @@
protected void executeReport( Locale locale )
throws MavenReportException
{
- if ( !outputDirectory.exists() )
+ boolean failure = false;
+ // if failures log file is present, throw exception to fail build
+ for ( String failuresFilename : FAILURES_FILENAMES )
{
- outputDirectory.mkdirs();
+ failure |= checkFailure( failuresFilename );
}
- try
+
+ if ( failure )
{
- this.execute();
- }
- catch ( MojoExecutionException ex )
- {
- throw new MavenReportException( ex.getMessage() );
+ throw new MavenReportException( "Dist tools check reports found inconsistencies in some released "
+ + "artifacts, see https://builds.apache.org/job/dist-tool-plugin/site/ for more information" );
}
}
