diff --git a/extensions/gdata/module/MOD-INF/lib/jackson-core-2.1.3.jar b/extensions/gdata/module/MOD-INF/lib/jackson-core-2.1.3.jar deleted file mode 100644 index f47619f41..000000000 Binary files a/extensions/gdata/module/MOD-INF/lib/jackson-core-2.1.3.jar and /dev/null differ diff --git a/main/src/com/google/refine/importers/JsonImporter.java b/main/src/com/google/refine/importers/JsonImporter.java index 85bd57d9c..35aae5152 100644 --- a/main/src/com/google/refine/importers/JsonImporter.java +++ b/main/src/com/google/refine/importers/JsonImporter.java @@ -39,11 +39,11 @@ import java.io.InputStream; import java.io.Serializable; import java.util.List; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonParseException; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonParser.NumberType; -import org.codehaus.jackson.JsonToken; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonParser.NumberType; +import com.fasterxml.jackson.core.JsonToken; import org.json.JSONArray; import org.json.JSONObject; import org.slf4j.Logger; diff --git a/main/src/com/google/refine/model/Cell.java b/main/src/com/google/refine/model/Cell.java index a95b61750..16e1e89c7 100644 --- a/main/src/com/google/refine/model/Cell.java +++ b/main/src/com/google/refine/model/Cell.java @@ -39,9 +39,9 @@ import java.util.Calendar; import java.util.Date; import java.util.Properties; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonToken; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; import org.json.JSONException; import org.json.JSONWriter; diff --git a/main/src/com/google/refine/model/Recon.java b/main/src/com/google/refine/model/Recon.java index 43dd7e0a0..9b29f383b 100644 --- a/main/src/com/google/refine/model/Recon.java +++ b/main/src/com/google/refine/model/Recon.java @@ -39,9 +39,9 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonToken; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; import org.json.JSONException; import org.json.JSONWriter; diff --git a/main/src/com/google/refine/model/ReconCandidate.java b/main/src/com/google/refine/model/ReconCandidate.java index 4c9a4de8d..76a54d82f 100644 --- a/main/src/com/google/refine/model/ReconCandidate.java +++ b/main/src/com/google/refine/model/ReconCandidate.java @@ -37,9 +37,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonToken; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; import org.json.JSONException; import org.json.JSONWriter; @@ -157,4 +157,4 @@ public class ReconCandidate implements HasFields, Jsonizable { score ); } -} \ No newline at end of file +} diff --git a/main/src/com/google/refine/model/Row.java b/main/src/com/google/refine/model/Row.java index 93e7ffc27..422fd76ec 100644 --- a/main/src/com/google/refine/model/Row.java +++ b/main/src/com/google/refine/model/Row.java @@ -39,9 +39,9 @@ import java.util.List; import java.util.Map.Entry; import java.util.Properties; -import org.codehaus.jackson.JsonFactory; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonToken; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; import org.json.JSONException; import org.json.JSONWriter; diff --git a/main/webapp/WEB-INF/lib/jackson-annotations-2.9.1.jar b/main/webapp/WEB-INF/lib/jackson-annotations-2.9.1.jar new file mode 100644 index 000000000..c04f3649f Binary files /dev/null and b/main/webapp/WEB-INF/lib/jackson-annotations-2.9.1.jar differ diff --git a/main/webapp/WEB-INF/lib/jackson-core-2.9.1.jar b/main/webapp/WEB-INF/lib/jackson-core-2.9.1.jar new file mode 100644 index 000000000..36742d055 Binary files /dev/null and b/main/webapp/WEB-INF/lib/jackson-core-2.9.1.jar differ diff --git a/main/webapp/WEB-INF/lib/jackson-core-asl-1.9.12.jar b/main/webapp/WEB-INF/lib/jackson-core-asl-1.9.12.jar deleted file mode 100644 index deb372eb2..000000000 Binary files a/main/webapp/WEB-INF/lib/jackson-core-asl-1.9.12.jar and /dev/null differ diff --git a/main/webapp/WEB-INF/lib/jackson-databind-2.9.1.jar b/main/webapp/WEB-INF/lib/jackson-databind-2.9.1.jar new file mode 100644 index 000000000..fb279129c Binary files /dev/null and b/main/webapp/WEB-INF/lib/jackson-databind-2.9.1.jar differ