Skip to content
Snippets Groups Projects
Commit 66f27db4 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Had to change the JSONIgnore annotation to the one used by WildFly...

Had to change the JSONIgnore annotation to the one used by WildFly (com.fasterxml.jackson.annotation.JsonIgnore, Jackson 2)
parent 45c61dd6
Branches
Tags
No related merge requests found
Showing
with 27 additions and 22 deletions
......@@ -110,7 +110,13 @@
<scope>provided</scope>
<type>jar</type>
</dependency>
<dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.4.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
<version>7.0</version>
......
......@@ -33,12 +33,11 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.validation.constraints.NotNull;
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>
......
......@@ -38,7 +38,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>
......
......@@ -32,7 +32,7 @@ import javax.validation.constraints.NotNull;
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>
......
......@@ -40,7 +40,7 @@ import javax.persistence.TemporalType;
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 2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
......
......@@ -31,7 +31,7 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.validation.constraints.Size;
import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.annotate.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnore;
/**
* @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
......
......@@ -41,8 +41,8 @@ import javax.persistence.TemporalType;
import javax.persistence.Transient;
import javax.xml.bind.annotation.XmlRootElement;
import no.bioforsk.vips.entity.Result;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.TypeReference;
......
......@@ -35,7 +35,7 @@ import javax.validation.constraints.NotNull;
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>
......
......@@ -34,8 +34,7 @@ import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Transient;
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 2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
......
......@@ -32,7 +32,7 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.validation.constraints.Size;
import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.annotate.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnore;
/**
* @copyright 2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
......@@ -60,6 +60,7 @@ public class MessageIllustrationCaptionLocale implements Serializable {
@ManyToOne(optional = false, fetch = FetchType.LAZY)
private MessageIllustration messageIllustration;
public MessageIllustrationCaptionLocale() {
}
......
......@@ -37,7 +37,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 2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
......
......@@ -38,7 +38,7 @@ import javax.persistence.TemporalType;
import javax.persistence.Transient;
import javax.validation.constraints.NotNull;
import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.annotate.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.hibernate.annotations.Type;
/**
......
......@@ -33,7 +33,7 @@ import javax.validation.constraints.NotNull;
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 2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
......
......@@ -37,7 +37,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;
import org.hibernate.annotations.Type;
/**
......
......@@ -38,7 +38,7 @@ import javax.persistence.Table;
import javax.persistence.Transient;
import javax.validation.constraints.Size;
import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.annotate.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnore;
/**
* @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
......
......@@ -31,7 +31,7 @@ import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.validation.constraints.Size;
import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.annotate.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnore;
/**
* Extension of {@see PointOfInterest}, with additional info for weather stations
......
......@@ -33,7 +33,7 @@ import javax.validation.constraints.NotNull;
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>
......
......@@ -34,7 +34,7 @@ import javax.validation.constraints.NotNull;
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>
......
......@@ -41,7 +41,7 @@ import javax.validation.constraints.Pattern;
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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment