honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade to jackson 2.0.4

This commit is contained in:
Shay Banon 2012-07-10 23:44:02 +02:00
parent 99d2f27c84
commit 57e966e9d7
10 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pom.xml
View File

@ -117,16 +117,16 @@
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.7</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.0.4</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-smile</artifactId>
<version>1.9.7</version>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-smile</artifactId>
<version>2.0.4</version>
<scope>compile</scope>
</dependency>

2
src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.common.xcontent;
import org.codehaus.jackson.smile.SmileConstants;
import com.fasterxml.jackson.dataformat.smile.SmileConstants;
import org.elasticsearch.ElasticSearchIllegalArgumentException;
import org.elasticsearch.ElasticSearchParseException;
import org.elasticsearch.common.bytes.BytesReference;

2
src/main/java/org/elasticsearch/common/xcontent/XContentString.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.common.xcontent;
import org.codehaus.jackson.io.SerializedString;
import com.fasterxml.jackson.core.io.SerializedString;
/**
*

8
src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java
View File

@ -19,10 +19,10 @@
package org.elasticsearch.common.xcontent.json;
import org.codehaus.jackson.JsonEncoding;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.JsonParser;
import com.fasterxml.jackson.core.JsonEncoding;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.io.FastStringReader;
import org.elasticsearch.common.xcontent.*;

2
src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.common.xcontent.json;
import org.codehaus.jackson.JsonGenerator;
import com.fasterxml.jackson.core.JsonGenerator;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.io.Streams;
import org.elasticsearch.common.xcontent.*;

4
src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java
View File

@ -19,8 +19,8 @@
package org.elasticsearch.common.xcontent.json;
import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.JsonToken;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import org.elasticsearch.ElasticSearchIllegalStateException;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.common.xcontent.support.AbstractXContentParser;

6
src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java
View File

@ -19,9 +19,9 @@
package org.elasticsearch.common.xcontent.smile;
import org.codehaus.jackson.JsonEncoding;
import org.codehaus.jackson.smile.SmileFactory;
import org.codehaus.jackson.smile.SmileGenerator;
import com.fasterxml.jackson.core.JsonEncoding;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.io.FastStringReader;
import org.elasticsearch.common.xcontent.*;

4
src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java
View File

@ -19,8 +19,8 @@
package org.elasticsearch.common.xcontent.smile;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.smile.SmileParser;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.dataformat.smile.SmileParser;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.common.xcontent.json.JsonXContentGenerator;

2
src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.common.xcontent.smile;
import org.codehaus.jackson.JsonParser;
import com.fasterxml.jackson.core.JsonParser;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.common.xcontent.json.JsonXContentParser;

2
src/test/java/org/elasticsearch/test/unit/deps/jackson/JacksonLocationTests.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.test.unit.deps.jackson;
import org.codehaus.jackson.*;
import com.fasterxml.jackson.core.*;
import org.elasticsearch.common.io.FastByteArrayOutputStream;
import org.testng.annotations.Test;