Fixed multiple Jackson implementations
Change-Id: Ia40620214b70e0d2aa11c2cd877287c3549e63b0
diff --git a/core/Changes b/core/Changes
index 85f9f42..ccc96b2 100644
--- a/core/Changes
+++ b/core/Changes
@@ -1,6 +1,8 @@
# version 0.62
18/03/2019
- Added close index controller (margaretha)
+11/04/2019
+ - Fixed multiple Jackson implementations (margaretha)
# version 0.61.6
06/02/2019
diff --git a/core/pom.xml b/core/pom.xml
index eed745d..aadb9b8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -147,6 +147,24 @@
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
<version>${jersey.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-xc</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
diff --git a/core/src/main/java/de/ids_mannheim/korap/dto/FoundryDto.java b/core/src/main/java/de/ids_mannheim/korap/dto/FoundryDto.java
index 26cf383..c8f68b5 100644
--- a/core/src/main/java/de/ids_mannheim/korap/dto/FoundryDto.java
+++ b/core/src/main/java/de/ids_mannheim/korap/dto/FoundryDto.java
@@ -4,9 +4,6 @@
import java.util.Map;
import java.util.Set;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
@@ -23,7 +20,7 @@
@Getter
@Setter
@JsonInclude(Include.NON_EMPTY) // new fasterxml annotation, not used by current jersey version
-@JsonSerialize(include=Inclusion.NON_EMPTY) // old codehouse annotation, used by jersey
+//@JsonSerialize(include=Inclusion.NON_EMPTY) // old codehouse annotation, used by jersey
public class FoundryDto {
private String code;
@@ -33,7 +30,7 @@
@Getter
@Setter
@JsonInclude(Include.NON_EMPTY)
- @JsonSerialize(include=Inclusion.NON_EMPTY) // old codehouse annotation used by jersey
+// @JsonSerialize(include=Inclusion.NON_EMPTY) // old codehouse annotation used by jersey
public class Layer {
private String code;
private String description;
@@ -43,7 +40,7 @@
@Getter
@Setter
@JsonInclude(Include.NON_EMPTY)
- @JsonSerialize(include=Inclusion.NON_EMPTY) // old codehouse annotation used by jersey
+// @JsonSerialize(include=Inclusion.NON_EMPTY) // old codehouse annotation used by jersey
public class Key implements Comparable<Key>{
private String code;