Author: hboutemy
Date: Wed Jun 30 19:16:30 2010
New Revision: 959414
URL: http://svn.apache.org/viewvc?rev=959414&view=rev
Log:
added an exclusion to velocity:velocity which is a duplicate of
org.apache.velocity:velocity
Modified:
maven/plugins/branches/maven-site-plugin-3.x/pom.xml
Modified: maven/plugins/branches/maven-site-plugin-3.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/pom.xml?rev=959414&r1=959413&r2=959414&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Wed Jun 30 19:16:30
2010
@@ -281,12 +281,18 @@ under the License.
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
<version>1.1.8</version>
+ <exclusions>
+ <exclusion><!-- not needed with 1.1.9+ -->
+ <artifactId>velocity</artifactId>
+ <groupId>velocity</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-doxia-tools</artifactId>
- <version>1.2.1</version>
+ <version>1.3-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
