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/09 19:17:21 UTC
svn commit: r1540361 - in
/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools:
ConfigurationLineInfo.java DistCheckSourceReleaseMojo.java
Author: hboutemy
Date: Sat Nov 9 18:17:21 2013
New Revision: 1540361
URL: http://svn.apache.org/r1540361
Log:
display source release filename
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java?rev=1540361&r1=1540360&r2=1540361&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java Sat Nov 9 18:17:21 2013
@@ -167,7 +167,7 @@ class ConfigurationLineInfo
}
- String getSourceReleaseFilename( String version, boolean dist )
+ public String getSourceReleaseFilename( String version, boolean dist )
{
return artifactId + "-" + version
+ ( srcBin && ( dist || !"maven-ant-tasks".equals( artifactId ) ) ? "-src" : "-source-release" ) + ".zip";
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=1540361&r1=1540360&r2=1540361&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 Sat Nov 9 18:17:21 2013
@@ -37,6 +37,7 @@ import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
+import org.w3c.dom.css.CSSRule;
/**
* Check presence of source-release.zip in distribution area and central repo
@@ -180,18 +181,17 @@ public class DistCheckSourceReleaseMojo
sink.tableCell();
if ( csrr.dist != null )
{
- 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 ( cli.isSrcBin() )
{
- iconSuccess( sink );
+ String directory = csrr.getVersion() + "/source/";
+ sink.link( distributionAreaUrl + cli.getDirectory() + '/' + directory );
+ sink.text( directory );
+ sink.link_();
}
- else
+ if ( csrr.dist.isEmpty() && csrr.distOlder.isEmpty() )
{
- iconWarning( sink );
+ sink.text( cli.getSourceReleaseFilename( csrr.getVersion(), true ) );
+ iconSuccess( sink );
}
StringBuilder cliMissing = new StringBuilder();
for ( String missing : csrr.dist )