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 2010/07/19 22:11:05 UTC
svn commit: r965613 -
/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
Author: hboutemy
Date: Mon Jul 19 20:11:05 2010
New Revision: 965613
URL: http://svn.apache.org/viewvc?rev=965613&view=rev
Log:
[MANTTASKS-188] fixed dependencyRefsBuildFile attribute with absolute path
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=965613&r1=965612&r2=965613&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 Mon Jul 19 20:11:05 2010
@@ -40,6 +40,7 @@ import org.apache.tools.ant.BuildExcepti
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
+import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
@@ -326,9 +327,9 @@ public class DependenciesTask
{
setDependencyRefsBuildFile( DEFAULT_ANT_BUILD_FILE );
}
- log( "Building ant file: " + getDependencyRefsBuildFile());
+ log( "Building ant file: " + getDependencyRefsBuildFile() );
AntBuildWriter antBuildWriter = new AntBuildWriter();
- File antBuildFile = new File( getProject().getBaseDir(), getDependencyRefsBuildFile() );
+ File antBuildFile = FileUtils.resolveFile( getProject().getBaseDir(), getDependencyRefsBuildFile() );
try
{
antBuildWriter.openAntBuild( antBuildFile, "maven-dependencies", "init-dependencies" );
@@ -337,16 +338,16 @@ public class DependenciesTask
for ( Iterator<Artifact> i = result.getArtifacts().iterator(); i.hasNext(); )
{
- Artifact artifact = (Artifact) i.next();
+ Artifact artifact = i.next();
String conflictId = artifact.getDependencyConflictId();
antBuildWriter.writeProperty( conflictId, artifact.getFile().getAbsolutePath() );
- FileSet singleArtifactFileSet = (FileSet)getProject().getReference( conflictId );
+ FileSet singleArtifactFileSet = (FileSet) getProject().getReference( conflictId );
antBuildWriter.writeFileSet( singleArtifactFileSet, conflictId );
}
if ( pathId != null )
{
- Path thePath = (Path)getProject().getReference( pathId );
+ Path thePath = (Path) getProject().getReference( pathId );
antBuildWriter.writePath( thePath, pathId );
}
@@ -385,7 +386,7 @@ public class DependenciesTask
*/
private boolean checkCachedDependencies()
{
- File cacheBuildFile = new File( getProject().getBaseDir(), getDependencyRefsBuildFile() );
+ File cacheBuildFile = FileUtils.resolveFile( getProject().getBaseDir(), getDependencyRefsBuildFile() );
if ( ! cacheBuildFile.exists() )
{
return false;