From 3f5c195e689ad6e9f903cea5f2a97fff433a1d7c Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Fri, 21 Nov 2014 16:13:09 +0100
Subject: [PATCH] Upgrading Jackson to v. 2.4.1
---
pom.xml | 13 ++++++-------
.../no/bioforsk/vips/core/VIPSCoreApplication.java | 1 -
.../no/bioforsk/vips/core/config/JacksonConfig.java | 6 +++---
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index ba8ff6d..a9d14e3 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 e890e15..c023ca8 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 00dc88a..32f813b 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
--
GitLab