Index: src/main/java/org/apache/maven/artifact/ant/InstallDeployTaskSupport.java
===================================================================
--- src/main/java/org/apache/maven/artifact/ant/InstallDeployTaskSupport.java	(revision 545865)
+++ src/main/java/org/apache/maven/artifact/ant/InstallDeployTaskSupport.java	(working copy)
@@ -21,18 +21,10 @@
 
 import java.io.File;
 import java.util.List;
-import java.util.Iterator;
 import java.util.ArrayList;
 
-import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.installer.ArtifactInstaller;
-import org.apache.maven.artifact.installer.ArtifactInstallationException;
-import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.project.MavenProjectBuilder;
-import org.apache.maven.project.artifact.ProjectArtifactMetadata;
-import org.apache.tools.ant.BuildException;
 
 /**
  * Support for install/deploy tasks.
Index: src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
===================================================================
--- src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java	(revision 545865)
+++ src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java	(working copy)
@@ -232,6 +232,7 @@
             for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
             {
                 Artifact artifact = (Artifact) i.next();
+                artifact.isSnapshot(); // MNG-2961: DefaultArtifact getBaseVersion is changed to "xxxx-SNAPSHOT" only if you first call isSnapshot()
                 String filename = localRepo.pathOf( artifact );
 
                 FileList.FileName file = new FileList.FileName();
Index: src/main/java/org/apache/maven/artifact/ant/Repository.java
===================================================================
--- src/main/java/org/apache/maven/artifact/ant/Repository.java	(revision 545865)
+++ src/main/java/org/apache/maven/artifact/ant/Repository.java	(working copy)
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.ProjectComponent;
 
 /**
Index: src/main/java/org/apache/maven/artifact/ant/InstallTask.java
===================================================================
--- src/main/java/org/apache/maven/artifact/ant/InstallTask.java	(revision 545865)
+++ src/main/java/org/apache/maven/artifact/ant/InstallTask.java	(working copy)
@@ -20,7 +20,6 @@
  */
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.installer.ArtifactInstallationException;
 import org.apache.maven.artifact.installer.ArtifactInstaller;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
@@ -29,9 +28,6 @@
 import org.apache.maven.project.artifact.ProjectArtifactMetadata;
 import org.apache.tools.ant.BuildException;
 
-import java.io.File;
-import java.util.List;
-import java.util.ArrayList;
 import java.util.Iterator;
 
 /**
Index: sample.build.xml
===================================================================
--- sample.build.xml	(revision 545865)
+++ sample.build.xml	(working copy)
@@ -86,13 +86,12 @@
       <dependency groupId="org.apache.maven.wagon" artifactId="wagon-provider-test" version="1.0-alpha-4">
         <exclusion groupId="junit" artifactId="junit"/>
       </dependency>
-      <dependency groupId="org.apache.maven.archiva" artifactId="archiva-configuration" version="1.0-SNAPSHOT">
-        <exclusion groupId="junit" artifactId="junit"/>
-      </dependency>
       <dependency groupId="org.apache.maven" artifactId="maven-core-it-support-old-location" version="1.1"/>
+      <dependency groupId="it.ant-tasks" artifactId="snapshotUniqueFalse" version="2.0.7-SNAPSHOT"/>
+      <dependency groupId="it.ant-tasks" artifactId="snapshotUniqueTrue" version="2.0.7-SNAPSHOT"/>
       <localRepository refid="local.repository"/>
       <remoteRepository url="http://repo1.maven.org/maven2" id="central" />
-      <remoteRepository url="http://people.apache.org/repo/m2-snapshot-repository">
+      <remoteRepository url="file://${user.dir}/src/test/repo">
         <snapshots enabled="true"/>
         <releases enabled="false"/>
       </remoteRepository>
@@ -106,9 +105,11 @@
     </copy>
     <available file="target/files/binaries/junit/junit" type="dir" property="exclusion.dependency"/>
     <fail if="exclusion.dependency">excluded dependency junit:junit shouldn't be in target/files/binaries</fail>
-    <available file="target/files/binaries/org/apache/maven/archive/archiva-configuration" type="dir" property="snapshot.dependency"/>
+    <available file="target/files/binaries/it/ant-tasks/snapshotUniqueFalse" type="dir" property="snapshot.dependency.uniqueFalse"/>
+    <fail unless="snapshot.dependency.uniqueFalse">SNAPSHOT dependency it.ant-tasks:snapshotUniqueFalse:2.0.7-SNAPSHOT should be in target/files/binaries</fail>
+    <available file="target/files/binaries/it/ant-tasks/snapshotUniqueTrue" type="dir" property="snapshot.dependency.uniqueTrue"/>
     <!-- MANTTASKS-18 -->
-    <fail unless="snapshot.dependency">SNAPSHOT dependency org.apache.maven.archiva:archiva-configuration:1.0-SNAPSHOT should be in target/files/binaries</fail>
+    <fail unless="snapshot.dependency.uniqueTrue">SNAPSHOT dependency it.ant-tasks:snapshotUniqueTrue:2.0.7-SNAPSHOT should be in target/files/binaries</fail>
   </target>
 
   <target name="test-pom-deps" depends="initTaskDefs">

