diff --git a/pom.xml b/pom.xml index 7a073b6b4670db8a166e1392155fe5140cbdd88c..bb34d10d94b60274c4a7236be62cfd15f931da4e 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 0f17882fd061018540aa9a9e6b510595d7f77404..133321bf982c1bd0b99ce50240c04eb6e5b18368 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 31cd3be42794ca1bd3d060857a318bd268953ac2..93c8af5aa1b7543b6c5ea18424a6278491804d8f 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