Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ensure we have only one velocity jar 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1205162 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-11-22 20:50:52 +00:00
parent f27b17b032
commit 9af8fa3b56
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

@ -511,6 +511,10 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
@ -525,6 +529,10 @@
<groupId>velocity</groupId>
<artifactId>velocity-dep</artifactId>
</exclusion>
<exclusion>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
</exclusion>
<exclusion>
<groupId>struts</groupId>
<artifactId>struts</artifactId>

6
pom.xml
View File

@ -899,6 +899,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.7</version>
</dependency>
<dependency>
<groupId>org.codehaus.redback</groupId>
<artifactId>redback-rbac-cached</artifactId>
@ -1434,6 +1439,7 @@
<exclude>commons-logging:commons-logging</exclude>
<exclude>org.slf4j:jcl104-over-slf4j</exclude>
<exclude>velocity:velocity-dep</exclude>
<exclude>velocity:velocity</exclude>
<exclude>classworlds:classworlds</exclude>
<exclude>javax.transaction:jta</exclude>
<exclude>javax.sql:jdbc-stdext</exclude>