Author: hboutemy
Date: Tue Jul 16 22:09:05 2013
New Revision: 1503921
URL: http://svn.apache.org/r1503921
Log:
don't require clean to check for failures
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckAggregatorsSiteMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java?rev=1503921&r1=1503920&r2=1503921&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
Tue Jul 16 22:09:05 2013
@@ -86,6 +86,9 @@ public abstract class AbstractDistCheckM
@Component
protected MavenProject project;
+ @Parameter( defaultValue = "${project.build.directory}/dist-tool" )
+ protected File failuresDirectory;
+
/**
* list of artifacts repositories.
*/
@@ -98,9 +101,11 @@ public abstract class AbstractDistCheckM
*/
abstract boolean useDetailed();
- abstract void checkArtifact( ConfigurationLineInfo request, String
repoBase )
+ protected abstract void checkArtifact( ConfigurationLineInfo request,
String repoBase )
throws MojoExecutionException;
+ protected abstract String getFailuresFilename();
+
@Override
protected String getOutputDirectory()
{
@@ -156,6 +161,16 @@ public abstract class AbstractDistCheckM
loadMavenDb();
}
+ File failures = getFailuresFile();
+ if ( failures.exists() )
+ {
+ failures.delete();
+ }
+ else
+ {
+ failuresDirectory.mkdirs();
+ }
+
ConfigurationLineInfo currentGroup = null;
for ( String line : configurationLines )
{
@@ -295,15 +310,19 @@ public abstract class AbstractDistCheckM
{
getLog().error( error );
- try ( PrintWriter output = new PrintWriter(
- new FileWriter( new File( "target", "logs.txt"
).getAbsolutePath(), true ) ) )
+ try ( PrintWriter output = new PrintWriter( new FileWriter(
getFailuresFile(), true ) ) )
{
output.printf( "%s\r\n", error );
}
catch ( Exception e )
{
- getLog().error( "Cannot append to logs.txt" );
+ getLog().error( "Cannot append to " + getFailuresFilename() );
}
}
}
+
+ private File getFailuresFile()
+ {
+ return new File( failuresDirectory, getFailuresFilename() );
+ }
}
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckAggregatorsSiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckAggregatorsSiteMojo.java?rev=1503921&r1=1503920&r2=1503921&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckAggregatorsSiteMojo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckAggregatorsSiteMojo.java
Tue Jul 16 22:09:05 2013
@@ -47,6 +47,7 @@ import org.jsoup.select.Elements;
public class DistCheckAggregatorsSiteMojo
extends AbstractDistCheckMojo
{
+ static final String FAILURES_FILENAME = "check-aggregator.log";
private static final String DIST_AREA =
"http://www.apache.org/dist/maven/";;
//private static final String DIST_SVNPUBSUB =
"https://dist.apache.org/repos/dist/release/maven/";;
@@ -71,6 +72,11 @@ public class DistCheckAggregatorsSiteMoj
@Parameter
protected List<String> ignoreDistFailures;
+ protected String getFailuresFilename()
+ {
+ return FAILURES_FILENAME;
+ }
+
@Override
public String getOutputName()
{
@@ -181,7 +187,6 @@ public class DistCheckAggregatorsSiteMoj
throw new MavenReportException( ex.getMessage(), ex );
}
-
Sink sink = getSink();
sink.head();
sink.title();
@@ -241,9 +246,6 @@ public class DistCheckAggregatorsSiteMoj
sink.close();
}
-
-
-
private void checkAggregate( ConfigurationLineInfo cli ,
DistCheckAggregatorSite r, Object[] inf ) throws IOException
{
@@ -254,7 +256,6 @@ public class DistCheckAggregatorsSiteMoj
for ( Element e : a )
{
// skins do not have release date
-
String art = e.attr( "href" );
if ( art.contains( cli.getArtifactId() ) )
{
@@ -268,16 +269,15 @@ public class DistCheckAggregatorsSiteMoj
throw new IOException( "IOException while reading " + (String)
inf[0] , ioe );
}
}
-
-
+
@Override
- void checkArtifact( ConfigurationLineInfo configLine, String version )
+ protected void checkArtifact( ConfigurationLineInfo configLine, String
version )
throws MojoExecutionException
{
try
{
DistCheckAggregatorSite result = new DistCheckAggregatorSite(
configLine, version );
-
+
if ( configLine.getAggregatedCode() != null )
{
if ( results.get( configLine.getAggregatedCode() ) == null )
@@ -286,10 +286,7 @@ public class DistCheckAggregatorsSiteMoj
}
results.get( configLine.getAggregatedCode() ).add( result );
checkAggregate( configLine, result, HARDCODEDAGGREGATEREF.get(
configLine.getAggregatedCode() ) );
-
-
}
-
}
catch ( IOException ex )
{
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java?rev=1503921&r1=1503920&r2=1503921&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
Tue Jul 16 22:09:05 2013
@@ -61,6 +61,8 @@ import org.openqa.selenium.firefox.Firef
public class DistCheckSiteMojo
extends AbstractDistCheckMojo
{
+ static final String FAILURES_FILENAME = "check-site.log";
+
/**
* Ignore site failure for <code>artifactId</code> or
<code>artifactId:version</code>
*/
@@ -102,6 +104,11 @@ public class DistCheckSiteMojo
{
return false;
}
+ protected String getFailuresFilename()
+ {
+ return FAILURES_FILENAME;
+ }
+
@Override
public String getOutputName()
{
@@ -453,7 +460,7 @@ public class DistCheckSiteMojo
}
@Override
- void checkArtifact( ConfigurationLineInfo configLine, String latestVersion
)
+ protected void checkArtifact( ConfigurationLineInfo configLine, String
latestVersion )
throws MojoExecutionException
{
checkSite( configLine, latestVersion );
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java?rev=1503921&r1=1503920&r2=1503921&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
Tue Jul 16 22:09:05 2013
@@ -48,6 +48,7 @@ import org.jsoup.select.Elements;
public class DistCheckSourceReleaseMojo
extends AbstractDistCheckMojo
{
+ static final String FAILURES_FILENAME = "check-source-release.log";
private static final String DIST_AREA =
"http://www.apache.org/dist/maven/";;
//private static final String DIST_SVNPUBSUB =
"https://dist.apache.org/repos/dist/release/maven/";;
@@ -62,6 +63,11 @@ public class DistCheckSourceReleaseMojo
@Parameter
protected List<String> ignoreDistFailures;
+ protected String getFailuresFilename()
+ {
+ return FAILURES_FILENAME;
+ }
+
@Override
public String getOutputName()
{
@@ -502,7 +508,7 @@ public class DistCheckSourceReleaseMojo
}
@Override
- void checkArtifact( ConfigurationLineInfo configLine, String version )
+ protected void checkArtifact( ConfigurationLineInfo configLine, String
version )
throws MojoExecutionException
{
try
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java?rev=1503921&r1=1503920&r2=1503921&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DummyFailureMojo.java
Tue Jul 16 22:09:05 2013
@@ -21,6 +21,7 @@ package org.apache.maven.dist.tools;
import java.io.File;
import java.util.Locale;
+
import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
@@ -34,8 +35,12 @@ import org.apache.maven.reporting.MavenR
* @author skygo
*/
@Mojo( name = "failure-report", requiresProject = false )
-public class DummyFailureMojo extends AbstractDistCheckMojo
+public class DummyFailureMojo
+ extends AbstractDistCheckMojo
{
+ private final static String[] FAILURES_FILENAMES = {
DistCheckSourceReleaseMojo.FAILURES_FILENAME,
+ DistCheckSiteMojo.FAILURES_FILENAME,
DistCheckAggregatorsSiteMojo.FAILURES_FILENAME };
+
/**
* Site renderer.
*/
@@ -53,24 +58,31 @@ public class DummyFailureMojo extends Ab
*/
@Component
protected MavenProject project;
+
@Override
boolean useDetailed()
{
return false;
}
+
@Override
- public void execute() throws MojoExecutionException
+ public void execute()
+ throws MojoExecutionException
{
- // if logs.txt is present throw exception to fail build
- if ( new File( "target", "logs.txt" ).exists() )
+ // if failures log file is present, throw exception to fail build
+ for ( String failuresFilename : FAILURES_FILENAMES )
{
- throw new MojoExecutionException( "Dist tools report non empty
please check: "
- + " https://builds.apache.org/job/dist-tool-plugin/site/";
);
+ if ( new File( failuresDirectory, failuresFilename ).exists() )
+ {
+ throw new MojoExecutionException( "Dist tools report non empty
please check: "
+ +
"https://builds.apache.org/job/dist-tool-plugin/site/"; );
+ }
}
}
@Override
- protected void executeReport( Locale locale ) throws MavenReportException
+ protected void executeReport( Locale locale )
+ throws MavenReportException
{
if ( !outputDirectory.exists() )
{
@@ -84,7 +96,11 @@ public class DummyFailureMojo extends Ab
{
throw new MavenReportException( ex.getMessage() );
}
+ }
+ protected String getFailuresFilename()
+ {
+ return "dummy";
}
@Override
@@ -106,8 +122,8 @@ public class DummyFailureMojo extends Ab
}
@Override
- void checkArtifact( ConfigurationLineInfo request, String repoBase )
throws MojoExecutionException
+ protected void checkArtifact( ConfigurationLineInfo request, String
repoBase )
+ throws MojoExecutionException
{
}
-
}
