svn commit: r1068543 - /maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java

[pgier]

Author: pgier
Date: Tue Feb  8 19:46:41 2011
New Revision: 1068543

URL: http://svn.apache.org/viewvc?rev=1068543&view=rev
Log:
[MANTTASKS-206] Allow override of central Maven repo in the POM
Submitted by: 

o Applied patch with minor comment changes

Modified:
    
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java

Modified: 
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java
URL: 
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java?rev=1068543&r1=1068542&r2=1068543&view=diff
==============================================================================
--- 
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java
 (original)
+++ 
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java
 Tue Feb  8 19:46:41 2011
@@ -80,13 +80,11 @@ public abstract class AbstractArtifactWi
     protected List<ArtifactRepository> createRemoteArtifactRepositories( 
List<Repository> pomRepositories )
     {
         List<RemoteRepository> remoteRepositories = new 
ArrayList<RemoteRepository>();
-        remoteRepositories.addAll( getRemoteRepositories() );
 
-        if ( getRemoteRepositories().isEmpty() )
-        {
-            remoteRepositories.add( getDefaultRemoteRepository() );
-        }
+        // First, add repositories configured in Ant
+        remoteRepositories.addAll( getRemoteRepositories() );
 
+        // Add repositories configured in POM
         if ( pomRepositories != null )
         {
             for ( Repository pomRepository : pomRepositories )
@@ -95,6 +93,12 @@ public abstract class AbstractArtifactWi
             }
         }
 
+        // Only add default repository if no repositories were configured 
otherwise
+        if ( remoteRepositories.isEmpty() )
+        {
+            remoteRepositories.add( getDefaultRemoteRepository() );
+        }
+
         log( "Using remote repositories:", Project.MSG_VERBOSE );
         List<ArtifactRepository> list = new ArrayList<ArtifactRepository>();
         Set<String> ids = new HashSet<String>();