Author: hboutemy Date: Sun Nov 11 12:36:09 2007 New Revision: 593949 URL: http://svn.apache.org/viewvc?rev=593949&view=rev Log: [MANTTASKS-2] avoid "No files specified for filelist" when dependency is empty
Modified: maven/ant-tasks/trunk/sample.build.xml maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java Modified: maven/ant-tasks/trunk/sample.build.xml URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/sample.build.xml?rev=593949&r1=593948&r2=593949&view=diff ============================================================================== --- maven/ant-tasks/trunk/sample.build.xml (original) +++ maven/ant-tasks/trunk/sample.build.xml Sun Nov 11 12:36:09 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/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=593949&r1=593948&r2=593949&view=diff ============================================================================== --- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original) +++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Sun Nov 11 12:36:09 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/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java?rev=593949&r1=593948&r2=593949&view=diff ============================================================================== --- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java (original) +++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java Sun Nov 11 12:36:09 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 ); }