ensure we have only one velocity jar

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1205162 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index be873fdb13302446966ca038296d1c5d8626d876..a3160a526fb45d3e118686b37dae574cf7a9dff3 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -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>

diff --git a/pom.xml b/pom.xml
index 3870d4657d1309c8a618e0702672bc9915a33689..b73f20ae238812fc1afdf9c19dfb1e88d24e4647 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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>