From 02efbb730858f9e782403475ad6fbb9f8e460736 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Fri, 21 Nov 2014 16:13:28 +0100
Subject: [PATCH] Upgrading Jackson to v. 2.4.1
---
pom.xml | 12 ++++++------
.../vips/coremanager/entity/Organization.java | 2 +-
.../service/JsonParseExceptionMapper.java | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7a073b6..bb34d10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,15 +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>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.4.1</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/no/bioforsk/vips/coremanager/entity/Organization.java b/src/main/java/no/bioforsk/vips/coremanager/entity/Organization.java
index 0f17882..133321b 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/entity/Organization.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/entity/Organization.java
@@ -34,7 +34,7 @@ import javax.persistence.Table;
import javax.validation.constraints.Size;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
/**
* @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
diff --git a/src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.java b/src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.java
index 31cd3be..93c8af5 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.java
@@ -22,7 +22,7 @@ package no.bioforsk.vips.coremanager.service;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
-import org.codehaus.jackson.JsonParseException;
+import com.fasterxml.jackson.core.JsonParseException;
/**
* Catches when user sends in invalid JSON that causes exception to be thrown
--
GitLab