You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/05/26 18:08:23 UTC

svn commit: r541908 - /maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java

Author: jvanzyl
Date: Sat May 26 09:08:22 2007
New Revision: 541908

URL: http://svn.apache.org/viewvc?view=rev&rev=541908
Log:
MANTTASKS-65 add central repository only if no remoteRepository set
Submitted by: Herve Boutemy


Modified:
    maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java

Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java?view=diff&rev=541908&r1=541907&r2=541908
==============================================================================
--- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java (original)
+++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java Sat May 26 09:08:22 2007
@@ -106,7 +106,7 @@
             {
                 Repository pomRepository = (Repository) i.next();
 
-                remoteRepositories.add( createAntRemoteRepository( pomRepository ) );
+                addRemoteRepository( createAntRemoteRepository( pomRepository ) );
             }
         }
         else
@@ -128,12 +128,13 @@
 
         ArtifactResolutionResult result;
         Set artifacts;
-        List remoteRepositories = getRemoteRepositories();
 
-        RemoteRepository remoteRepository = getDefaultRemoteRepository();
-        remoteRepositories.add( remoteRepository );
+        if ( getRemoteRepositories().isEmpty() )
+        {
+            addRemoteRepository( getDefaultRemoteRepository() );
+        }
 
-        List remoteArtifactRepositories = createRemoteArtifactRepositories( remoteRepositories );
+        List remoteArtifactRepositories = createRemoteArtifactRepositories( getRemoteRepositories() );
 
         try
         {