diff --git a/src/main/resources/Java/JsonUtil.mustache b/src/main/resources/Java/JsonUtil.mustache
index 7be6b3c3ca9..60711406965 100644
--- a/src/main/resources/Java/JsonUtil.mustache
+++ b/src/main/resources/Java/JsonUtil.mustache
@@ -12,6 +12,7 @@ public class JsonUtil {
   	mapper = new ObjectMapper();
 	  mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 	  mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+      mapper.registerModule(new JodaModule());
 	}
 
 	public static ObjectMapper getJsonMapper() {
diff --git a/src/main/resources/Java/pom.mustache b/src/main/resources/Java/pom.mustache
index 465e1704773..dc4c74c1140 100644
--- a/src/main/resources/Java/pom.mustache
+++ b/src/main/resources/Java/pom.mustache
@@ -178,6 +178,11 @@
       <version>${jackson-version}</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-joda</artifactId>
+      <version>${jackson-version}</version>
+    </dependency>   
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>