Register Jdk8Module and JavaTimeModule for default JSON mapper

2 files changed, 14 insertions, 1 deletions

diff --git a/container-core/pom.xml b/container-core/pom.xml
index ff8d9975ef3..f3861c92129 100644
--- a/container-core/pom.xml
+++ b/container-core/pom.xml
@@ -212,6 +212,16 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jdk8</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>testutil</artifactId>
       <version>${project.version}</version>
diff --git a/container-core/src/main/java/com/yahoo/restapi/JacksonJsonResponse.java b/container-core/src/main/java/com/yahoo/restapi/JacksonJsonResponse.java
index d3b960651b0..f261c7611f1 100644
--- a/container-core/src/main/java/com/yahoo/restapi/JacksonJsonResponse.java
+++ b/container-core/src/main/java/com/yahoo/restapi/JacksonJsonResponse.java
@@ -2,6 +2,8 @@
 package com.yahoo.restapi;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.log.LogLevel;
 
@@ -17,7 +19,8 @@ import java.util.logging.Logger;
 public class JacksonJsonResponse<T> extends HttpResponse {
 
     private static final Logger log = Logger.getLogger(JacksonJsonResponse.class.getName());
-    private static final ObjectMapper defaultJsonMapper = new ObjectMapper();
+    private static final ObjectMapper defaultJsonMapper = new ObjectMapper()
+            .registerModule(new JavaTimeModule()).registerModule(new Jdk8Module());
 
     private final ObjectMapper jsonMapper;
     private final T entity;