Author: brett
Date: Fri Sep 2 23:18:23 2005
New Revision: 267425
URL: http://svn.apache.org/viewcvs?rev=267425&view=rev
Log:
PR: MNG-795
create an empty fileset if there were no dependencies downloaded
Modified:
maven/components/trunk/maven-artifact-ant/sample.build.xml
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
Modified: maven/components/trunk/maven-artifact-ant/sample.build.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/sample.build.xml?rev=267425&r1=267424&r2=267425&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/sample.build.xml (original)
+++ maven/components/trunk/maven-artifact-ant/sample.build.xml Fri Sep 2
23:18:23 2005
@@ -28,6 +28,14 @@
</typedef>
</target>
+ <target name="test-no-deps" depends="initTaskDefs">
+ <artifact:dependencies filesetId="runtime.fileset">
+ </artifact:dependencies>
+ <copy todir="target/test-no-deps" verbose="true">
+ <fileset refid="runtime.fileset" />
+ </copy>
+ </target>
+
<target name="test-bad-dep" depends="initTaskDefs">
<artifact:dependencies pathId="dependency.classpath"
filesetId="dependency.fileset">
<dependency groupId="foo" artifactId="foo" version="1.0-alpha-2"/>
Modified:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java?rev=267425&r1=267424&r2=267425&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
(original)
+++
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
Fri Sep 2 23:18:23 2005
@@ -32,6 +32,7 @@
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.artifact.MavenMetadataSource;
import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.FileList;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
@@ -102,6 +103,11 @@
pom = createDummyPom();
}
+ if ( dependencies.isEmpty() )
+ {
+ log( "There were no dependencies specified", Project.MSG_WARN );
+ }
+
Set artifacts;
try
{
@@ -165,17 +171,24 @@
FileSet fileSet = new FileSet();
fileSet.setDir( fileList.getDir( getProject() ) );
- for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
+ if ( result.getArtifacts().isEmpty() )
{
- Artifact artifact = (Artifact) i.next();
- String filename = localRepo.pathOf( artifact );
-
- FileList.FileName file = new FileList.FileName();
- file.setName( filename );
-
- fileList.addConfiguredFile( file );
-
- fileSet.createInclude().setName( filename );
+ fileSet.createExclude().setName( "**/**" );
+ }
+ else
+ {
+ for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
+ {
+ Artifact artifact = (Artifact) i.next();
+ String filename = localRepo.pathOf( artifact );
+
+ FileList.FileName file = new FileList.FileName();
+ file.setName( filename );
+
+ fileList.addConfiguredFile( file );
+
+ fileSet.createInclude().setName( filename );
+ }
}
if ( pathId != null )
Modified:
maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml?rev=267425&r1=267424&r2=267425&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
Fri Sep 2 23:18:23 2005
@@ -192,11 +192,6 @@
<role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
<field-name>artifactTransformations</field-name>
</requirement>
- <requirement>
-
<role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
- <role-hint>snapshot</role-hint>
- <field-name>snapshotTransformation</field-name>
- </requirement>
</requirements>
</component>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
