=== modified file 'dhis-2/dhis-support/dhis-support-system/pom.xml'
--- dhis-2/dhis-support/dhis-support-system/pom.xml	2011-10-14 16:54:27 +0000
+++ dhis-2/dhis-support/dhis-support-system/pom.xml	2011-11-13 18:05:12 +0000
@@ -116,11 +116,11 @@
       <artifactId>jxl</artifactId>
     </dependency>
     <dependency>
-      <groupId>velocity</groupId>
+      <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
     </dependency>
     <dependency>
-      <groupId>velocity-tools</groupId>
+      <groupId>org.apache.velocity</groupId>
       <artifactId>velocity-tools</artifactId>
     </dependency>
     <dependency>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/pom.xml'
--- dhis-2/dhis-web/dhis-web-commons/pom.xml	2011-10-14 16:54:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons/pom.xml	2011-11-13 18:05:12 +0000
@@ -90,11 +90,11 @@
       <artifactId>struts2-spring-plugin</artifactId>
     </dependency>
     <dependency>
-      <groupId>velocity</groupId>
+      <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
     </dependency>
     <dependency>
-      <groupId>velocity-tools</groupId>
+      <groupId>org.apache.velocity</groupId>
       <artifactId>velocity-tools</artifactId>
     </dependency>
     <dependency>

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2011-11-12 15:46:34 +0000
+++ dhis-2/pom.xml	2011-11-13 18:05:12 +0000
@@ -394,14 +394,20 @@
         <version>2.2.3.1</version>
       </dependency>
       <dependency>
-        <groupId>velocity</groupId>
+        <groupId>org.apache.velocity</groupId>
         <artifactId>velocity</artifactId>
-        <version>1.5</version>
+        <version>1.7</version>
       </dependency>
       <dependency>
-        <groupId>velocity-tools</groupId>
+        <groupId>org.apache.velocity</groupId>
         <artifactId>velocity-tools</artifactId>
-        <version>1.2</version>
+        <version>2.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>antlr</groupId>
+            <artifactId>antlr</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.poi</groupId>