summaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2011-11-22 20:50:52 +0000
committerOlivier Lamy <olamy@apache.org>2011-11-22 20:50:52 +0000
commit9af8fa3b5659615272b301494013fd413eb86cca (patch)
tree0fa976e36a4151b5d8c1bdcbe080fb5131d1bb55 /pom.xml
parentf27b17b032ad3f6db68c3235666152094c65c060 (diff)
downloadarchiva-9af8fa3b5659615272b301494013fd413eb86cca.tar.gz
archiva-9af8fa3b5659615272b301494013fd413eb86cca.zip
ensure we have only one velocity jar
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1205162 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/pom.xml b/pom.xml
index 3870d4657..b73f20ae2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -900,6 +900,11 @@
</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>
<version>${redback.version}</version>
@@ -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>