=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/DefaultCsvEventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/DefaultCsvEventService.java	2015-09-13 21:54:23 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/DefaultCsvEventService.java	2015-10-01 11:50:55 +0000
@@ -111,7 +111,7 @@
     {
         Events events = new Events();
 
-        ObjectReader reader = CSV_MAPPER.reader( CsvEventDataValue.class )
+        ObjectReader reader = CSV_MAPPER.readerFor( CsvEventDataValue.class )
             .with( CSV_SCHEMA.withSkipFirstDataRow( skipFirst ) );
 
         MappingIterator<CsvEventDataValue> iterator = reader.readValues( inputStream );

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultExportService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultExportService.java	2015-07-14 07:33:21 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultExportService.java	2015-10-01 11:50:55 +0000
@@ -104,6 +104,7 @@
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public MetaData getMetaData( Options options, TaskId taskId )
     {
         MetaData metaData = new MetaData();