=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2014-10-16 06:17:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java	2014-11-13 07:43:09 +0000
@@ -347,6 +347,7 @@
      * Tests whether the credentials contain all needed parameters to
      * perform an account restore.
      * If a parameter is missing a descriptive error string is returned.
+     *
      * @return null on success, a descriptive error string on failure.
      */
     public String isRestorable()

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2014-11-10 19:40:12 +0000
+++ dhis-2/pom.xml	2014-11-13 07:43:09 +0000
@@ -986,7 +986,7 @@
     <struts.version>2.3.16.3</struts.version>
     <hibernate.version>4.2.0.Final</hibernate.version>
     <hibernate-validator.version>4.3.1.Final</hibernate-validator.version>
-    <jackson.version>2.4.1</jackson.version>
+    <jackson.version>2.3.4</jackson.version>
     <camel.version>2.10.2</camel.version>
     <slf4j.version>1.6.6</slf4j.version>
     <geotools.version>9.3</geotools.version>