You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by jv...@apache.org on 2004/08/10 02:28:48 UTC
cvs commit: maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver DefaultArtifactResolver.java
jvanzyl 2004/08/09 17:28:48
Modified: maven-artifact/src/main/java/org/apache/maven/artifact/resolver
DefaultArtifactResolver.java
Log:
Revision Changes Path
1.2 +19 -22 maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Index: DefaultArtifactResolver.java
===================================================================
RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultArtifactResolver.java 9 Aug 2004 18:37:34 -0000 1.1
+++ DefaultArtifactResolver.java 10 Aug 2004 00:28:48 -0000 1.2
@@ -4,6 +4,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.wagon.TransferFailedException;
@@ -115,24 +116,26 @@
ArtifactMetadataSource source )
throws ArtifactResolutionException
{
+ ArtifactResolutionResult artifactResolutionResult;
+
try
{
- ArtifactResolutionResult artifactResolutionResult = collect( artifacts,
- localRepository,
- remoteRepositories,
- source );
-
- for ( Iterator i = artifactResolutionResult.getArtifacts().values().iterator(); i.hasNext(); )
- {
- resolve( (Artifact) i.next(), remoteRepositories, localRepository );
- }
-
- return artifactResolutionResult;
+ artifactResolutionResult = collect( artifacts,
+ localRepository,
+ remoteRepositories,
+ source );
}
- catch ( ArtifactCollectionException e )
+ catch ( TransitiveArtifactResolutionException e )
{
- throw new ArtifactResolutionException( "Error while resolving transitive dependencies: ", e );
+ throw new ArtifactResolutionException( "Error transitively resolving artifacts: ", e );
}
+
+ for ( Iterator i = artifactResolutionResult.getArtifacts().values().iterator(); i.hasNext(); )
+ {
+ resolve( (Artifact) i.next(), remoteRepositories, localRepository );
+ }
+
+ return artifactResolutionResult;
}
public ArtifactResolutionResult resolveTransitively( Artifact artifact,
@@ -157,7 +160,7 @@
ArtifactRepository localRepository,
Set remoteRepositories,
ArtifactMetadataSource source )
- throws ArtifactCollectionException
+ throws TransitiveArtifactResolutionException
{
ArtifactResolutionResult result = new ArtifactResolutionResult();
@@ -187,13 +190,7 @@
if ( !newVersion.equals( knownVersion ) )
{
- /*
- getLogger().warn( "Version conflict: " + id + ", " +
- "using version: " + knownArtifact.getVersion() + ", " +
- "found version: " + newArtifact.getVersion() );
-
addConflict( result, knownArtifact, newArtifact );
- */
}
}
else
@@ -207,9 +204,9 @@
{
referencedDependencies = source.retrieve( newArtifact );
}
- catch ( Exception e )
+ catch ( ArtifactMetadataRetrievalException e )
{
- throw new ArtifactCollectionException( "Problem building project: ", e );
+ throw new TransitiveArtifactResolutionException( "Error retrieving metadata: ", e );
}
// the pom for given dependency exisit we will add it to the queue