=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2014-03-27 10:12:41 +0000
+++ dhis-2/pom.xml	2014-03-28 09:11:30 +0000
@@ -502,11 +502,18 @@
         <version>1.0.2.RELEASE</version>
       </dependency>
 
-      <!--Other -->
+      <!-- Other -->
+      <!-- Javassist from hibernate-core -->
       <dependency>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-core</artifactId>
         <version>2.3.16</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javassist</groupId>
+            <artifactId>javassist</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.struts</groupId>