=== modified file 'dhis-2/dhis-api/pom.xml'
--- dhis-2/dhis-api/pom.xml 2012-03-12 13:27:35 +0000
+++ dhis-2/dhis-api/pom.xml 2012-03-30 13:07:32 +0000
@@ -36,6 +36,7 @@
net.sf.jasperreports
jasperreports
+
org.codehaus.jackson
jackson-core-asl
@@ -56,12 +57,10 @@
com.fasterxml.jackson.core
jackson-core
-
com.fasterxml.jackson.core
jackson-annotations
-
com.fasterxml.jackson.dataformat
jackson-dataformat-xml
=== modified file 'dhis-2/dhis-dxf2/pom.xml'
--- dhis-2/dhis-dxf2/pom.xml 2012-03-29 21:52:27 +0000
+++ dhis-2/dhis-dxf2/pom.xml 2012-03-30 13:07:32 +0000
@@ -52,8 +52,7 @@
javax.xml.bind
jaxb-api
-
-
+
com.fasterxml.jackson.core
jackson-core
=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/message/Message.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/message/Message.java 2012-03-28 16:14:44 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/message/Message.java 2012-03-30 13:07:32 +0000
@@ -27,12 +27,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.hisp.dhis.common.BaseIdentifiableObject;
import org.hisp.dhis.common.Dxf2Namespace;
import org.hisp.dhis.common.view.DetailedView;
=== modified file 'dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsMapObject.java'
--- dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsMapObject.java 2012-03-25 16:40:59 +0000
+++ dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsMapObject.java 2012-03-30 13:07:32 +0000
@@ -27,11 +27,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.map.ObjectMapper;
import org.hisp.dhis.organisationunit.OrganisationUnit;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.vividsolutions.jts.geom.Geometry;
/**
=== modified file 'dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsPrimitiveFromJsonFactory.java'
--- dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsPrimitiveFromJsonFactory.java 2011-12-13 11:36:45 +0000
+++ dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsPrimitiveFromJsonFactory.java 2012-03-30 13:07:32 +0000
@@ -29,9 +29,9 @@
import net.sf.json.JSONException;
-import org.codehaus.jackson.JsonNode;
import org.geotools.geometry.jts.JTSFactoryFinder;
+import com.fasterxml.jackson.databind.JsonNode;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.GeometryFactory;
import com.vividsolutions.jts.geom.LinearRing;
=== modified file 'dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/MapUtils.java'
--- dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/MapUtils.java 2011-12-13 11:36:45 +0000
+++ dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/MapUtils.java 2012-03-30 13:07:32 +0000
@@ -29,7 +29,7 @@
import java.awt.Color;
-import org.codehaus.jackson.JsonNode;
+import com.fasterxml.jackson.databind.JsonNode;
/**
* Utility class.
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2012-03-26 07:44:30 +0000
+++ dhis-2/pom.xml 2012-03-30 13:07:32 +0000
@@ -642,7 +642,7 @@
net.sf.jasperreports
jasperreports
- 4.1.1
+ 4.5.1
xalan