diff --git a/pom.xml b/pom.xml index ba8ff6d3f68081b1be148dd4df87b07445069870..a9d14e3d16947992044eef08eb1a86cb1f733aa8 100644 --- a/pom.xml +++ b/pom.xml @@ -30,16 +30,15 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>1.9.12</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>2.4.1</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.12</version> - <scope>provided</scope> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.4.1</version> </dependency> <dependency> <groupId>javax.persistence</groupId> diff --git a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java index e890e15a4ac68bef4792f54448d20d1f958bbde8..c023ca8b9847980f7845245c492a76e06089a467 100644 --- a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java +++ b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java @@ -56,6 +56,5 @@ public class VIPSCoreApplication extends Application */ private void addRestResourceClasses(Set<Class<?>> resources) { resources.add(no.bioforsk.vips.core.config.JacksonConfig.class); - resources.add(no.bioforsk.vips.core.service.ModelResourceImpl.class); } } \ No newline at end of file diff --git a/src/main/java/no/bioforsk/vips/core/config/JacksonConfig.java b/src/main/java/no/bioforsk/vips/core/config/JacksonConfig.java index 00dc88a492752b25b59107458eacf796903ac463..32f813bbccff171e13af1ad0023c75522926c837 100644 --- a/src/main/java/no/bioforsk/vips/core/config/JacksonConfig.java +++ b/src/main/java/no/bioforsk/vips/core/config/JacksonConfig.java @@ -23,8 +23,8 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.ContextResolver; import javax.ws.rs.ext.Provider; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; /** * This config ensures that Jackson serializes dates as [ISO-8601 ]-compliant notation, @@ -40,7 +40,7 @@ public class JacksonConfig implements ContextResolver<ObjectMapper>{ public JacksonConfig() { objectMapper = new ObjectMapper(); - objectMapper.configure(SerializationConfig.Feature.WRITE_DATES_AS_TIMESTAMPS, false); + objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false); } @Override