You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/08/27 20:25:11 UTC
svn commit: r1517906 [21/24] - in /maven/plugins/trunk:
maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/
maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/
maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/
maven-antr...
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java Tue Aug 27 18:25:03 2013
@@ -67,9 +67,7 @@ public class DependencyConvergenceReport
// Public methods
// ----------------------------------------------------------------------
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getOutputName()
{
return "dependency-convergence";
@@ -183,7 +181,7 @@ public class DependencyConvergenceReport
sink.tableRow();
- sink.tableCell();
+ sink.tableCell( );
if ( artifactMap.size() > 1 )
{
iconError( sink );
@@ -201,7 +199,7 @@ public class DependencyConvergenceReport
for ( String version : artifactMap.keySet() )
{
sink.tableRow();
- sink.tableCell( new SinkEventAttributeSet( new String[]{ SinkEventAttributes.WIDTH, "25%" } ) );
+ sink.tableCell( new SinkEventAttributeSet( new String[] {SinkEventAttributes.WIDTH, "25%"} ) );
sink.text( version );
sink.tableCell_();
@@ -246,7 +244,7 @@ public class DependencyConvergenceReport
/**
* Produce a Map of relationships between dependencies (its version) and
* reactor projects.
- * <p/>
+ *
* This is the structure of the Map:
* <pre>
* +--------------------+----------------------------------+
@@ -298,7 +296,7 @@ public class DependencyConvergenceReport
sink.tableRow();
- sink.tableCell();
+ sink.tableCell( );
iconSuccess( sink );
sink.tableCell_();
sink.tableCell();
@@ -309,7 +307,7 @@ public class DependencyConvergenceReport
sink.tableRow();
- sink.tableCell();
+ sink.tableCell( );
iconError( sink );
sink.tableCell_();
sink.tableCell();
@@ -352,7 +350,7 @@ public class DependencyConvergenceReport
sink.tableCaption_();
sink.tableRow();
- sink.tableHeaderCell();
+ sink.tableHeaderCell( );
sink.text( getI18nString( locale, "stats.subprojects" ) );
sink.tableHeaderCell_();
sink.tableCell();
@@ -361,7 +359,7 @@ public class DependencyConvergenceReport
sink.tableRow_();
sink.tableRow();
- sink.tableHeaderCell();
+ sink.tableHeaderCell( );
sink.text( getI18nString( locale, "stats.dependencies" ) );
sink.tableHeaderCell_();
sink.tableCell();
@@ -370,7 +368,7 @@ public class DependencyConvergenceReport
sink.tableRow_();
sink.tableRow();
- sink.tableHeaderCell();
+ sink.tableHeaderCell( );
sink.text( getI18nString( locale, "stats.artifacts" ) );
sink.tableHeaderCell_();
sink.tableCell();
@@ -379,7 +377,7 @@ public class DependencyConvergenceReport
sink.tableRow_();
sink.tableRow();
- sink.tableHeaderCell();
+ sink.tableHeaderCell( );
sink.text( getI18nString( locale, "stats.snapshots" ) );
sink.tableHeaderCell_();
sink.tableCell();
@@ -388,7 +386,7 @@ public class DependencyConvergenceReport
sink.tableRow_();
sink.tableRow();
- sink.tableHeaderCell();
+ sink.tableHeaderCell( );
sink.text( getI18nString( locale, "stats.convergence" ) );
sink.tableHeaderCell_();
sink.tableCell();
@@ -408,7 +406,7 @@ public class DependencyConvergenceReport
sink.tableRow_();
sink.tableRow();
- sink.tableHeaderCell();
+ sink.tableHeaderCell( );
sink.text( getI18nString( locale, "stats.readyrelease" ) );
sink.tableHeaderCell_();
sink.tableCell();
@@ -483,8 +481,8 @@ public class DependencyConvergenceReport
{
for ( MavenProject mavenProject : reactorProjects )
{
- if ( mavenProject.getGroupId().equals( dependency.getGroupId() ) && mavenProject.getArtifactId().equals(
- dependency.getArtifactId() ) )
+ if ( mavenProject.getGroupId().equals( dependency.getGroupId() )
+ && mavenProject.getArtifactId().equals( dependency.getArtifactId() ) )
{
if ( getLog().isDebugEnabled() )
{
@@ -519,7 +517,7 @@ public class DependencyConvergenceReport
/**
* Produce a Map of relationships between dependencies
* (its groupId:artifactId) and reactor projects.
- * <p/>
+ *
* This is the structure of the Map:
* <pre>
* +--------------------+----------------------------------+
@@ -541,16 +539,14 @@ public class DependencyConvergenceReport
for ( MavenProject reactorProject : reactorProjects )
{
- for ( Dependency dep : (Iterable<Dependency>) reactorProject.getDependencies() )
- {
+ for (Dependency dep : (Iterable<Dependency>) reactorProject.getDependencies()) {
String key = dep.getGroupId() + ":" + dep.getArtifactId();
- List<ReverseDependencyLink> depList = dependencyMap.get( key );
- if ( depList == null )
- {
+ List<ReverseDependencyLink> depList = dependencyMap.get(key);
+ if (depList == null) {
depList = new ArrayList<ReverseDependencyLink>();
}
- depList.add( new ReverseDependencyLink( dep, reactorProject ) );
- dependencyMap.put( key, depList );
+ depList.add(new ReverseDependencyLink(dep, reactorProject));
+ dependencyMap.put(key, depList);
}
}
@@ -595,9 +591,7 @@ public class DependencyConvergenceReport
static class ReverseDependencyLinkComparator
implements Comparator<ReverseDependencyLink>
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public int compare( ReverseDependencyLink p1, ReverseDependencyLink p2 )
{
return p1.getProject().getId().compareTo( p2.getProject().getId() );
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java Tue Aug 27 18:25:03 2013
@@ -121,8 +121,8 @@ public class LicenseReport
return true;
}
- if ( licenseUrl != null && ( licenseUrl.getProtocol().equals( "http" ) || licenseUrl.getProtocol().equals(
- "https" ) ) )
+ if ( licenseUrl != null
+ && ( licenseUrl.getProtocol().equals( "http" ) || licenseUrl.getProtocol().equals( "https" ) ) )
{
linkOnly = true;
return true;
@@ -344,8 +344,8 @@ public class LicenseReport
int bodyStart = licenseContentLC.indexOf( "<body" );
int bodyEnd = licenseContentLC.indexOf( "</body>" );
- if ( ( licenseContentLC.contains( "<!doctype html" ) || licenseContentLC.contains( "<html>" ) ) && (
- ( bodyStart >= 0 ) && ( bodyEnd > bodyStart ) ) )
+ if ( ( licenseContentLC.contains( "<!doctype html" ) || licenseContentLC.contains( "<html>" ) )
+ && ( ( bodyStart >= 0 ) && ( bodyEnd > bodyStart ) ) )
{
bodyStart = licenseContentLC.indexOf( ">", bodyStart ) + 1;
String body = licenseContent.substring( bodyStart, bodyEnd );
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java Tue Aug 27 18:25:03 2013
@@ -140,7 +140,7 @@ public class MailingListsReport
if ( StringUtils.isNotBlank( introduction ) )
{
log.warn( "Since 2.3, the <introduction/> parameter is deprecated. Please use a <customBundle/>"
- + " parameter to configure a custom bundle." );
+ + " parameter to configure a custom bundle." );
paragraph( introduction );
}
else
@@ -214,7 +214,7 @@ public class MailingListsReport
textRow.add( createLinkPatternedText( getArchiveServer( otherArchive ), otherArchive ) );
- tableRow( textRow.toArray( new String[textRow.size()] ) );
+ tableRow(textRow.toArray(new String[textRow.size()]));
// Other lines...
while ( it.hasNext() )
@@ -241,7 +241,7 @@ public class MailingListsReport
textRow.add( createLinkPatternedText( getArchiveServer( otherArchive ), otherArchive ) );
- tableRow( textRow.toArray( new String[textRow.size()] ) );
+ tableRow(textRow.toArray(new String[textRow.size()]));
}
}
else
@@ -251,7 +251,7 @@ public class MailingListsReport
textRow.add( null );
}
- tableRow( textRow.toArray( new String[textRow.size()] ) );
+ tableRow(textRow.toArray(new String[textRow.size()]));
}
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java Tue Aug 27 18:25:03 2013
@@ -111,9 +111,7 @@ public class ScmReport
r.render();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getOutputName()
{
return "source-repository";
@@ -328,28 +326,29 @@ public class ScmReport
if ( anonymousRepository != null && isScmSystem( anonymousRepository, "cvs" ) )
{
- CvsScmProviderRepository cvsRepo =
- (CvsScmProviderRepository) anonymousRepository.getProviderRepository();
+ CvsScmProviderRepository cvsRepo = (CvsScmProviderRepository) anonymousRepository
+ .getProviderRepository();
anonymousAccessCVS( cvsRepo );
}
else if ( anonymousRepository != null && isScmSystem( anonymousRepository, "git" ) )
{
- GitScmProviderRepository gitRepo =
- (GitScmProviderRepository) anonymousRepository.getProviderRepository();
+ GitScmProviderRepository gitRepo = (GitScmProviderRepository) anonymousRepository
+ .getProviderRepository();
anonymousAccessGit( gitRepo );
}
else if ( anonymousRepository != null && isScmSystem( anonymousRepository, "hg" ) )
{
- HgScmProviderRepository hgRepo = (HgScmProviderRepository) anonymousRepository.getProviderRepository();
+ HgScmProviderRepository hgRepo = (HgScmProviderRepository) anonymousRepository
+ .getProviderRepository();
anonymousAccessMercurial( hgRepo );
}
else if ( anonymousRepository != null && isScmSystem( anonymousRepository, "svn" ) )
{
- SvnScmProviderRepository svnRepo =
- (SvnScmProviderRepository) anonymousRepository.getProviderRepository();
+ SvnScmProviderRepository svnRepo = (SvnScmProviderRepository) anonymousRepository
+ .getProviderRepository();
anonymousAccessSVN( svnRepo );
}
@@ -401,15 +400,15 @@ public class ScmReport
}
else if ( devRepository != null && isScmSystem( devRepository, "perforce" ) )
{
- PerforceScmProviderRepository perforceRepo =
- (PerforceScmProviderRepository) devRepository.getProviderRepository();
+ PerforceScmProviderRepository perforceRepo = (PerforceScmProviderRepository) devRepository
+ .getProviderRepository();
developerAccessPerforce( perforceRepo );
}
else if ( devRepository != null && isScmSystem( devRepository, "starteam" ) )
{
- StarteamScmProviderRepository starteamRepo =
- (StarteamScmProviderRepository) devRepository.getProviderRepository();
+ StarteamScmProviderRepository starteamRepo = (StarteamScmProviderRepository) devRepository
+ .getProviderRepository();
developerAccessStarteam( starteamRepo );
}
@@ -444,7 +443,7 @@ public class ScmReport
paragraph( getI18nString( "accessbehindfirewall.svn.intro" ) );
- verbatimText( "$ svn checkout " + svnRepo.getUrl() + " " + checkoutDirectoryName );
+ verbatimText("$ svn checkout " + svnRepo.getUrl() + " " + checkoutDirectoryName);
}
else if ( devRepository != null && isScmSystem( devRepository, "cvs" ) )
{
@@ -462,7 +461,7 @@ public class ScmReport
* Render the access from behind a firewall section
*
* @param anonymousRepository the anonymous repository
- * @param devRepository the dev repository
+ * @param devRepository the dev repository
*/
private void renderAccessThroughProxySection( ScmRepository anonymousRepository, ScmRepository devRepository )
{
@@ -474,9 +473,7 @@ public class ScmReport
paragraph( getI18nString( "accessthroughtproxy.svn.intro2" ) );
paragraph( getI18nString( "accessthroughtproxy.svn.intro3" ) );
- verbatimText( "[global]" + SystemUtils.LINE_SEPARATOR + "http-proxy-host = your.proxy.name"
- + SystemUtils.LINE_SEPARATOR + "http-proxy-port = 3128"
- + SystemUtils.LINE_SEPARATOR );
+ verbatimText("[global]" + SystemUtils.LINE_SEPARATOR + "http-proxy-host = your.proxy.name" + SystemUtils.LINE_SEPARATOR + "http-proxy-port = 3128" + SystemUtils.LINE_SEPARATOR);
endSection();
}
@@ -493,7 +490,7 @@ public class ScmReport
{
paragraph( getI18nString( "devaccess.clearcase.intro" ) );
- verbatimText( "$ cleartool checkout " );
+ verbatimText("$ cleartool checkout ");
}
// CVS
@@ -511,8 +508,7 @@ public class ScmReport
{
paragraph( getI18nString( "anonymousaccess.cvs.intro" ) );
- verbatimText( "$ cvs -d " + cvsRepo.getCvsRoot() + " login" + SystemUtils.LINE_SEPARATOR + "$ cvs -z3 -d "
- + cvsRepo.getCvsRoot() + " co " + cvsRepo.getModule() );
+ verbatimText("$ cvs -d " + cvsRepo.getCvsRoot() + " login" + SystemUtils.LINE_SEPARATOR + "$ cvs -z3 -d " + cvsRepo.getCvsRoot() + " co " + cvsRepo.getModule());
}
// Git
@@ -530,7 +526,7 @@ public class ScmReport
linkPatternedText( getI18nString( "anonymousaccess.git.intro" ) );
sink.paragraph_();
- verbatimText( "$ git clone " + gitRepo.getFetchUrl() );
+ verbatimText("$ git clone " + gitRepo.getFetchUrl());
}
// Mercurial
@@ -548,7 +544,7 @@ public class ScmReport
linkPatternedText( getI18nString( "anonymousaccess.hg.intro" ) );
sink.paragraph_();
- verbatimText( "$ hg clone " + hgRepo.getURI() );
+ verbatimText("$ hg clone " + hgRepo.getURI());
}
/**
@@ -567,9 +563,7 @@ public class ScmReport
// Safety: remove the username if present
String cvsRoot = StringUtils.replace( cvsRepo.getCvsRoot(), cvsRepo.getUser(), "username" );
- verbatimText(
- "$ cvs -d " + cvsRoot + " login" + SystemUtils.LINE_SEPARATOR + "$ cvs -z3 -d " + cvsRoot + " co "
- + cvsRepo.getModule() );
+ verbatimText("$ cvs -d " + cvsRoot + " login" + SystemUtils.LINE_SEPARATOR + "$ cvs -z3 -d " + cvsRoot + " co " + cvsRepo.getModule());
}
// Git
@@ -587,7 +581,7 @@ public class ScmReport
linkPatternedText( getI18nString( "devaccess.git.intro" ) );
sink.paragraph_();
- verbatimText( "$ git clone " + gitRepo.getPushUrl() );
+ verbatimText("$ git clone " + gitRepo.getPushUrl());
}
// Mercurial
@@ -605,7 +599,7 @@ public class ScmReport
linkPatternedText( getI18nString( "devaccess.hg.intro" ) );
sink.paragraph_();
- verbatimText( "$ hg clone " + hgRepo.getURI() );
+ verbatimText("$ hg clone " + hgRepo.getURI());
}
// Perforce
@@ -688,7 +682,7 @@ public class ScmReport
{
paragraph( getI18nString( "anonymousaccess.svn.intro" ) );
- verbatimText( "$ svn checkout " + svnRepo.getUrl() + " " + checkoutDirectoryName );
+ verbatimText("$ svn checkout " + svnRepo.getUrl() + " " + checkoutDirectoryName);
}
/**
@@ -775,8 +769,7 @@ public class ScmReport
if ( !isIntroAdded )
{
- sb.append( "This SCM url '" ).append( scmUrl ).append(
- "' is invalid due to the following errors:" );
+ sb.append("This SCM url '").append(scmUrl).append("' is invalid due to the following errors:");
sb.append( SystemUtils.LINE_SEPARATOR );
isIntroAdded = true;
}
@@ -788,7 +781,7 @@ public class ScmReport
if ( StringUtils.isNotEmpty( sb.toString() ) )
{
sb.append( "For more information about SCM URL Format, please refer to: "
- + "http://maven.apache.org/scm/scm-url-format.html" );
+ + "http://maven.apache.org/scm/scm-url-format.html" );
throw new IllegalArgumentException( sb.toString() );
}
@@ -831,7 +824,7 @@ public class ScmReport
* </p>
*
* @param scmRepository a SCM repository
- * @param scmProvider a SCM provider name
+ * @param scmProvider a SCM provider name
* @return true if the provider of the given SCM repository is equal to the given scm provider.
* @see <a href="http://svn.apache.org/repos/asf/maven/scm/trunk/maven-scm-providers/">maven-scm-providers</a>
*/
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java Tue Aug 27 18:25:03 2013
@@ -28,7 +28,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.TimeZone;
-
import org.apache.commons.lang.SystemUtils;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.model.Contributor;
@@ -262,7 +261,7 @@ public class TeamListReport
{
picUrl = getGravatarUrl( member.getEmail() );
}
- if ( StringUtils.isEmpty( picUrl ) )
+ if (StringUtils.isEmpty( picUrl ))
{
picUrl = getSpacerGravatarUrl();
}
@@ -315,7 +314,7 @@ public class TeamListReport
{
// Comma separated roles
List<String> var = member.getRoles();
- tableCell( StringUtils.join( var.toArray( new String[var.size()] ), ", " ) );
+ tableCell( StringUtils.join(var.toArray(new String[var.size()]), ", " ) );
}
else
{
@@ -467,12 +466,12 @@ public class TeamListReport
String timeZone = getI18nString( "contributors.timezone" );
String actualTime = getI18nString( "contributors.actualtime" );
String properties = getI18nString( "contributors.properties" );
- if ( requiredHeaders.get( IMAGE ) == Boolean.TRUE && showAvatarImages )
+ if ( requiredHeaders.get( IMAGE ) == Boolean.TRUE && showAvatarImages)
{
requiredArray.add( image );
}
- setRequiredArray( requiredHeaders, requiredArray, image, name, email, url, organization, organizationUrl,
- roles, timeZone, actualTime, properties );
+ setRequiredArray( requiredHeaders, requiredArray, image, name, email, url, organization, organizationUrl, roles,
+ timeZone, actualTime, properties );
return requiredArray.toArray( new String[requiredArray.size()] );
}
@@ -497,7 +496,7 @@ public class TeamListReport
String actualTime = getI18nString( "developers.actualtime" );
String properties = getI18nString( "developers.properties" );
- if ( requiredHeaders.get( IMAGE ) == Boolean.TRUE && showAvatarImages )
+ if ( requiredHeaders.get( IMAGE ) == Boolean.TRUE && showAvatarImages)
{
requiredArray.add( image );
}
@@ -506,8 +505,8 @@ public class TeamListReport
requiredArray.add( id );
}
- setRequiredArray( requiredHeaders, requiredArray, image, name, email, url, organization, organizationUrl,
- roles, timeZone, actualTime, properties );
+ setRequiredArray( requiredHeaders, requiredArray, image, name, email, url, organization, organizationUrl, roles,
+ timeZone, actualTime, properties );
return requiredArray.toArray( new String[requiredArray.size()] );
}
@@ -527,9 +526,8 @@ public class TeamListReport
* @param properties
*/
private void setRequiredArray( Map<String, Boolean> requiredHeaders, List<String> requiredArray, String image,
- String name, String email, String url, String organization,
- String organizationUrl, String roles, String timeZone, String actualTime,
- String properties )
+ String name, String email, String url, String organization, String organizationUrl,
+ String roles, String timeZone, String actualTime, String properties )
{
if ( requiredHeaders.get( NAME ) == Boolean.TRUE )
{
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java Tue Aug 27 18:25:03 2013
@@ -73,19 +73,13 @@ import org.codehaus.plexus.util.StringUt
public class DependenciesRenderer
extends AbstractProjectInfoRenderer
{
- /**
- * URL for the 'icon_info_sml.gif' image
- */
+ /** URL for the 'icon_info_sml.gif' image */
private static final String IMG_INFO_URL = "./images/icon_info_sml.gif";
- /**
- * URL for the 'close.gif' image
- */
+ /** URL for the 'close.gif' image */
private static final String IMG_CLOSE_URL = "./images/close.gif";
- /**
- * Used to format decimal values in the "Dependency File Details" table
- */
+ /** Used to format decimal values in the "Dependency File Details" table */
protected static final DecimalFormat DEFAULT_DECIMAL_FORMAT = new DecimalFormat( "#,##0" );
private static final Set<String> JAR_SUBTYPE;
@@ -107,9 +101,7 @@ public class DependenciesRenderer
private final RepositoryUtils repoUtils;
- /**
- * Used to format file length values
- */
+ /** Used to format file length values */
private final DecimalFormat fileLengthDecimalFormat;
/**
@@ -117,9 +109,7 @@ public class DependenciesRenderer
*/
private int section;
- /**
- * Counter for unique IDs that is consistent across generations.
- */
+ /** Counter for unique IDs that is consistent across generations. */
private int idCounter = 0;
/**
@@ -133,7 +123,8 @@ public class DependenciesRenderer
public Object put( String key, Object value )
{
// handle multiple values as a set to avoid duplicates
- @SuppressWarnings( "unchecked" ) SortedSet<Object> valueList = (SortedSet<Object>) get( key );
+ @SuppressWarnings( "unchecked" )
+ SortedSet<Object> valueList = (SortedSet<Object>) get( key );
if ( valueList == null )
{
valueList = new TreeSet<Object>();
@@ -163,18 +154,7 @@ public class DependenciesRenderer
jarSubtype.add( "ejb" );
JAR_SUBTYPE = Collections.unmodifiableSet( jarSubtype );
- JAVASCRIPT = "<script language=\"javascript\" type=\"text/javascript\">" + SystemUtils.LINE_SEPARATOR
- + " function toggleDependencyDetail( divId, imgId )" + SystemUtils.LINE_SEPARATOR + " {"
- + SystemUtils.LINE_SEPARATOR + " var div = document.getElementById( divId );"
- + SystemUtils.LINE_SEPARATOR + " var img = document.getElementById( imgId );"
- + SystemUtils.LINE_SEPARATOR + " if( div.style.display == '' )" + SystemUtils.LINE_SEPARATOR
- + " {" + SystemUtils.LINE_SEPARATOR + " div.style.display = 'none';"
- + SystemUtils.LINE_SEPARATOR + " img.src='" + IMG_INFO_URL + "';" + SystemUtils.LINE_SEPARATOR
- + " }" + SystemUtils.LINE_SEPARATOR + " else" + SystemUtils.LINE_SEPARATOR + " {"
- + SystemUtils.LINE_SEPARATOR + " div.style.display = '';" + SystemUtils.LINE_SEPARATOR
- + " img.src='" + IMG_CLOSE_URL + "';" + SystemUtils.LINE_SEPARATOR + " }"
- + SystemUtils.LINE_SEPARATOR + " }" + SystemUtils.LINE_SEPARATOR + "</script>"
- + SystemUtils.LINE_SEPARATOR;
+ JAVASCRIPT = "<script language=\"javascript\" type=\"text/javascript\">" + SystemUtils.LINE_SEPARATOR + " function toggleDependencyDetail( divId, imgId )" + SystemUtils.LINE_SEPARATOR + " {" + SystemUtils.LINE_SEPARATOR + " var div = document.getElementById( divId );" + SystemUtils.LINE_SEPARATOR + " var img = document.getElementById( imgId );" + SystemUtils.LINE_SEPARATOR + " if( div.style.display == '' )" + SystemUtils.LINE_SEPARATOR + " {" + SystemUtils.LINE_SEPARATOR + " div.style.display = 'none';" + SystemUtils.LINE_SEPARATOR + " img.src='" + IMG_INFO_URL + "';" + SystemUtils.LINE_SEPARATOR + " }" + SystemUtils.LINE_SEPARATOR + " else" + SystemUtils.LINE_SEPARATOR + " {" + SystemUtils.LINE_SEPARATOR + " div.style.display = '';" + SystemUtils.LINE_SEPARATOR + " img.src='" + IMG_CLOSE_URL + "';" + SystemUtils.LINE_SEPARATOR + " }" + SystemUtils.LINE_SEPARATOR + " }"
+ SystemUtils.LINE_SEPARATOR + "</script>" + SystemUtils.LINE_SEPARATOR;
}
/**
@@ -276,9 +256,7 @@ public class DependenciesRenderer
// Protected methods
// ----------------------------------------------------------------------
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
// workaround for MPIR-140
// TODO Remove me when maven-reporting-impl:2.1-SNAPSHOT is out
protected void startSection( String name )
@@ -290,7 +268,7 @@ public class DependenciesRenderer
* Start section with a name and a specific anchor.
*
* @param anchor not null
- * @param name not null
+ * @param name not null
*/
protected void startSection( String anchor, String name )
{
@@ -353,9 +331,7 @@ public class DependenciesRenderer
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
// workaround for MPIR-140
// TODO Remove me when maven-reporting-impl:2.1-SNAPSHOT is out
protected void endSection()
@@ -397,7 +373,7 @@ public class DependenciesRenderer
/**
* @param withClassifier <code>true</code> to include the classifier column, <code>false</code> otherwise.
- * @param withOptional <code>true</code> to include the optional column, <code>false</code> otherwise.
+ * @param withOptional <code>true</code> to include the optional column, <code>false</code> otherwise.
* @return the dependency table header with/without classifier/optional column
* @see #renderArtifactRow(Artifact, boolean, boolean)
*/
@@ -415,18 +391,18 @@ public class DependenciesRenderer
{
if ( withOptional )
{
- return new String[]{ groupId, artifactId, version, classifier, type, license, optional };
+ return new String[] { groupId, artifactId, version, classifier, type, license, optional };
}
- return new String[]{ groupId, artifactId, version, classifier, type, license };
+ return new String[] { groupId, artifactId, version, classifier, type, license };
}
if ( withOptional )
{
- return new String[]{ groupId, artifactId, version, type, license, optional };
+ return new String[] { groupId, artifactId, version, type, license, optional };
}
- return new String[]{ groupId, artifactId, version, type, license };
+ return new String[] { groupId, artifactId, version, type, license };
}
private void renderSectionProjectDependencies()
@@ -443,7 +419,7 @@ public class DependenciesRenderer
/**
* @param dependenciesByScope map with supported scopes as key and a list of <code>Artifact</code> as values.
- * @param isTransitive <code>true</code> if it is transitive dependencies rendering.
+ * @param isTransitive <code>true</code> if it is transitive dependencies rendering.
* @see Artifact#SCOPE_COMPILE
* @see Artifact#SCOPE_PROVIDED
* @see Artifact#SCOPE_RUNTIME
@@ -524,8 +500,9 @@ public class DependenciesRenderer
String debug = getI18nString( "file.details.column.debug" );
String sealed = getI18nString( "file.details.column.sealed" );
- int[] justification = new int[]{ Sink.JUSTIFY_LEFT, Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_RIGHT,
- Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_CENTER, Sink.JUSTIFY_CENTER, Sink.JUSTIFY_CENTER };
+ int[] justification =
+ new int[] { Sink.JUSTIFY_LEFT, Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_RIGHT,
+ Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_CENTER, Sink.JUSTIFY_CENTER, Sink.JUSTIFY_CENTER };
startTable( justification, false );
@@ -544,11 +521,11 @@ public class DependenciesRenderer
String[] tableHeader;
if ( hasSealed )
{
- tableHeader = new String[]{ filename, size, entries, classes, packages, jdkrev, debug, sealed };
+ tableHeader = new String[] { filename, size, entries, classes, packages, jdkrev, debug, sealed };
}
else
{
- tableHeader = new String[]{ filename, size, entries, classes, packages, jdkrev, debug };
+ tableHeader = new String[] { filename, size, entries, classes, packages, jdkrev, debug };
}
tableHeader( tableHeader );
@@ -612,11 +589,12 @@ public class DependenciesRenderer
fileLength = "-";
}
- tableRow( hasSealed, new String[]{ name, fileLength,
- DEFAULT_DECIMAL_FORMAT.format( jarDetails.getNumEntries() ),
- DEFAULT_DECIMAL_FORMAT.format( jarDetails.getNumClasses() ),
- DEFAULT_DECIMAL_FORMAT.format( jarDetails.getNumPackages() ), jarDetails.getJdkRevision(),
- debugstr, sealedstr } );
+ tableRow( hasSealed,
+ new String[] { name, fileLength,
+ DEFAULT_DECIMAL_FORMAT.format( jarDetails.getNumEntries() ),
+ DEFAULT_DECIMAL_FORMAT.format( jarDetails.getNumClasses() ),
+ DEFAULT_DECIMAL_FORMAT.format( jarDetails.getNumPackages() ),
+ jarDetails.getJdkRevision(), debugstr, sealedstr } );
}
catch ( IOException e )
{
@@ -626,8 +604,8 @@ public class DependenciesRenderer
else
{
tableRow( hasSealed,
- new String[]{ artifactFile.getName(), fileLengthDecimalFormat.format( artifactFile.length() ),
- "", "", "", "", "", "" } );
+ new String[] { artifactFile.getName(),
+ fileLengthDecimalFormat.format( artifactFile.length() ), "", "", "", "", "", "" } );
}
}
@@ -642,10 +620,11 @@ public class DependenciesRenderer
{
if ( totaldeps.getTotal( i ) > 0 )
{
- tableRow( hasSealed, new String[]{ totaldeps.getTotalString( i ), totaldepsize.getTotalString( i ),
- totalentries.getTotalString( i ), totalclasses.getTotalString( i ),
- totalpackages.getTotalString( i ), ( i < 0 ) ? String.valueOf( highestjdk ) : "",
- totaldebug.getTotalString( i ), totalsealed.getTotalString( i ) } );
+ tableRow( hasSealed,
+ new String[] { totaldeps.getTotalString( i ), totaldepsize.getTotalString( i ),
+ totalentries.getTotalString( i ), totalclasses.getTotalString( i ),
+ totalpackages.getTotalString( i ), ( i < 0 ) ? String.valueOf( highestjdk ) : "",
+ totaldebug.getTotalString( i ), totalsealed.getTotalString( i ) } );
}
}
@@ -669,9 +648,8 @@ public class DependenciesRenderer
private void createExceptionInfoTableRow( Artifact artifact, File artifactFile, Exception e, boolean hasSealed )
{
- tableRow( hasSealed,
- new String[]{ artifact.getId(), artifactFile.getAbsolutePath(), e.getMessage(), "", "", "", "",
- "" } );
+ tableRow( hasSealed, new String[] { artifact.getId(), artifactFile.getAbsolutePath(), e.getMessage(), "", "",
+ "", "", "" } );
}
private void populateRepositoryMap( Map<String, ArtifactRepository> repos, List<ArtifactRepository> rowRepos )
@@ -704,8 +682,8 @@ public class DependenciesRenderer
URL repoUrl = new URL( repo.getUrl() );
if ( ProjectInfoReportUtils.getContent( repoUrl, settings ) == null )
{
- log.warn( "The repository url '" + repoUrl + "' has no stream - Repository '" + repo.getId()
- + "' will be blacklisted." );
+ log.warn( "The repository url '" + repoUrl + "' has no stream - Repository '"
+ + repo.getId() + "' will be blacklisted." );
repo.setBlacklisted( true );
repoUrlBlackListed.add( repo.getUrl() );
}
@@ -713,7 +691,7 @@ public class DependenciesRenderer
catch ( IOException e )
{
log.warn( "The repository url '" + repo.getUrl() + "' is invalid - Repository '" + repo.getId()
- + "' will be blacklisted." );
+ + "' will be blacklisted." );
repo.setBlacklisted( true );
repoUrlBlackListed.add( repo.getUrl() );
}
@@ -780,9 +758,9 @@ public class DependenciesRenderer
// can't use straight artifact comparison because we want optional last
Collections.sort( artifacts, getArtifactComparator() );
- String anchorByScope = ( isTransitive
- ? getI18nString( "transitive.title" ) + "_" + scope
- : getI18nString( "title" ) + "_" + scope );
+ String anchorByScope =
+ ( isTransitive ? getI18nString( "transitive.title" ) + "_" + scope : getI18nString( "title" ) + "_"
+ + scope );
startSection( anchorByScope, scope );
paragraph( getI18nString( "intro." + scope ) );
@@ -823,9 +801,9 @@ public class DependenciesRenderer
}
/**
- * @param artifact not null
+ * @param artifact not null
* @param withClassifier <code>true</code> to include the classifier column, <code>false</code> otherwise.
- * @param withOptional <code>true</code> to include the optional column, <code>false</code> otherwise.
+ * @param withOptional <code>true</code> to include the optional column, <code>false</code> otherwise.
* @see #getDependencyTableHeader(boolean, boolean)
*/
private void renderArtifactRow( Artifact artifact, boolean withClassifier, boolean withOptional )
@@ -843,7 +821,8 @@ public class DependenciesRenderer
try
{
artifactProject = repoUtils.getMavenProjectFromRepository( artifact );
- @SuppressWarnings( "unchecked" ) List<License> licenses = artifactProject.getLicenses();
+ @SuppressWarnings( "unchecked" )
+ List<License> licenses = artifactProject.getLicenses();
for ( License license : licenses )
{
sb.append( ProjectInfoReportUtils.getArtifactIdCell( license.getName(), license.getUrl() ) );
@@ -858,13 +837,14 @@ public class DependenciesRenderer
if ( withClassifier )
{
content =
- new String[]{ artifact.getGroupId(), artifactIdCell, artifact.getVersion(), artifact.getClassifier(),
+ new String[] { artifact.getGroupId(), artifactIdCell, artifact.getVersion(), artifact.getClassifier(),
artifact.getType(), sb.toString(), isOptional };
}
else
{
- content = new String[]{ artifact.getGroupId(), artifactIdCell, artifact.getVersion(), artifact.getType(),
- sb.toString(), isOptional };
+ content =
+ new String[] { artifact.getGroupId(), artifactIdCell, artifact.getVersion(), artifact.getType(),
+ sb.toString(), isOptional };
}
tableRow( withOptional, content );
@@ -881,8 +861,8 @@ public class DependenciesRenderer
sink.text( id + ( StringUtils.isNotEmpty( artifact.getScope() ) ? " (" + artifact.getScope() + ") " : " " ) );
sink.rawText( "<img id=\"" + imgId + "\" src=\"" + IMG_INFO_URL
- + "\" alt=\"Information\" onclick=\"toggleDependencyDetail( '" + dependencyDetailId + "', '"
- + imgId + "' );\" style=\"cursor: pointer;vertical-align:text-bottom;\"></img>" );
+ + "\" alt=\"Information\" onclick=\"toggleDependencyDetail( '" + dependencyDetailId + "', '" + imgId
+ + "' );\" style=\"cursor: pointer;vertical-align:text-bottom;\"></img>" );
printDescriptionsAndURLs( node, dependencyDetailId );
@@ -931,7 +911,8 @@ public class DependenciesRenderer
String artifactDescription = artifactProject.getDescription();
String artifactUrl = artifactProject.getUrl();
String artifactName = artifactProject.getName();
- @SuppressWarnings( "unchecked" ) List<License> licenses = artifactProject.getLicenses();
+ @SuppressWarnings( "unchecked" )
+ List<License> licenses = artifactProject.getLicenses();
sink.tableRow();
sink.tableHeaderCell();
@@ -1068,7 +1049,8 @@ public class DependenciesRenderer
sink.text( ": " );
sink.bold_();
- @SuppressWarnings( "unchecked" ) SortedSet<String> projects = (SortedSet<String>) entry.getValue();
+ @SuppressWarnings( "unchecked" )
+ SortedSet<String> projects = (SortedSet<String>) entry.getValue();
for ( Iterator<String> iterator = projects.iterator(); iterator.hasNext(); )
{
@@ -1105,15 +1087,15 @@ public class DependenciesRenderer
int[] justificationRepo;
if ( repoUrlBlackListed.isEmpty() )
{
- tableHeader = new String[]{ repoid, url, release, snapshot };
+ tableHeader = new String[] { repoid, url, release, snapshot };
justificationRepo =
- new int[]{ Sink.JUSTIFY_LEFT, Sink.JUSTIFY_LEFT, Sink.JUSTIFY_CENTER, Sink.JUSTIFY_CENTER };
+ new int[] { Sink.JUSTIFY_LEFT, Sink.JUSTIFY_LEFT, Sink.JUSTIFY_CENTER, Sink.JUSTIFY_CENTER };
}
else
{
- tableHeader = new String[]{ repoid, url, release, snapshot, blacklisted };
+ tableHeader = new String[] { repoid, url, release, snapshot, blacklisted };
justificationRepo =
- new int[]{ Sink.JUSTIFY_LEFT, Sink.JUSTIFY_LEFT, Sink.JUSTIFY_CENTER, Sink.JUSTIFY_CENTER,
+ new int[] { Sink.JUSTIFY_LEFT, Sink.JUSTIFY_LEFT, Sink.JUSTIFY_CENTER, Sink.JUSTIFY_CENTER,
Sink.JUSTIFY_CENTER };
}
@@ -1196,7 +1178,8 @@ public class DependenciesRenderer
{
try
{
- @SuppressWarnings( "unchecked" ) List<ArtifactRepository> mirroredRepos =
+ @SuppressWarnings( "unchecked" )
+ List<ArtifactRepository> mirroredRepos =
(List<ArtifactRepository>) invoke( repo, "getMirroredRepositories" );
if ( ( mirroredRepos != null ) && ( !mirroredRepos.isEmpty() ) )
@@ -1281,7 +1264,8 @@ public class DependenciesRenderer
if ( Artifact.SCOPE_SYSTEM.equals( dependency.getScope() ) )
{
- for ( @SuppressWarnings( "unused" ) String repoId : repoIdList )
+ for ( @SuppressWarnings( "unused" )
+ String repoId : repoIdList )
{
tableCell( "-" );
}
@@ -1303,8 +1287,8 @@ public class DependenciesRenderer
boolean dependencyExists = false;
// check snapshots in snapshots repository only and releases in release repositories...
- if ( ( dependency.isSnapshot() && repo.getSnapshots().isEnabled() ) || ( !dependency.isSnapshot()
- && repo.getReleases().isEnabled() ) )
+ if ( ( dependency.isSnapshot() && repo.getSnapshots().isEnabled() )
+ || ( !dependency.isSnapshot() && repo.getReleases().isEnabled() ) )
{
dependencyExists = repoUtils.dependencyExistsInRepo( repo, dependency );
}
@@ -1331,7 +1315,7 @@ public class DependenciesRenderer
sink.link_();
sink.tableCell_();
- totalByRepo.put( repokey, old.intValue() + 1 );
+ totalByRepo.put( repokey, old.intValue() + 1);
}
else
{
@@ -1495,9 +1479,7 @@ public class DependenciesRenderer
this.locale = locale;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public StringBuffer format( long fs, StringBuffer result, FieldPosition fieldPosition )
{
if ( fs > 1024 * 1024 * 1024 )
@@ -1638,9 +1620,7 @@ public class DependenciesRenderer
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String toString()
{
StringBuilder sb = new StringBuilder();
Modified: maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java (original)
+++ maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java Tue Aug 27 18:25:03 2013
@@ -282,7 +282,7 @@ public class RarMojo
// Check if jar file is there and if requested, copy it
try
{
- if ( includeJar )
+ if (includeJar)
{
File generatedJarFile = new File( outputDirectory, finalName + ".jar" );
if ( generatedJarFile.exists() )
@@ -300,17 +300,16 @@ public class RarMojo
// Copy dependencies
try
{
- @SuppressWarnings( "unchecked" ) Set<Artifact> artifacts = project.getArtifacts();
- for ( Artifact artifact : artifacts )
- {
-
- ScopeArtifactFilter filter = new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME );
- if ( !artifact.isOptional() && filter.include( artifact )
- && artifact.getArtifactHandler().isAddedToClasspath() )
- {
- getLog().info( "Copying artifact[" + artifact.getGroupId() + ", " + artifact.getId() + ", "
- + artifact.getScope() + "]" );
- FileUtils.copyFileToDirectory( artifact.getFile(), getBuildDir() );
+ @SuppressWarnings("unchecked")
+ Set<Artifact> artifacts = project.getArtifacts();
+ for (Artifact artifact : artifacts) {
+
+ ScopeArtifactFilter filter = new ScopeArtifactFilter(Artifact.SCOPE_RUNTIME);
+ if (!artifact.isOptional() && filter.include(artifact)
+ && artifact.getArtifactHandler().isAddedToClasspath()) {
+ getLog().info("Copying artifact[" + artifact.getGroupId() + ", " + artifact.getId() + ", "
+ + artifact.getScope() + "]");
+ FileUtils.copyFileToDirectory(artifact.getFile(), getBuildDir());
}
}
}
Modified: maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java (original)
+++ maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java Tue Aug 27 18:25:03 2013
@@ -32,7 +32,7 @@ import java.util.List;
/**
* @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
*/
-@SuppressWarnings( "ConstantConditions" )
+@SuppressWarnings("ConstantConditions")
public class RarMojoTest
extends AbstractMojoTestCase
{
@@ -63,7 +63,7 @@ public class RarMojoTest
Boolean includeJar = (Boolean) getVariableValueFromObject( mojo, "includeJar" );
- assertTrue( includeJar );
+ assertTrue(includeJar);
//include the project jar to the rar
File projectJar = new File( getBasedir(), "src/test/resources/unit/basic-rar-test/target/test-rar.jar" );
@@ -89,20 +89,16 @@ public class RarMojoTest
assertEquals( "Files in working directory", expectedFiles.size(), fileNames.length );
- for ( File fileName1 : fileNames )
- {
+ for (File fileName1 : fileNames) {
String fileName = fileName1.getName();
- assertTrue( expectedFiles.contains( fileName ) );
+ assertTrue(expectedFiles.contains(fileName));
- if ( expectedFiles.contains( fileName ) )
- {
- expectedFiles.remove( fileName );
- assertFalse( expectedFiles.contains( fileName ) );
- }
- else
- {
- fail( fileName + " is not included in expected files." );
+ if (expectedFiles.contains(fileName)) {
+ expectedFiles.remove(fileName);
+ assertFalse(expectedFiles.contains(fileName));
+ } else {
+ fail(fileName + " is not included in expected files.");
}
}
@@ -165,9 +161,8 @@ public class RarMojoTest
List<String> expectedFiles = new ArrayList<String>();
List<String> fileList = new ArrayList<String>();
- for ( File fileName : fileNames )
- {
- addFileToList( fileName, fileList );
+ for (File fileName : fileNames) {
+ addFileToList(fileName, fileList);
}
expectedFiles.add( "ra.xml" );
@@ -300,18 +295,14 @@ public class RarMojoTest
private int getSizeOfExpectedFiles( List fileList, List expectedFiles )
{
- for ( Object aFileList : fileList )
- {
+ for (Object aFileList : fileList) {
String fileName = (String) aFileList;
- if ( expectedFiles.contains( fileName ) )
- {
- expectedFiles.remove( fileName );
- assertFalse( expectedFiles.contains( fileName ) );
- }
- else
- {
- fail( fileName + " is not included in the expected files" );
+ if (expectedFiles.contains(fileName)) {
+ expectedFiles.remove(fileName);
+ assertFalse(expectedFiles.contains(fileName));
+ } else {
+ fail(fileName + " is not included in the expected files");
}
}
return expectedFiles.size();
@@ -329,9 +320,8 @@ public class RarMojoTest
File[] files = file.listFiles();
- for ( File file1 : files )
- {
- addFileToList( file1, fileList );
+ for (File file1 : files) {
+ addFileToList(file1, fileList);
}
}
}
Modified: maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java (original)
+++ maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeDependentsMojo.java Tue Aug 27 18:25:03 2013
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Set;
/**
- * Goal to build a project X and all of the reactor projects that depend on X
+ * Goal to build a project X and all of the reactor projects that depend on X
*
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
@@ -38,17 +38,13 @@ public class MakeDependentsMojo
// gather parents instead of children
protected Set gatherProjects( Vertex v, SuperProjectSorter ps, Set visited, Set out )
{
- visited.add( v );
- out.add( ps.getProjectMap().get( v.getLabel() ) );
+ visited.add(v);
+ out.add(ps.getProjectMap().get(v.getLabel()));
List parents = v.getParents();
- for ( Object parent1 : parents )
- {
+ for (Object parent1 : parents) {
Vertex parent = (Vertex) parent1;
- if ( visited.contains( parent ) )
- {
- continue;
- }
- gatherProjects( parent, ps, visited, out );
+ if (visited.contains(parent)) continue;
+ gatherProjects(parent, ps, visited, out);
}
return out;
}
Modified: maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java (original)
+++ maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeMojo.java Tue Aug 27 18:25:03 2013
@@ -41,7 +41,7 @@ import java.util.List;
import java.util.Set;
/**
- * Goal to build a project X and all of the reactor projects on which X depends
+ * Goal to build a project X and all of the reactor projects on which X depends
*
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
@@ -113,50 +113,42 @@ public class MakeMojo
*/
@Parameter( property = "from" )
File continueFromFolder;
-
+
public void execute()
throws MojoExecutionException, MojoFailureException
{
- if ( artifactList == null && folderList == null )
- {
- throw new MojoFailureException(
- "You must specify either folders or projects with -Dmake.folders=foo,baz/bar or -Dmake.artifacts=com.mycompany:foo,com.mycompany:bar" );
+ if ( artifactList == null && folderList == null ) {
+ throw new MojoFailureException("You must specify either folders or projects with -Dmake.folders=foo,baz/bar or -Dmake.artifacts=com.mycompany:foo,com.mycompany:bar");
}
String[] reactorIncludes;
List sortedProjects;
try
{
- if ( collectedProjects.size() == 0 )
- {
+ if (collectedProjects.size() == 0) {
throw new NonReactorException();
}
SuperProjectSorter ps = new SuperProjectSorter( collectedProjects );
DAG dag = ps.getDAG();
-
+
// gather projects
collectArtifactListFromFolderList( collectedProjects );
String[] artifacts = StringUtils.split( artifactList, "," );
Set visited = new HashSet();
Set out = new HashSet();
- for ( String artifact : artifacts )
- {
+ for (String artifact : artifacts) {
String project = artifact;
- if ( project.indexOf( ':' ) == -1 )
- {
+ if (project.indexOf(':') == -1) {
project = defaultGroup + ":" + project;
}
- Vertex projectVertex = dag.getVertex( project );
- if ( projectVertex == null )
- {
- throw new MissingProjectException( project );
- }
- gatherProjects( projectVertex, ps, visited, out );
+ Vertex projectVertex = dag.getVertex(project);
+ if (projectVertex == null) throw new MissingProjectException(project);
+ gatherProjects(projectVertex, ps, visited, out);
}
-
+
// sort them again
ps = new SuperProjectSorter( new ArrayList( out ) );
sortedProjects = ps.getSortedProjects();
-
+
// construct array of relative POM paths
reactorIncludes = new String[sortedProjects.size()];
for ( int i = 0; i < sortedProjects.size(); i++ )
@@ -166,17 +158,15 @@ public class MakeMojo
reactorIncludes[i] = path;
}
}
- catch ( MojoFailureException e )
- {
+ catch (MojoFailureException e) {
throw e;
- }
+ }
catch ( Exception e )
{
throw new MojoExecutionException( "Problem generating dependency tree", e );
}
- if ( continueFromFolder != null || continueFromProject != null )
- {
+ if (continueFromFolder != null || continueFromProject != null) {
ResumeMojo resumer = new ResumeMojo();
resumer.baseDir = baseDir;
resumer.collectedProjects = sortedProjects;
@@ -188,55 +178,41 @@ public class MakeMojo
resumer.printOnly = printOnly;
resumer.continueFromGroup = defaultGroup;
resumer.execute();
- }
- else
- {
- simpleInvoker.runReactor( reactorIncludes, Arrays.asList( goals.split( "," ) ), invoker, printOnly,
- getLog() );
+ } else {
+ simpleInvoker.runReactor( reactorIncludes, Arrays.asList( goals.split( "," ) ), invoker, printOnly, getLog() );
}
}
- void collectArtifactListFromFolderList( List collectedProjects )
- throws MojoFailureException
+ void collectArtifactListFromFolderList(List collectedProjects) throws MojoFailureException
{
if ( folderList == null )
- {
return;
- }
String[] folders = StringUtils.split( folderList, "," );
Set pathSet = new HashSet();
- for ( String folder : folders )
- {
- File file = new File( baseDir, folder );
- if ( !file.exists() )
- {
- throw new MojoFailureException( "Folder doesn't exist: " + file.getAbsolutePath() );
+ for (String folder : folders) {
+ File file = new File(baseDir, folder);
+ if (!file.exists()) {
+ throw new MojoFailureException("Folder doesn't exist: " + file.getAbsolutePath());
}
String path = file.getAbsolutePath();
- pathSet.add( path );
- }
- if ( artifactList == null )
- {
- artifactList = "";
+ pathSet.add(path);
}
- StringBuilder artifactBuffer = new StringBuilder( artifactList );
- for ( Object collectedProject : collectedProjects )
- {
+ if (artifactList == null) artifactList = "";
+ StringBuilder artifactBuffer = new StringBuilder(artifactList);
+ for (Object collectedProject : collectedProjects) {
MavenProject mp = (MavenProject) collectedProject;
- if ( pathSet.contains( mp.getFile().getParentFile().getAbsolutePath() ) )
- {
- if ( artifactBuffer.length() > 0 )
- {
- artifactBuffer.append( ',' );
+ if (pathSet.contains(mp.getFile().getParentFile().getAbsolutePath())) {
+ if (artifactBuffer.length() > 0) {
+ artifactBuffer.append(',');
}
- String id = ArtifactUtils.versionlessKey( mp.getGroupId(), mp.getArtifactId() );
- artifactBuffer.append( id );
+ String id = ArtifactUtils.versionlessKey(mp.getGroupId(), mp.getArtifactId());
+ artifactBuffer.append(id);
}
}
if ( artifactBuffer.length() == 0 )
{
- throw new MojoFailureException( "No folders matched: " + folderList );
+ throw new MojoFailureException("No folders matched: " + folderList);
}
artifactList = artifactBuffer.toString();
}
@@ -246,14 +222,11 @@ public class MakeMojo
visited.add( v );
out.add( ps.getProjectMap().get( v.getLabel() ) );
List children = v.getChildren();
- for ( Object aChildren : children )
- {
+ for (Object aChildren : children) {
Vertex child = (Vertex) aChildren;
- if ( visited.contains( child ) )
- {
+ if (visited.contains(child))
continue;
- }
- gatherProjects( child, ps, visited, out );
+ gatherProjects(child, ps, visited, out);
}
return out;
}
Modified: maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeScmChanges.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeScmChanges.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeScmChanges.java (original)
+++ maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/MakeScmChanges.java Tue Aug 27 18:25:03 2013
@@ -42,7 +42,7 @@ import java.util.Set;
/**
* Goal to build all projects that you personally have changed (according to SCM)
- *
+ *
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
@Mojo( name = "make-scm-changes", aggregator = true, defaultPhase = LifecyclePhase.PROCESS_SOURCES )
@@ -75,8 +75,7 @@ public class MakeScmChanges
}
if ( scmConnection == null )
{
- throw new MojoFailureException(
- "No SCM connection specified. You must specify an SCM connection by adding a <connection> element to your <scm> element in your POM" );
+ throw new MojoFailureException("No SCM connection specified. You must specify an SCM connection by adding a <connection> element to your <scm> element in your POM");
}
StatusScmResult result;
try
@@ -90,46 +89,39 @@ public class MakeScmChanges
}
List changedFiles = result.getChangedFiles();
-
+
List projectDirectories = getProjectDirectories();
Set changedDirectories = new HashSet();
- for ( Object changedFile1 : changedFiles )
- {
+ for (Object changedFile1 : changedFiles) {
ScmFile changedScmFile = (ScmFile) changedFile1;
- getLog().debug( changedScmFile.toString() );
+ getLog().debug(changedScmFile.toString());
ScmFileStatus status = changedScmFile.getStatus();
- if ( !status.isStatus() )
- {
- getLog().debug( "Not a diff: " + status );
+ if (!status.isStatus()) {
+ getLog().debug("Not a diff: " + status);
continue;
}
- if ( ignoreUnknown && ScmFileStatus.UNKNOWN.equals( status ) )
- {
- getLog().debug( "Ignoring unknown" );
+ if (ignoreUnknown && ScmFileStatus.UNKNOWN.equals(status)) {
+ getLog().debug("Ignoring unknown");
continue;
}
- File changedFile = new File( changedScmFile.getPath() );
+ File changedFile = new File(changedScmFile.getPath());
boolean found = false;
// TODO There's a cleverer/faster way to code this, right? This is O(n^2)
- for ( Object projectDirectory1 : projectDirectories )
- {
+ for (Object projectDirectory1 : projectDirectories) {
File projectDirectory = (File) projectDirectory1;
- if ( changedFile.getAbsolutePath().startsWith( projectDirectory.getAbsolutePath() + File.separator ) )
- {
- String path = RelativePather.getRelativePath( baseDir, projectDirectory );
- if ( !changedDirectories.contains( path ) )
- {
- getLog().debug( "Including " + path );
+ if (changedFile.getAbsolutePath().startsWith(projectDirectory.getAbsolutePath() + File.separator)) {
+ String path = RelativePather.getRelativePath(baseDir, projectDirectory);
+ if (!changedDirectories.contains(path)) {
+ getLog().debug("Including " + path);
}
- changedDirectories.add( path );
+ changedDirectories.add(path);
found = true;
break;
}
}
- if ( !found )
- {
- getLog().debug( "Couldn't find file in any reactor root: " + changedFile.getAbsolutePath() );
+ if (!found) {
+ getLog().debug("Couldn't find file in any reactor root: " + changedFile.getAbsolutePath());
}
}
folderList = StringUtils.join( changedDirectories.iterator(), "," );
@@ -141,10 +133,9 @@ public class MakeScmChanges
private List getProjectDirectories()
{
List dirs = new ArrayList( collectedProjects.size() );
- for ( Object collectedProject : collectedProjects )
- {
+ for (Object collectedProject : collectedProjects) {
MavenProject mp = (MavenProject) collectedProject;
- dirs.add( mp.getFile().getParentFile() );
+ dirs.add(mp.getFile().getParentFile());
}
return dirs;
}
Modified: maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/RelativePather.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/RelativePather.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/RelativePather.java (original)
+++ maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/RelativePather.java Tue Aug 27 18:25:03 2013
@@ -25,26 +25,20 @@ import java.util.LinkedList;
/**
* Calculates relative paths
- *
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ *
*/
-class RelativePather
-{
+class RelativePather {
/**
* Calculates a relative path
- *
* @param context the "current" context directory
- * @param dest the directory to be described by a relative path
+ * @param dest the directory to be described by a relative path
* @return a relative path from the context directory to the dest directory
*/
- public static String getRelativePath( File context, File dest )
- {
- LinkedList contextChunks = getPathChunks( context );
- LinkedList destChunks = getPathChunks( dest );
- if ( !contextChunks.getFirst().equals( destChunks.getFirst() ) )
- {
- throw new DifferentRootsException( "Roots differ" );
- }
+ public static String getRelativePath(File context, File dest) {
+ LinkedList contextChunks = getPathChunks(context);
+ LinkedList destChunks = getPathChunks(dest);
+ if (!contextChunks.getFirst().equals(destChunks.getFirst())) throw new DifferentRootsException("Roots differ");
int count = 0;
Iterator contextChunker = contextChunks.iterator();
Iterator destChunker = destChunks.iterator();
@@ -52,99 +46,76 @@ class RelativePather
contextChunker.next();
String destChunk = (String) destChunker.next();
boolean pathsDiffer = false;
- while ( true )
- {
+ while (true) {
count++;
- if ( !contextChunker.hasNext() )
- {
- break;
- }
- if ( !destChunker.hasNext() )
- {
- break;
- }
+ if (!contextChunker.hasNext()) break;
+ if (!destChunker.hasNext()) break;
contextChunk = (String) contextChunker.next();
destChunk = (String) destChunker.next();
- if ( !contextChunk.equals( destChunk ) )
- {
+ if (!contextChunk.equals(destChunk)) {
pathsDiffer = true;
break;
}
}
-
+
// the paths agree for the first N chunks
-
+
StringBuilder relativePath = new StringBuilder();
-
- if ( count < contextChunks.size() )
- {
+
+ if (count < contextChunks.size()) {
int dotDotCount = contextChunks.size() - count;
- for ( int i = 0; i < dotDotCount; i++ )
- {
- relativePath.append( ".." );
+ for (int i = 0; i < dotDotCount; i++) {
+ relativePath.append("..");
// omit trailing slash
- if ( i < dotDotCount - 1 )
- {
- relativePath.append( File.separatorChar );
+ if (i < dotDotCount -1) {
+ relativePath.append(File.separatorChar);
}
}
}
- if ( pathsDiffer )
- {
- if ( relativePath.length() > 0 )
- {
- relativePath.append( File.separatorChar );
+ if (pathsDiffer) {
+ if (relativePath.length() > 0) {
+ relativePath.append(File.separatorChar);
}
- relativePath.append( destChunk );
+ relativePath.append(destChunk);
}
- while ( destChunker.hasNext() )
- {
- if ( relativePath.length() > 0 )
- {
- relativePath.append( File.separatorChar );
+ while (destChunker.hasNext()) {
+ if (relativePath.length() > 0) {
+ relativePath.append(File.separatorChar);
}
- relativePath.append( destChunker.next() );
+ relativePath.append(destChunker.next());
}
-
+
return relativePath.toString();
}
-
- private static LinkedList getPathChunks( File f )
- {
+
+ private static LinkedList getPathChunks(File f) {
LinkedList l = new LinkedList();
- while ( f.getParentFile() != null )
- {
- l.addFirst( f.getName() );
+ while (f.getParentFile() != null) {
+ l.addFirst(f.getName());
f = f.getParentFile();
}
- l.addFirst( f.getAbsolutePath() );
+ l.addFirst(f.getAbsolutePath());
return l;
}
-
- static class DifferentRootsException
- extends RuntimeException
- {
+
+ static class DifferentRootsException extends RuntimeException {
private static final long serialVersionUID = 1L;
- public DifferentRootsException()
- {
+ public DifferentRootsException() {
super();
}
- public DifferentRootsException( String message, Throwable cause )
- {
- super( message, cause );
+ public DifferentRootsException(String message, Throwable cause) {
+ super(message, cause);
}
- public DifferentRootsException( String message )
- {
- super( message );
+ public DifferentRootsException(String message) {
+ super(message);
}
- public DifferentRootsException( Throwable cause )
- {
- super( cause );
+ public DifferentRootsException(Throwable cause) {
+ super(cause);
}
-
+
}
}
Modified: maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/SuperProjectSorter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/SuperProjectSorter.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/SuperProjectSorter.java (original)
+++ maven/plugins/trunk/maven-reactor-plugin/src/main/java/org/apache/maven/plugin/reactor/SuperProjectSorter.java Tue Aug 27 18:25:03 2013
@@ -40,6 +40,7 @@ import org.codehaus.plexus.util.dag.Topo
/**
* Sort projects by dependencies. Just like ProjectSorter from maven-project, but this one exposes
* the DAG and the projectMap in getters.
+ *
*
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
@@ -49,7 +50,7 @@ public class SuperProjectSorter
private final DAG dag;
private final Map projectMap;
-
+
private final List sortedProjects;
private MavenProject topLevelProject;
@@ -64,7 +65,6 @@ public class SuperProjectSorter
* we are trying to build. we assume a closed set.</li>
* <li>do a topo sort on the graph that remains.</li>
* </ul>
- *
* @throws DuplicateProjectException if any projects are duplicated by id
*/
public SuperProjectSorter( List projects )
@@ -74,102 +74,85 @@ public class SuperProjectSorter
projectMap = new HashMap();
- for ( Object project2 : projects )
- {
+ for (Object project2 : projects) {
MavenProject project = (MavenProject) project2;
- String id = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
+ String id = ArtifactUtils.versionlessKey(project.getGroupId(), project.getArtifactId());
- if ( dag.getVertex( id ) != null )
- {
- throw new DuplicateProjectException( "Project '" + id + "' is duplicated in the reactor" );
+ if (dag.getVertex(id) != null) {
+ throw new DuplicateProjectException("Project '" + id + "' is duplicated in the reactor");
}
- dag.addVertex( id );
+ dag.addVertex(id);
- projectMap.put( id, project );
+ projectMap.put(id, project);
}
- for ( Object project1 : projects )
- {
+ for (Object project1 : projects) {
MavenProject project = (MavenProject) project1;
- String id = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
+ String id = ArtifactUtils.versionlessKey(project.getGroupId(), project.getArtifactId());
- for ( Object o1 : project.getDependencies() )
- {
+ for (Object o1 : project.getDependencies()) {
Dependency dependency = (Dependency) o1;
- String dependencyId =
- ArtifactUtils.versionlessKey( dependency.getGroupId(), dependency.getArtifactId() );
+ String dependencyId = ArtifactUtils
+ .versionlessKey(dependency.getGroupId(), dependency.getArtifactId());
- if ( dag.getVertex( dependencyId ) != null )
- {
- project.addProjectReference( (MavenProject) projectMap.get( dependencyId ) );
+ if (dag.getVertex(dependencyId) != null) {
+ project.addProjectReference((MavenProject) projectMap.get(dependencyId));
- dag.addEdge( id, dependencyId );
+ dag.addEdge(id, dependencyId);
}
}
MavenProject parent = project.getParent();
- if ( parent != null )
- {
- String parentId = ArtifactUtils.versionlessKey( parent.getGroupId(), parent.getArtifactId() );
- if ( dag.getVertex( parentId ) != null )
- {
+ if (parent != null) {
+ String parentId = ArtifactUtils.versionlessKey(parent.getGroupId(), parent.getArtifactId());
+ if (dag.getVertex(parentId) != null) {
// Parent is added as an edge, but must not cause a cycle - so we remove any other edges it has in conflict
- if ( dag.hasEdge( parentId, id ) )
- {
- dag.removeEdge( parentId, id );
+ if (dag.hasEdge(parentId, id)) {
+ dag.removeEdge(parentId, id);
}
- dag.addEdge( id, parentId );
+ dag.addEdge(id, parentId);
}
}
List buildPlugins = project.getBuildPlugins();
- if ( buildPlugins != null )
- {
- for ( Object buildPlugin : buildPlugins )
- {
+ if (buildPlugins != null) {
+ for (Object buildPlugin : buildPlugins) {
Plugin plugin = (Plugin) buildPlugin;
- String pluginId = ArtifactUtils.versionlessKey( plugin.getGroupId(), plugin.getArtifactId() );
- if ( dag.getVertex( pluginId ) != null && !pluginId.equals( id ) )
- {
- addEdgeWithParentCheck( projectMap, pluginId, project, id );
+ String pluginId = ArtifactUtils.versionlessKey(plugin.getGroupId(), plugin.getArtifactId());
+ if (dag.getVertex(pluginId) != null && !pluginId.equals(id)) {
+ addEdgeWithParentCheck(projectMap, pluginId, project, id);
}
}
}
List reportPlugins = project.getReportPlugins();
- if ( reportPlugins != null )
- {
- for ( Object reportPlugin : reportPlugins )
- {
+ if (reportPlugins != null) {
+ for (Object reportPlugin : reportPlugins) {
ReportPlugin plugin = (ReportPlugin) reportPlugin;
- String pluginId = ArtifactUtils.versionlessKey( plugin.getGroupId(), plugin.getArtifactId() );
- if ( dag.getVertex( pluginId ) != null && !pluginId.equals( id ) )
- {
- addEdgeWithParentCheck( projectMap, pluginId, project, id );
+ String pluginId = ArtifactUtils.versionlessKey(plugin.getGroupId(), plugin.getArtifactId());
+ if (dag.getVertex(pluginId) != null && !pluginId.equals(id)) {
+ addEdgeWithParentCheck(projectMap, pluginId, project, id);
}
}
}
- for ( Object o : project.getBuildExtensions() )
- {
+ for (Object o : project.getBuildExtensions()) {
Extension extension = (Extension) o;
- String extensionId = ArtifactUtils.versionlessKey( extension.getGroupId(), extension.getArtifactId() );
- if ( dag.getVertex( extensionId ) != null )
- {
- addEdgeWithParentCheck( projectMap, extensionId, project, id );
+ String extensionId = ArtifactUtils.versionlessKey(extension.getGroupId(), extension.getArtifactId());
+ if (dag.getVertex(extensionId) != null) {
+ addEdgeWithParentCheck(projectMap, extensionId, project, id);
}
}
}
List sortedProjects = new ArrayList();
- for ( String id : TopologicalSorter.sort( dag ) )
- {
- sortedProjects.add( projectMap.get( id ) );
+ for (String id : TopologicalSorter.sort(dag)) {
+ sortedProjects.add(projectMap.get(id));
}
this.sortedProjects = Collections.unmodifiableList( sortedProjects );
@@ -179,7 +162,7 @@ public class SuperProjectSorter
throws CycleDetectedException
{
MavenProject extProject = (MavenProject) projectMap.get( projectRefId );
-
+
if ( extProject == null )
{
return;
@@ -231,15 +214,15 @@ public class SuperProjectSorter
{
return dag.getParentLabels( id );
}
-
+
public DAG getDAG()
{
return dag;
}
-
+
public Map getProjectMap()
{
return projectMap;
}
-
+
}
Modified: maven/plugins/trunk/maven-reactor-plugin/src/test/java/org/apache/maven/plugin/reactor/MakeMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-reactor-plugin/src/test/java/org/apache/maven/plugin/reactor/MakeMojoTest.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-reactor-plugin/src/test/java/org/apache/maven/plugin/reactor/MakeMojoTest.java (original)
+++ maven/plugins/trunk/maven-reactor-plugin/src/test/java/org/apache/maven/plugin/reactor/MakeMojoTest.java Tue Aug 27 18:25:03 2013
@@ -67,7 +67,7 @@ public class MakeMojoTest
configureProject( businessLogic, "businessLogic", "reactortest", "1.0" );
configureProject( ui, "ui", "reactortest", "1.0" );
- configuredProjects = Arrays.asList( dataAccess, businessLogic, ui );
+ configuredProjects = Arrays.asList(dataAccess, businessLogic, ui);
// ui depends on businessLogic
// businessLogic depends on dataAccess
@@ -141,7 +141,7 @@ public class MakeMojoTest
m.simpleInvoker = fi;
ScmFile sf = new ScmFile( businessLogic.getFile().getAbsolutePath(), ScmFileStatus.MODIFIED );
- m.scmManager = new FakeScmManager( Arrays.asList( sf ) );
+ m.scmManager = new FakeScmManager( Arrays.asList(sf) );
m.scmConnection = "";
m.execute();
Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/bad-dependency-poms/pom.xml Tue Aug 27 18:25:03 2013
@@ -18,7 +18,7 @@ specific language governing permissions
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -28,7 +28,7 @@ under the License.
<relativePath>../it-parent/pom.xml</relativePath>
</parent>
- <artifactId>test</artifactId>
+ <artifactId>test</artifactId>
<version>1.0</version>
<repositories>
@@ -71,8 +71,7 @@ under the License.
</goals>
<configuration>
<resourceBundles>
- <resourceBundle>org.apache.maven.plugin.rresource.it:resource-bundle-with-template:${project.version}
- </resourceBundle>
+ <resourceBundle>org.apache.maven.plugin.rresource.it:resource-bundle-with-template:${project.version}</resourceBundle>
</resourceBundles>
</configuration>
</execution>