Author: pgier
Date: Wed May 6 15:51:12 2009
New Revision: 772326
URL: http://svn.apache.org/viewvc?rev=772326&view=rev
Log:
[MANTTASKS-106] Change relocation shade pattern to avoid conflicts with other
projects. Improve the IT for calling ant from maven.
Modified:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/it/ant-tasks-in-ant-run-plugin/build.xml
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/it/ant-tasks-in-ant-run-plugin/verify.bsh
Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml?rev=772326&r1=772325&r2=772326&view=diff
==============================================================================
--- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml (original)
+++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml Wed May 6 15:51:12
2009
@@ -218,6 +218,16 @@
<exclude>ant:ant</exclude>
</excludes>
</artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>org.codehaus.plexus.util</pattern>
+
<shadedPattern>org.apache.maven.artifact.ant.shaded</shadedPattern>
+ <excludes>
+ <exclude>org.codehaus.plexus.util.xml.Xpp3Dom</exclude>
+ <exclude>org.codehaus.plexus.util.xml.pull.*</exclude>
+ </excludes>
+ </relocation>
+ </relocations>
</configuration>
</execution>
</executions>
Modified:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/it/ant-tasks-in-ant-run-plugin/build.xml
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/it/ant-tasks-in-ant-run-plugin/build.xml?rev=772326&r1=772325&r2=772326&view=diff
==============================================================================
---
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/it/ant-tasks-in-ant-run-plugin/build.xml
(original)
+++
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/it/ant-tasks-in-ant-run-plugin/build.xml
Wed May 6 15:51:12 2009
@@ -12,9 +12,14 @@
<target name="test" depends="initTaskDefs">
<artifact:localRepository id="local.repository"
path="${basedir}/target/local-repo" layout="default"/>
- <artifact:pom file="pom.xml" id="maven.project"/>
+ <artifact:pom file="pom.xml" id="mypom"/>
<mkdir dir="target"/>
- <touch file="target/${maven.project.build.finalName}"/>
+ <touch file="target/${mypom.build.finalName}"/>
+
+ <artifact:dependencies fileSetId="mydeps" pomRefId="mypom"/>
+ <copy todir="target">
+ <fileset refid="mydeps"/>
+ </copy>
</target>
</project>
\ No newline at end of file
Modified:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/it/ant-tasks-in-ant-run-plugin/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/it/ant-tasks-in-ant-run-plugin/verify.bsh?rev=772326&r1=772325&r2=772326&view=diff
==============================================================================
---
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/it/ant-tasks-in-ant-run-plugin/verify.bsh
(original)
+++
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/it/ant-tasks-in-ant-run-plugin/verify.bsh
Wed May 6 15:51:12 2009
@@ -13,6 +13,13 @@
return false;
}
+ File depFile = new File( outputFolder,
"org/apache/commons/commons-io/1.3.2/commons-io-1.3.2.jar");
+ if ( !depFile.isFile() )
+ {
+ System.err.println( "Could not find copied dependency file: " +
depFile );
+ return false;
+ }
+
}
catch( Throwable t )
{
