Upgraded to Jackson 2.4

pom.xml

@@ -40,18 +40,15 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
-      <version>1.9.12</version>
-      <type>jar</type>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>2.4.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>1.9.12</version>
-      <type>jar</type>
-      <scope>provided</scope>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.4.1</version>
     </dependency>
   </dependencies>
 </project>

src/main/java/no/bioforsk/vips/model/applescabmodel/AppleScabModel.java

@@ -42,8 +42,8 @@ import no.bioforsk.vips.util.InvalidAggregationTypeException;
 import no.bioforsk.vips.util.WeatherElements;
 import no.bioforsk.vips.util.WeatherObservationListException;
 import no.bioforsk.vips.util.WeatherUtil;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.core.type.TypeReference;
 
 /**
  * This model is based on the old one in VIPS

src/test/java/no/bioforsk/vips/model/applescabmodel/AppleScabModelTest.java

@@ -19,6 +19,7 @@
 
 package no.bioforsk.vips.model.applescabmodel;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -41,12 +42,11 @@ import no.bioforsk.vips.model.ConfigValidationException;
 import no.bioforsk.vips.model.ModelExcecutionException;
 import no.bioforsk.vips.util.CommonNamespaces;
 import no.bioforsk.vips.util.WeatherObservationListException;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.map.MappingJsonFactory;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.MappingJsonFactory;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
 
 /**
  *
@@ -281,7 +281,7 @@ public class AppleScabModelTest extends TestCase {
             if(all.isArray())
             {
                 for(JsonNode node : all){
-                    Date timeMeasured = (Date)mapper.convertValue(node.get("timeMeasured").getTextValue(), new TypeReference<Date>(){});
+                    Date timeMeasured = (Date)mapper.convertValue(node.get("timeMeasured").asText(), new TypeReference<Date>(){});
                     if(firstDate == null || firstDate.compareTo(timeMeasured) > 0)
                     {
                         firstDate = timeMeasured;
@@ -293,9 +293,9 @@ public class AppleScabModelTest extends TestCase {
                     //System.out.println(node.toString());
                     WeatherObservation observation = new WeatherObservation();
                     observation.setTimeMeasured(timeMeasured);
-                    observation.setLogIntervalId(node.get("logIntervalId").getIntValue());
-                    observation.setElementMeasurementTypeId(node.get("elementMeasurementTypeId").getTextValue());
-                    observation.setValue(node.get("value").getDoubleValue());
+                    observation.setLogIntervalId(node.get("logIntervalId").asInt());
+                    observation.setElementMeasurementTypeId(node.get("elementMeasurementTypeId").asText());
+                    observation.setValue(node.get("value").asDouble());
                     observations.add(observation);
                 }