You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/09/14 01:32:58 UTC
svn commit: r814438 - in /maven/ant-tasks/trunk: ./
src/main/java/org/apache/maven/artifact/ant/
src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/
Author: bentmann
Date: Sun Sep 13 23:32:58 2009
New Revision: 814438
URL: http://svn.apache.org/viewvc?rev=814438&view=rev
Log:
[MANTTASKS-160] Wrong metadata files created for mirrored remote repositories
Added:
maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/
- copied from r814380, maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.7-SNAPSHOT/
maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/snapshotUniqueTrue-2.0.8-20070610.180356-1.jar
- copied unchanged from r814380, maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.7-SNAPSHOT/snapshotUniqueTrue-2.0.7-20070610.180356-1.jar
maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/snapshotUniqueTrue-2.0.8-20070610.180356-1.jar.md5
- copied unchanged from r814380, maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.7-SNAPSHOT/snapshotUniqueTrue-2.0.7-20070610.180356-1.jar.md5
maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/snapshotUniqueTrue-2.0.8-20070610.180356-1.jar.sha1
- copied unchanged from r814380, maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.7-SNAPSHOT/snapshotUniqueTrue-2.0.7-20070610.180356-1.jar.sha1
maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/snapshotUniqueTrue-2.0.8-20070610.180356-1.pom
- copied unchanged from r814380, maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.7-SNAPSHOT/snapshotUniqueTrue-2.0.7-20070610.180356-1.pom
maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/snapshotUniqueTrue-2.0.8-20070610.180356-1.pom.md5
- copied unchanged from r814380, maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.7-SNAPSHOT/snapshotUniqueTrue-2.0.7-20070610.180356-1.pom.md5
maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/snapshotUniqueTrue-2.0.8-20070610.180356-1.pom.sha1
- copied unchanged from r814380, maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.7-SNAPSHOT/snapshotUniqueTrue-2.0.7-20070610.180356-1.pom.sha1
Removed:
maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/snapshotUniqueTrue-2.0.7-20070610.180356-1.jar
maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/snapshotUniqueTrue-2.0.7-20070610.180356-1.jar.md5
maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/snapshotUniqueTrue-2.0.7-20070610.180356-1.jar.sha1
maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/snapshotUniqueTrue-2.0.7-20070610.180356-1.pom
maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/snapshotUniqueTrue-2.0.7-20070610.180356-1.pom.md5
maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/snapshotUniqueTrue-2.0.7-20070610.180356-1.pom.sha1
Modified:
maven/ant-tasks/trunk/sample.build.xml
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/maven-metadata.xml
Modified: maven/ant-tasks/trunk/sample.build.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/sample.build.xml?rev=814438&r1=814437&r2=814438&view=diff
==============================================================================
--- maven/ant-tasks/trunk/sample.build.xml (original)
+++ maven/ant-tasks/trunk/sample.build.xml Sun Sep 13 23:32:58 2009
@@ -275,10 +275,12 @@
<!-- MANTTASKS-141 -->
<delete dir="${basedir}/target/tmp"/>
<artifact:dependencies settingsFile="${basedir}/src/test/settings-mirror-complex.xml">
- <dependency groupId="it.ant-tasks" artifactId="snapshotUniqueFalse" version="2.0.7-SNAPSHOT"/>
+ <dependency groupId="it.ant-tasks" artifactId="snapshotUniqueTrue" version="2.0.8-SNAPSHOT"/>
<localRepository path="${basedir}/target/tmp"/>
<remoteRepository url="file://${basedir}/target/fake/repository" id="test" />
</artifact:dependencies>
+ <check.file.not.exists file="target/tmp/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/maven-metadata-test.xml" type="file"/>
+ <check.file.exists file="target/tmp/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/maven-metadata-mirror-cd.xml" type="file"/>
<!-- MANTTASKS-141 -->
<delete dir="${basedir}/target/tmp"/>
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=814438&r1=814437&r2=814438&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Sun Sep 13 23:32:58 2009
@@ -449,6 +449,7 @@
if ( mirror != null )
{
repository.setUrl( mirror.getUrl() );
+ repository.setId( mirror.getId() );
}
}
Modified: maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/maven-metadata.xml?rev=814438&r1=814380&r2=814438&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/maven-metadata.xml (original)
+++ maven/ant-tasks/trunk/src/test/repo/it/ant-tasks/snapshotUniqueTrue/2.0.8-SNAPSHOT/maven-metadata.xml Sun Sep 13 23:32:58 2009
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?><metadata>
<groupId>it.ant-tasks</groupId>
<artifactId>snapshotUniqueTrue</artifactId>
- <version>2.0.7-SNAPSHOT</version>
+ <version>2.0.8-SNAPSHOT</version>
<versioning>
<snapshot>
<timestamp>20070610.180356</timestamp>