Add JavaTimeModule to Jersey. Exclude Jackson from athenz bundle

4 files changed, 35 insertions, 7 deletions

diff --git a/athenz-identity-provider-service/pom.xml b/athenz-identity-provider-service/pom.xml
index 260836af892..c87589d7be2 100644
--- a/athenz-identity-provider-service/pom.xml
+++ b/athenz-identity-provider-service/pom.xml
@@ -33,6 +33,19 @@
                     <groupId>org.glassfish.jersey.media</groupId>
                     <artifactId>jersey-media-json-jackson</artifactId>
                 </exclusion>
+                <!--Exclude all Jackson bundles provided by JDisc -->
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-annotations</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -45,13 +58,21 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-api</artifactId>
                 </exclusion>
+                <!--Exclude all Jackson bundles provided by JDisc -->
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-annotations</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <scope>compile</scope>
-        </dependency>
 
         <!-- PROVIDED -->
         <dependency>
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml
index 43c4b5c33d4..1b0a7f9e958 100644
--- a/container-dependencies-enforcer/pom.xml
+++ b/container-dependencies-enforcer/pom.xml
@@ -72,6 +72,8 @@
                                                 <include>com.fasterxml.jackson.core:jackson-core:[${jackson2.version}]:jar:provided</include>
                                                 <include>com.fasterxml.jackson.core:jackson-databind:[${jackson2.version}]:jar:provided</include>
                                                 <include>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:[${jackson2.version}]:jar:provided</include>
+                                                <include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[${jackson2.version}]:jar:provided</include>
+
 
                                                 <!-- Use version range for jax deps, because jersey and junit affect the versions. -->
                                                 <include>com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:[2.5.4, ${jackson2.version}]:jar:provided</include>
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
   }
 
diff --git a/vespa_jersey2/pom.xml b/vespa_jersey2/pom.xml
index bef8938fc5c..3250cd8a41f 100644
--- a/vespa_jersey2/pom.xml
+++ b/vespa_jersey2/pom.xml
@@ -46,6 +46,10 @@
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jdk8</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+    </dependency>
   </dependencies>
 
   <build>