Author: bentmann
Date: Sun Sep 13 22:12:56 2009
New Revision: 814397
URL: http://svn.apache.org/viewvc?rev=814397&view=rev
Log:
[MANTTASKS-141] Using expressions in a mirrorOf element brakes the downloading
of depencies
o Added some tests
Added:
maven/ant-tasks/trunk/src/test/settings-mirror-complex.xml (with props)
Modified:
maven/ant-tasks/trunk/sample.build.xml
maven/ant-tasks/trunk/src/test/settings-mirror-wildcard.xml
maven/ant-tasks/trunk/src/test/settings-mirror.xml (contents, props
changed)
Modified: maven/ant-tasks/trunk/sample.build.xml
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/sample.build.xml?rev=814397&r1=814396&r2=814397&view=diff
==============================================================================
--- maven/ant-tasks/trunk/sample.build.xml (original)
+++ maven/ant-tasks/trunk/sample.build.xml Sun Sep 13 22:12:56 2009
@@ -271,6 +271,22 @@
<localRepository path="${basedir}/target/tmp"/>
<remoteRepository url="file://${basedir}/target/fake/repository"
id="any" />
</artifact:dependencies>
+
+ <!-- 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"/>
+ <localRepository path="${basedir}/target/tmp"/>
+ <remoteRepository url="file://${basedir}/target/fake/repository"
id="test" />
+ </artifact:dependencies>
+
+ <!-- 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"/>
+ <localRepository path="${basedir}/target/tmp"/>
+ <remoteRepository url="file://${basedir}/target/fake/repository"
id="yat" />
+ </artifact:dependencies>
</target>
<target name="test-deps-two-repos" depends="initTaskDefs">
Added: maven/ant-tasks/trunk/src/test/settings-mirror-complex.xml
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/test/settings-mirror-complex.xml?rev=814397&view=auto
==============================================================================
--- maven/ant-tasks/trunk/src/test/settings-mirror-complex.xml (added)
+++ maven/ant-tasks/trunk/src/test/settings-mirror-complex.xml Sun Sep 13
22:12:56 2009
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd";>
+ <mirrors>
+ <mirror>
+ <id>mirror-ca</id>
+ <url>file:./target/null-repo</url>
+ <mirrorOf>*,!test</mirrorOf>
+ </mirror>
+ <mirror>
+ <id>mirror-cb</id>
+ <url>file:./target/null-repo</url>
+ <mirrorOf>foo,yat</mirrorOf>
+ </mirror>
+ <mirror>
+ <id>mirror-cc</id>
+ <url>file:./src/test/repo</url>
+ <mirrorOf>yat</mirrorOf>
+ </mirror>
+ <mirror>
+ <id>mirror-cd</id>
+ <url>file:./src/test/repo</url>
+ <mirrorOf>dummy,test</mirrorOf>
+ </mirror>
+ </mirrors>
+</settings>
\ No newline at end of file
Propchange: maven/ant-tasks/trunk/src/test/settings-mirror-complex.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/ant-tasks/trunk/src/test/settings-mirror-complex.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/ant-tasks/trunk/src/test/settings-mirror-wildcard.xml
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/test/settings-mirror-wildcard.xml?rev=814397&r1=814396&r2=814397&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/test/settings-mirror-wildcard.xml (original)
+++ maven/ant-tasks/trunk/src/test/settings-mirror-wildcard.xml Sun Sep 13
22:12:56 2009
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd";>
<mirrors>
<mirror>
- <id>wildcard</id>
+ <id>mirror-b</id>
<url>file:./src/test/repo</url>
<mirrorOf>*</mirrorOf>
</mirror>
Modified: maven/ant-tasks/trunk/src/test/settings-mirror.xml
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/test/settings-mirror.xml?rev=814397&r1=814396&r2=814397&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/test/settings-mirror.xml (original)
+++ maven/ant-tasks/trunk/src/test/settings-mirror.xml Sun Sep 13 22:12:56 2009
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd";>
<mirrors>
<mirror>
- <id>fake-mirror</id>
+ <id>mirror-a</id>
<url>file:./src/test/repo</url>
<mirrorOf>fake-repository</mirrorOf>
</mirror>
Propchange: maven/ant-tasks/trunk/src/test/settings-mirror.xml
------------------------------------------------------------------------------
svn:eol-style = native
