------------------------------------------------------------
revno: 17655
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Thu 2014-12-04 16:28:27 +0700
message:
upgrade to jackson 2.4.4, remove @JsonIgnore on getPassword as its not
needed, only having annotation on setPassword is enough (and getPassword will
be ignored)
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-11-21 03:45:38 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java 2014-12-04 09:28:27 +0000
@@ -445,7 +445,6 @@
// Getters and setters
// -------------------------------------------------------------------------
- @JsonIgnore
public String getPassword()
{
return password;
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2014-12-04 07:22:08 +0000
+++ dhis-2/pom.xml 2014-12-04 09:28:27 +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.3.4</jackson.version>
+ <jackson.version>2.4.4</jackson.version>
<camel.version>2.10.2</camel.version>
<slf4j.version>1.6.6</slf4j.version>
<geotools.version>9.3</geotools.version>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
