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 2007/10/19 22:50:56 UTC
svn commit: r586606 - in /maven/ant-tasks/trunk: sample.build.xml
src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
Author: hboutemy
Date: Fri Oct 19 13:50:55 2007
New Revision: 586606
URL: http://svn.apache.org/viewvc?rev=586606&view=rev
Log:
[MANTTASKS-84] VersionMapper does not work on SNAPSHOT dependencies where uniqueVersion="true"
Modified:
maven/ant-tasks/trunk/sample.build.xml
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=586606&r1=586605&r2=586606&view=diff
==============================================================================
--- maven/ant-tasks/trunk/sample.build.xml (original)
+++ maven/ant-tasks/trunk/sample.build.xml Fri Oct 19 13:50:55 2007
@@ -88,7 +88,7 @@
</target>
<target name="test-deps" depends="initTaskDefs">
- <artifact:dependencies pathId="dependency.classpath" filesetId="dependency.fileset" sourcesFilesetId="sources.fileset" verbose="true">
+ <artifact:dependencies pathId="dependency.classpath" filesetId="dependency.fileset" sourcesFilesetId="sources.fileset" verbose="true" versionsId="dependency.versions">
<dependency groupId="org.apache.maven.wagon" artifactId="wagon-provider-test" version="1.0-alpha-4">
<exclusion groupId="junit" artifactId="junit"/>
</dependency>
@@ -116,6 +116,15 @@
<available file="target/files/binaries/it/ant-tasks/snapshotUniqueTrue" type="dir" property="snapshot.dependency.uniqueTrue"/>
<!-- MANTTASKS-18 -->
<fail unless="snapshot.dependency.uniqueTrue">SNAPSHOT dependency it.ant-tasks:snapshotUniqueTrue:2.0.7-SNAPSHOT should be in target/files/binaries</fail>
+
+ <!-- MANTTASKS-84 -->
+ <copy todir="target/files/versionMapperFlatten">
+ <fileset refid="dependency.fileset"/>
+ <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper"
+ from="${dependency.versions}" to="flatten" />
+ </copy>
+ <available file="target/files/versionMapperFlatten/it" type="dir" property="snapshot.dependency.flatten.failed"/>
+ <fail if="snapshot.dependency.flatten.failed">VersionMapper to="flatten" failed on SNAPSHOT</fail>
</target>
<target name="test-pom-deps" depends="initTaskDefs">
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=586606&r1=586605&r2=586606&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 Fri Oct 19 13:50:55 2007
@@ -233,7 +233,7 @@
fileSet.createInclude().setName( filename );
- versions.add( artifact.getBaseVersion() );
+ versions.add( artifact.getVersion() );
if ( sourcesFilesetId != null )
{