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 2013/11/03 22:08:34 UTC
svn commit: r1538452 - in
/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main:
java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
resources/dist-tool.conf
Author: hboutemy
Date: Sun Nov 3 21:08:33 2013
New Revision: 1538452
URL: http://svn.apache.org/r1538452
Log:
improved handling of artifacts not in distribution area
Modified:
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/resources/dist-tool.conf
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=1538452&r1=1538451&r2=1538452&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 Sun Nov 3 21:08:33 2013
@@ -47,6 +47,8 @@ import org.jsoup.select.Elements;
public class DistCheckSourceReleaseMojo
extends AbstractDistCheckMojo
{
+ private final static String NOT_IN_DISTRIBUTION_AREA = "_not_in_distribution_area_";
+
static final String FAILURES_FILENAME = "check-source-release.log";
@Override
@@ -134,6 +136,10 @@ public class DistCheckSourceReleaseMojo
{
centralMissing++;
}
+ if ( result.dist == null )
+ {
+ return;
+ }
if ( !result.dist.isEmpty() || !result.distOlder.isEmpty() )
{
distError++;
@@ -198,70 +204,64 @@ public class DistCheckSourceReleaseMojo
// dist column
sink.tableCell();
- String directory = cli.getDirectory() + ( cli.isSrcBin() ? ( "/" + csrr.getVersion() + "/source" ) : "" );
- sink.link( distributionAreaUrl + directory );
- sink.text( directory );
- sink.link_();
- sink.text( "source-release" );
- if ( csrr.dist.isEmpty() && csrr.distOlder.isEmpty() )
+ if ( csrr.dist == null )
{
- iconSuccess( sink );
+ sink.text( "not in distribution area" );
}
else
{
- iconWarning( sink );
- }
- StringBuilder cliMissing = new StringBuilder();
- for ( String missing : csrr.dist )
- {
- sink.lineBreak();
- iconError( sink );
- sink.rawText( missing );
- if ( !csrr.central.contains( missing ) )
- {
- // if the release distribution is in central repository, we can get it from there...
- cliMissing.append( "\nwget " ).append( cli.getVersionnedFolderURL( repoBaseUrl, csrr.getVersion() ) ).
- append( "/" ).append( missing );
- cliMissing.append( "\nsvn add " ).append( missing );
+ String directory = cli.getDirectory() + ( cli.isSrcBin() ? ( "/" + csrr.getVersion() + "/source" ) : "" );
+ sink.link( distributionAreaUrl + directory );
+ sink.text( directory );
+ sink.link_();
+ sink.text( "source-release" );
+ if ( csrr.dist.isEmpty() && csrr.distOlder.isEmpty() )
+ {
+ iconSuccess( sink );
+ }
+ else
+ {
+ iconWarning( sink );
+ }
+ StringBuilder cliMissing = new StringBuilder();
+ for ( String missing : csrr.dist )
+ {
+ sink.lineBreak();
+ iconError( sink );
+ sink.rawText( missing );
+ if ( !csrr.central.contains( missing ) )
+ {
+ // if the release distribution is in central repository, we can get it from there...
+ cliMissing.append( "\nwget " ).append( cli.getVersionnedFolderURL( repoBaseUrl, csrr.getVersion() ) ).append( "/" ).append( missing );
+ cliMissing.append( "\nsvn add " ).append( missing );
+ }
+ }
+ if ( !cliMissing.toString().isEmpty() )
+ {
+ sink.lineBreak();
+ SinkEventAttributeSet atts = new SinkEventAttributeSet();
+ sink.unknown( "pre", new Object[] { new Integer( HtmlMarkup.TAG_TYPE_START ) }, atts );
+ sink.text( cliMissing.toString() );
+ sink.unknown( "pre", new Object[] { new Integer( HtmlMarkup.TAG_TYPE_END ) }, null );
+ }
+
+ StringBuilder cliOlder = new StringBuilder();
+ for ( String missing : csrr.distOlder )
+ {
+ sink.lineBreak();
+ iconRemove( sink );
+ sink.rawText( missing );
+ cliOlder.append( "\nsvn rm " ).append( missing );
+ }
+ if ( !cliOlder.toString().isEmpty() )
+ {
+ sink.lineBreak();
+ SinkEventAttributeSet atts = new SinkEventAttributeSet();
+ sink.unknown( "pre", new Object[] { new Integer( HtmlMarkup.TAG_TYPE_START ) }, atts );
+ sink.text( cliOlder.toString() );
+ sink.unknown( "pre", new Object[] { new Integer( HtmlMarkup.TAG_TYPE_END ) }, null );
}
}
- if ( !cliMissing.toString().isEmpty() )
- {
- sink.lineBreak();
- SinkEventAttributeSet atts = new SinkEventAttributeSet();
- sink.unknown( "pre", new Object[]
- {
- new Integer( HtmlMarkup.TAG_TYPE_START )
- }, atts );
- sink.text( cliMissing.toString() );
- sink.unknown( "pre", new Object[]
- {
- new Integer( HtmlMarkup.TAG_TYPE_END )
- }, null );
- }
-
- StringBuilder cliOlder = new StringBuilder();
- for ( String missing : csrr.distOlder )
- {
- sink.lineBreak();
- iconRemove( sink );
- sink.rawText( missing );
- cliOlder.append( "\nsvn rm " ).append( missing );
- }
- if ( !cliOlder.toString().isEmpty() )
- {
- sink.lineBreak();
- SinkEventAttributeSet atts = new SinkEventAttributeSet();
- sink.unknown( "pre", new Object[]
- {
- new Integer( HtmlMarkup.TAG_TYPE_START )
- }, atts );
- sink.text( cliOlder.toString() );
- sink.unknown( "pre", new Object[]
- {
- new Integer( HtmlMarkup.TAG_TYPE_END )
- }, null );
- }
sink.tableCell_();
sink.tableRow_();
@@ -533,6 +533,12 @@ public class DistCheckSourceReleaseMojo
String centralUrl = configLine.getVersionnedFolderURL( repoBaseUrl, version );
result.setMissingCentralSourceRelease( checkDirectoryIndex( centralUrl, configLine, version, false ) );
+ if ( NOT_IN_DISTRIBUTION_AREA.equals( configLine.getDirectory() ) )
+ {
+ // no distribution check
+ return;
+ }
+
// dist
String distUrl =
distributionAreaUrl + configLine.getDirectory() + ( configLine.isSrcBin() ? ( "/" + version + "/source" ) : "" );
Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf?rev=1538452&r1=1538451&r2=1538452&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf Sun Nov 3 21:08:33 2013
@@ -5,6 +5,11 @@
http://www.apache.org/dist/maven/
+/_not_in_distribution_area_: org.apache.maven http://maven.apache.org/pom/
+ maven-parent
+/_not_in_distribution_area_: org.apache http://maven.apache.org/pom/
+ apache
+
/ant-tasks: org.apache.maven src+bin
maven-ant-tasks
@@ -39,11 +44,6 @@ http://www.apache.org/dist/maven/
apache-maven [3.0,3.1.0-alpha-1)
apache-maven
-/notvalid: org.apache.maven http://maven.apache.org/pom/
- * maven-parent
-/notvalid: org.apache http://maven.apache.org/pom/
- * apache
-
/jxr: org.apache.maven.jxr
jxr