Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Jackson to 2.9.1 #1264

Merged
merged 1 commit into from Oct 9, 2017
Merged

Update Jackson to 2.9.1 #1264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file removed extensions/gdata/module/MOD-INF/lib/jackson-core-2.1.3.jar
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions main/src/com/google/refine/importers/JsonImporter.java
View file
Open in desktop
Expand Up @@ -39,11 +39,11 @@ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
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;
Expand Down
6 changes: 3 additions & 3 deletions main/src/com/google/refine/model/Cell.java
View file
Open in desktop
Expand Up @@ -39,9 +39,9 @@ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
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;

Expand Down
6 changes: 3 additions & 3 deletions main/src/com/google/refine/model/Recon.java
View file
Open in desktop
Expand Up @@ -39,9 +39,9 @@ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
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;

Expand Down
8 changes: 4 additions & 4 deletions main/src/com/google/refine/model/ReconCandidate.java
View file
Open in desktop
Expand Up @@ -37,9 +37,9 @@ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
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;

Expand Down Expand Up @@ -157,4 +157,4 @@ static public ReconCandidate loadStreaming(JsonParser jp) throws Exception {
score
);
}
}
}
6 changes: 3 additions & 3 deletions main/src/com/google/refine/model/Row.java
View file
Open in desktop
Expand Up @@ -39,9 +39,9 @@ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
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;

Expand Down
Binary file added main/webapp/WEB-INF/lib/jackson-annotations-2.9.1.jar
View file
Open in desktop
Binary file not shown.
Binary file added main/webapp/WEB-INF/lib/jackson-core-2.9.1.jar
View file
Open in desktop
Binary file not shown.
Binary file removed main/webapp/WEB-INF/lib/jackson-core-asl-1.9.12.jar
View file
Open in desktop
Binary file not shown.
Binary file added main/webapp/WEB-INF/lib/jackson-databind-2.9.1.jar
View file
Open in desktop
Binary file not shown.