Add JavaTimeModule to Jersey. Exclude Jackson from athenz bundle

1 files changed, 3 insertions, 2 deletions

diff --git a/container-jersey2/src/main/scala/com/yahoo/container/servlet/jersey/JerseyServletProvider.scala b/container-jersey2/src/main/scala/com/yahoo/container/servlet/jersey/JerseyServletProvider.scala
index c83f6a63954..4ebe8c3285a 100644
--- a/container-jersey2/src/main/scala/com/yahoo/container/servlet/jersey/JerseyServletProvider.scala
+++ b/container-jersey2/src/main/scala/com/yahoo/container/servlet/jersey/JerseyServletProvider.scala
@@ -5,6 +5,7 @@ import java.io.{IOException, InputStream}
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider
 import com.yahoo.container.di.componentgraph.Provider
 import com.yahoo.container.di.config.RestApiContext
@@ -21,7 +22,6 @@ import org.glassfish.jersey.servlet.ServletContainer
 import org.objectweb.asm.ClassReader
 
 import scala.collection.JavaConverters._
-
 import scala.util.control.Exception
 
 
@@ -96,7 +96,8 @@ class JerseyServletProvider(restApiContext: RestApiContext) extends Provider[Ser
 
   def jacksonDatatypeJdk8Provider: JacksonJaxbJsonProvider = {
     val provider = new JacksonJaxbJsonProvider()
-    provider.setMapper(new ObjectMapper().registerModule(new Jdk8Module))
+    provider.setMapper(
+      new ObjectMapper().registerModule(new Jdk8Module).registerModule(new JavaTimeModule))
     provider
   }