diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-11-22 20:50:52 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-11-22 20:50:52 +0000 |
| commit | 9af8fa3b5659615272b301494013fd413eb86cca (patch) | |
| tree | 0fa976e36a4151b5d8c1bdcbe080fb5131d1bb55 /archiva-modules | |
| parent | f27b17b032ad3f6db68c3235666152094c65c060 (diff) | |
| download | archiva-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 'archiva-modules')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/pom.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index be873fdb1..a3160a526 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -513,6 +513,10 @@ </dependency> <dependency> <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + </dependency> + <dependency> + <groupId>org.apache.velocity</groupId> <artifactId>velocity-tools</artifactId> <version>1.3</version> <scope>runtime</scope> @@ -526,6 +530,10 @@ <artifactId>velocity-dep</artifactId> </exclusion> <exclusion> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + <exclusion> <groupId>struts</groupId> <artifactId>struts</artifactId> </exclusion> |