You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2007/11/11 21:37:33 UTC

svn commit: r593950 - in /maven/ant-tasks/branches/maven-ant-tasks-2.0.x: sample.build.xml src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java

Author: hboutemy
Date: Sun Nov 11 12:37:33 2007
New Revision: 593950

URL: http://svn.apache.org/viewvc?rev=593950&view=rev
Log:
[MANTTASKS-2] avoid "No files specified for filelist" when dependency is empty

Modified:
    maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml
    maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
    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/sample.build.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml?rev=593950&r1=593949&r2=593950&view=diff
==============================================================================
--- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml (original)
+++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml Sun Nov 11 12:37:33 2007
@@ -53,11 +53,12 @@
   </target>
 
   <target name="test-no-deps" depends="initTaskDefs">
-    <artifact:dependencies filesetId="runtime.fileset">
+    <artifact:dependencies filesetId="runtime.fileset" pathId="empty.dependency.classpath">
     </artifact:dependencies>
     <copy todir="target/test-no-deps" verbose="true">
       <fileset refid="runtime.fileset"/>
     </copy>
+    <property name="empty.property" refid="empty.dependency.classpath"/>
   </target>
 
   <target name="test-empty-settings" depends="initTaskDefs">

Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.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/AbstractArtifactTask.java?rev=593950&r1=593949&r2=593950&view=diff
==============================================================================
--- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original)
+++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Sun Nov 11 12:37:33 2007
@@ -277,6 +277,10 @@
             log( "You are working in offline mode.", Project.MSG_INFO );
             wagonManager.setOnline( false );
         }
+        else
+        {
+            wagonManager.setOnline( true );
+        }
     }
 
     private Settings loadSettings( File settingsFile )

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?rev=593950&r1=593949&r2=593950&view=diff
==============================================================================
--- 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 Sun Nov 11 12:37:33 2007
@@ -268,7 +268,10 @@
         if ( pathId != null )
         {
             Path path = new Path( getProject() );
-            path.addFilelist( fileList );
+            if ( versions.size() > 0 )
+            {
+                path.addFilelist( fileList );
+            }
             getProject().addReference( pathId, path );
         }