Upgraded to [email protected]

finos · Apr 15, 2023 · 3d2af3e · 3d2af3e
1 parent eb5a144
commit 3d2af3e
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 21 deletions.
diff --git a/legend-sdlc-server-shared/pom.xml b/legend-sdlc-server-shared/pom.xml
@@ -158,10 +158,6 @@
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-        </dependency>
 
         <!-- TEST -->
         <dependency>

diff --git a/...rver-shared/src/main/java/org/finos/legend/sdlc/server/BaseServerJacksonJsonProvider.java b/...rver-shared/src/main/java/org/finos/legend/sdlc/server/BaseServerJacksonJsonProvider.java
@@ -16,7 +16,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 
 import javax.ws.rs.ext.ContextResolver;
@@ -28,7 +27,7 @@ public class BaseServerJacksonJsonProvider extends JacksonJsonProvider implement
     public BaseServerJacksonJsonProvider()
     {
         objectMapper = new ObjectMapper();
-        objectMapper.registerModule(new JavaTimeModule());
+        objectMapper.findAndRegisterModules();
         objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
     }
 

diff --git a/legend-sdlc-server/pom.xml b/legend-sdlc-server/pom.xml
@@ -177,10 +177,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.google.inject</groupId>

diff --git a/...rc/test/java/org/finos/legend/sdlc/server/LegendSDLCServerForTestJacksonJsonProvider.java b/...rc/test/java/org/finos/legend/sdlc/server/LegendSDLCServerForTestJacksonJsonProvider.java
@@ -16,7 +16,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import org.finos.legend.sdlc.domain.model.entity.Entity;
 import org.finos.legend.sdlc.domain.model.project.Project;
@@ -38,7 +37,7 @@ public class LegendSDLCServerForTestJacksonJsonProvider extends JacksonJsonProvi
     public LegendSDLCServerForTestJacksonJsonProvider()
     {
         objectMapper = new ObjectMapper();
-        objectMapper.registerModule(new JavaTimeModule());
+        objectMapper.findAndRegisterModules();
         objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
         objectMapper.addMixIn(Project.class, InMemoryMixins.Project.class);
         objectMapper.addMixIn(Workspace.class, InMemoryMixins.Workspace.class);

diff --git a/...dlc-server/src/test/java/org/finos/legend/sdlc/server/resources/SDLCServerClientRule.java b/...dlc-server/src/test/java/org/finos/legend/sdlc/server/resources/SDLCServerClientRule.java
@@ -17,7 +17,6 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import org.finos.legend.sdlc.domain.model.entity.Entity;
 import org.finos.legend.sdlc.domain.model.project.Project;
@@ -79,7 +78,7 @@ static class SDLCServerClientRuleJacksonJsonProvider extends JacksonJsonProvider
         public SDLCServerClientRuleJacksonJsonProvider()
         {
             objectMapper = new ObjectMapper();
-            objectMapper.registerModule(new JavaTimeModule());
+            this.objectMapper.findAndRegisterModules();
             this.objectMapper.enable(SerializationFeature.INDENT_OUTPUT);
             this.objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
             this.objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
@@ -91,7 +90,6 @@ public SDLCServerClientRuleJacksonJsonProvider()
             this.objectMapper.addMixIn(ProjectRevision.class, ProjectRevisionMixin.class);
             this.objectMapper.addMixIn(ProjectDependency.class, ProjectDependencyMixin.class);
             this.objectMapper.addMixIn(VersionId.class, VersionIdMixin.class);
-            this.objectMapper.findAndRegisterModules();
         }
 
         @Override

diff --git a/pom.xml b/pom.xml
@@ -82,7 +82,7 @@
         <dropwizard-swagger.version>1.3.17-1</dropwizard-swagger.version>
         <eclipsecollections.version>10.2.0</eclipsecollections.version>
         <findbugs.version>3.0.0</findbugs.version>
-        <gitlab4j.version>5.1.0</gitlab4j.version>
+        <gitlab4j.version>5.2.0</gitlab4j.version>
         <guava.version>30.0-jre</guava.version>
         <guice.version>4.2.1</guice.version>
         <h2.version>1.4.200</h2.version>
@@ -832,11 +832,6 @@
                 <version>${legend.engine.version}</version>
             </dependency>
             <!-- External dependencies -->
-            <dependency>
-                <groupId>com.fasterxml.jackson.datatype</groupId>
-                <artifactId>jackson-datatype-jsr310</artifactId>
-                <version>${jackson.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-annotations</artifactId>