dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #34035
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17457: reverted back to jackson 2.3.4, 2.4.x have issues with @JsonIgnore, which makes get/set password ...
------------------------------------------------------------
revno: 17457
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-11-13 13:28:09 +0545
message:
reverted back to jackson 2.3.4, 2.4.x have issues with @JsonIgnore, which makes get/set password not working
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java
dhis-2/pom.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== 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>