maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r749968 - /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Date Wed, 04 Mar 2009 11:35:59 GMT
Author: bentmann
Date: Wed Mar  4 11:35:58 2009
New Revision: 749968

URL: http://svn.apache.org/viewvc?rev=749968&view=rev
Log:
o Restored compat with 2.x where the root is not resolved for ArtifactResolver.resolveTransitively()

Modified:
    maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java

Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=749968&r1=749967&r2=749968&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
(original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Wed Mar  4 11:35:58 2009
@@ -308,7 +308,7 @@
                                                          List<ConflictResolver> conflictResolvers
)
         throws ArtifactResolutionException, ArtifactNotFoundException
     {
-        ArtifactResolutionRequest request = new ArtifactResolutionRequest().setArtifact(
originatingArtifact ).setArtifactDependencies( artifacts ).setManagedVersionMap( managedVersions
)
+        ArtifactResolutionRequest request = new ArtifactResolutionRequest().setArtifact(
originatingArtifact ).setResolveRoot( false ).setArtifactDependencies( artifacts ).setManagedVersionMap(
managedVersions )
             .setLocalRepository( localRepository ).setRemoteRepostories( remoteRepositories
).setMetadataSource( source ).setFilter( filter ).setListeners( listeners );
 
         return resolveWithExceptions( request );
@@ -388,7 +388,7 @@
         // file reference. But this may be a Maven Plugin that we need to resolve from a
remote repository
         // as well as its dependencies.
         
-        if ( rootArtifact.getFile() == null )
+        if ( request.isResolveRoot() && rootArtifact.getFile() == null )
         {
             try
             {



Mime
View raw message