Changed log warn message that ws irritating to assembly users
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1637947 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java b/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
index 9579770..d2a51da 100644
--- a/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
+++ b/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
@@ -53,6 +53,8 @@
import org.apache.maven.shared.repository.model.GroupVersionAlignment;
import org.apache.maven.shared.repository.model.RepositoryInfo;
import org.apache.maven.shared.repository.utils.DigestUtils;
+import org.apache.maven.shared.utils.io.FileUtils;
+import org.apache.maven.shared.utils.io.IOUtil;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
@@ -62,8 +64,6 @@
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
-import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.utils.io.IOUtil;
import java.io.File;
import java.io.FileWriter;
@@ -78,7 +78,6 @@
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -95,7 +94,7 @@
implements RepositoryAssembler, Contextualizable
{
private static final String[] PREFERRED_RESOLVER_HINTS = { "project-cache-aware", // Provided in Maven 2.1-SNAPSHOT
- "default" };
+ "default" };
protected static final TimeZone UTC_TIME_ZONE = TimeZone.getTimeZone( "UTC" );
@@ -175,7 +174,7 @@
if ( logger.isDebugEnabled() )
{
logger.debug( "dependency-artifact set for project: " + project.getId()
- + " is null. Skipping repository processing." );
+ + " is null. Skipping repository processing." );
}
return;
@@ -193,8 +192,7 @@
// FIXME I'm not getting runtime dependencies here
result = artifactResolver.resolveTransitively( dependencyArtifacts, project.getArtifact(),
getManagedVersionMap( project ), localRepository,
- project.getRemoteArtifactRepositories(),
- metadataSource );
+ project.getRemoteArtifactRepositories(), metadataSource );
}
catch ( ArtifactResolutionException e )
{
@@ -256,15 +254,15 @@
if ( ( includes == null ) || includes.isEmpty() )
{
- List patterns = new ArrayList();
+ List<String> patterns = new ArrayList<String>();
Set projectArtifacts = project.getDependencyArtifacts();
if ( projectArtifacts != null )
{
- for ( Iterator it = projectArtifacts.iterator(); it.hasNext(); )
+ for ( Object projectArtifact : projectArtifacts )
{
- Artifact artifact = (Artifact) it.next();
+ Artifact artifact = (Artifact) projectArtifact;
patterns.add( artifact.getDependencyConflictId() );
}
@@ -312,9 +310,9 @@
FileUtils.mkdir( repositoryDirectory.getAbsolutePath() );
- for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
+ for ( Object o : result.getArtifacts() )
{
- Artifact a = (Artifact) i.next();
+ Artifact a = (Artifact) o;
if ( filter.include( a ) )
{
@@ -354,11 +352,6 @@
}
}
- /**
- *
- * @param pomFileOverride This is used to allow injection of a POM's file directly, for
- * cases where the POM has not been installed into the repository yet.
- */
private void addPomWithAncestry( final Artifact artifact, List remoteArtifactRepositories,
ArtifactRepository localRepository, ArtifactRepository targetRepository,
Map groupVersionAlignments, MavenProject masterProject )
@@ -456,9 +449,9 @@
private ArtifactRepository findCentralRepository( MavenProject project )
{
ArtifactRepository centralRepository = null;
- for ( Iterator i = project.getRemoteArtifactRepositories().iterator(); i.hasNext(); )
+ for ( Object o : project.getRemoteArtifactRepositories() )
{
- ArtifactRepository r = (ArtifactRepository) i.next();
+ ArtifactRepository r = (ArtifactRepository) o;
if ( "central".equals( r.getId() ) )
{
centralRepository = r;
@@ -472,9 +465,9 @@
ArtifactRepository centralRepository, ArtifactRepository targetRepository )
throws RepositoryAssemblyException
{
- for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
+ for ( Object o : result.getArtifacts() )
{
- Artifact a = (Artifact) i.next();
+ Artifact a = (Artifact) o;
if ( filter.include( a ) )
{
@@ -514,18 +507,18 @@
{
writeChecksums( metadataFile );
- File metadataFileRemote = new File( targetRepository.getBasedir(), targetRepository
- .pathOfRemoteRepositoryMetadata( metadata ) );
+ File metadataFileRemote = new File( targetRepository.getBasedir(),
+ targetRepository.pathOfRemoteRepositoryMetadata( metadata ) );
FileUtils.copyFile( metadataFile, metadataFileRemote );
FileUtils.copyFile( new File( metadataFile.getParentFile(), metadataFile.getName() + ".sha1" ),
- new File( metadataFileRemote.getParentFile(), metadataFileRemote.getName()
- + ".sha1" ) );
+ new File( metadataFileRemote.getParentFile(),
+ metadataFileRemote.getName() + ".sha1" ) );
FileUtils.copyFile( new File( metadataFile.getParentFile(), metadataFile.getName() + ".md5" ),
- new File( metadataFileRemote.getParentFile(), metadataFileRemote.getName()
- + ".md5" ) );
+ new File( metadataFileRemote.getParentFile(),
+ metadataFileRemote.getName() + ".md5" ) );
}
catch ( IOException e )
{
@@ -543,10 +536,10 @@
String md5 = DigestUtils.createChecksum( file, "MD5" );
String sha1 = DigestUtils.createChecksum( file, "SHA-1" );
- FileUtils.fileWrite( new File( file.getParentFile(), file.getName() + ".md5" ).getAbsolutePath(), md5
- .toLowerCase() );
- FileUtils.fileWrite( new File( file.getParentFile(), file.getName() + ".sha1" ).getAbsolutePath(), sha1
- .toLowerCase() );
+ FileUtils.fileWrite( new File( file.getParentFile(), file.getName() + ".md5" ).getAbsolutePath(),
+ md5.toLowerCase() );
+ FileUtils.fileWrite( new File( file.getParentFile(), file.getName() + ".sha1" ).getAbsolutePath(),
+ sha1.toLowerCase() );
}
catch ( NoSuchAlgorithmException e )
{
@@ -560,9 +553,9 @@
if ( versionAlignments != null )
{
- for ( Iterator i = versionAlignments.iterator(); i.hasNext(); )
+ for ( Object versionAlignment : versionAlignments )
{
- GroupVersionAlignment alignment = (GroupVersionAlignment) i.next();
+ GroupVersionAlignment alignment = (GroupVersionAlignment) versionAlignment;
groupVersionAlignments.put( alignment.getId(), alignment );
}
@@ -594,8 +587,8 @@
public ArtifactRepository createRepository( String repositoryId, String repositoryUrl, boolean offline,
boolean updateSnapshots, String globalChecksumPolicy )
{
- ArtifactRepository localRepository = new DefaultArtifactRepository( repositoryId, repositoryUrl,
- repositoryLayout );
+ ArtifactRepository localRepository =
+ new DefaultArtifactRepository( repositoryId, repositoryUrl, repositoryLayout );
boolean snapshotPolicySet = false;
@@ -657,26 +650,26 @@
{
DependencyManagement dependencyManagement = project.getModel().getDependencyManagement();
- Map map = null;
+ Map<String, Artifact> map;
List deps = ( dependencyManagement == null ) ? null : dependencyManagement.getDependencies();
if ( ( deps != null ) && ( deps.size() > 0 ) )
{
- map = new HashMap();
+ map = new HashMap<String, Artifact>();
if ( getLogger().isDebugEnabled() )
{
getLogger().debug( "Adding managed dependencies for " + project.getId() );
}
- for ( Iterator i = dependencyManagement.getDependencies().iterator(); i.hasNext(); )
+ for ( Object o1 : dependencyManagement.getDependencies() )
{
- Dependency d = (Dependency) i.next();
+ Dependency d = (Dependency) o1;
VersionRange versionRange = VersionRange.createFromVersionSpec( d.getVersion() );
- Artifact artifact = artifactFactory.createDependencyArtifact( d.getGroupId(), d.getArtifactId(),
- versionRange, d.getType(),
- d.getClassifier(), d.getScope(),
- d.isOptional() );
+ Artifact artifact =
+ artifactFactory.createDependencyArtifact( d.getGroupId(), d.getArtifactId(), versionRange,
+ d.getType(), d.getClassifier(), d.getScope(),
+ d.isOptional() );
if ( getLogger().isDebugEnabled() )
{
getLogger().debug( " " + artifact );
@@ -687,11 +680,10 @@
// dependencies will be excluded if necessary.
if ( ( null != d.getExclusions() ) && !d.getExclusions().isEmpty() )
{
- List exclusions = new ArrayList();
- Iterator exclItr = d.getExclusions().iterator();
- while ( exclItr.hasNext() )
+ List<String> exclusions = new ArrayList<String>();
+ for ( Object o : d.getExclusions() )
{
- Exclusion e = (Exclusion) exclItr.next();
+ Exclusion e = (Exclusion) o;
exclusions.add( e.getGroupId() + ":" + e.getArtifactId() );
}
ExcludesArtifactFilter eaf = new ExcludesArtifactFilter( exclusions );
@@ -704,9 +696,9 @@
map.put( d.getManagementKey(), artifact );
}
}
- else if ( map == null )
+ else
{
- map = Collections.EMPTY_MAP;
+ map = Collections.emptyMap();
}
return map;
}
@@ -716,18 +708,23 @@
{
PlexusContainer container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
- for ( int i = 0; i < PREFERRED_RESOLVER_HINTS.length; i++ )
+ for ( String hint : PREFERRED_RESOLVER_HINTS )
{
- String hint = PREFERRED_RESOLVER_HINTS[i];
-
- try
+ if ( container.hasComponent( ArtifactResolver.ROLE, hint ) )
{
- artifactResolver = (ArtifactResolver) container.lookup( ArtifactResolver.ROLE, hint );
- break;
+ try
+ {
+ artifactResolver = (ArtifactResolver) container.lookup( ArtifactResolver.ROLE, hint );
+ break;
+ }
+ catch ( ComponentLookupException e )
+ {
+ getLogger().warn( "Cannot find ArtifactResolver with hint: " + hint, e );
+ }
}
- catch ( ComponentLookupException e )
+ else
{
- getLogger().debug( "Cannot find ArtifactResolver with hint: " + hint, e );
+ getLogger().debug( "No ArtifactResolver with hint " + hint );
}
}
@@ -745,8 +742,9 @@
if ( artifactResolver == null )
{
- throw new ContextException( "Failed to lookup a valid ArtifactResolver implementation. Tried hints:\n"
- + Arrays.asList( PREFERRED_RESOLVER_HINTS ) );
+ throw new ContextException(
+ "Failed to lookup a valid ArtifactResolver implementation. Tried hints:\n" + Arrays.asList(
+ PREFERRED_RESOLVER_HINTS ) );
}
}
}
diff --git a/src/main/java/org/apache/maven/shared/repository/utils/DigestUtils.java b/src/main/java/org/apache/maven/shared/repository/utils/DigestUtils.java
index 1ced602..7cfa25a 100644
--- a/src/main/java/org/apache/maven/shared/repository/utils/DigestUtils.java
+++ b/src/main/java/org/apache/maven/shared/repository/utils/DigestUtils.java
@@ -128,10 +128,10 @@
{
String output = "";
- for ( int cnt = 0; cnt < data.length; cnt++ )
+ for ( byte aData : data )
{
//Deposit a byte into the 8 lsb of an int.
- int tempInt = data[cnt] & BYTE_MASK;
+ int tempInt = aData & BYTE_MASK;
//Get hex representation of the int as a string.
String tempStr = Integer.toHexString( tempInt );
