You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by pg...@apache.org on 2009/06/24 22:05:59 UTC
svn commit: r788165 -
/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
Author: pgier
Date: Wed Jun 24 20:05:58 2009
New Revision: 788165
URL: http://svn.apache.org/viewvc?rev=788165&view=rev
Log:
[MANTTASKS-155] Make sure project reference is set for all Filesets.
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
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=788165&r1=788164&r2=788165&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 Wed Jun 24 20:05:58 2009
@@ -186,15 +186,11 @@
FileList fileList = new FileList();
fileList.setDir( getLocalRepository().getPath() );
- FileSet fileSet = new FileSet();
- fileSet.setProject( getProject() );
- fileSet.setDir( fileList.getDir( getProject() ) );
+ FileSet fileSet = createFileSet();
- FileSet sourcesFileSet = new FileSet();
- sourcesFileSet.setDir( getLocalRepository().getPath() );
+ FileSet sourcesFileSet = createFileSet();
- FileSet javadocsFileSet = new FileSet();
- javadocsFileSet.setDir( getLocalRepository().getPath() );
+ FileSet javadocsFileSet = createFileSet();
Set versions = new HashSet();
@@ -241,6 +237,14 @@
getProject().setNewProperty( versionsId, versionsValue );
}
}
+
+ private FileSet createFileSet()
+ {
+ FileSet fileSet = new FileSet();
+ fileSet.setProject( getProject() );
+ fileSet.setDir( getLocalRepository().getPath() );
+ return fileSet;
+ }
private void defineFilesetReference( String id, FileSet fileSet )
{
@@ -278,7 +282,7 @@
if ( isAddArtifactFileSetRefs() )
{
- FileSet artifactFileSet = new FileSet();
+ FileSet artifactFileSet = createFileSet();
artifactFileSet.setFile( artifact.getFile() );
getProject().addReference( artifact.getDependencyConflictId(), artifactFileSet );
}